------------------------------------------------------------ revno: 117870 committer: Dmitry Antipov branch nick: trunk timestamp: Sat 2014-09-13 08:41:54 +0400 message: Prefer ptrdiff_t to int and avoid integer overflows. * fileio.c (make_temp_name): * font.c (font_parse_family_registry): Avoid integer overflow on string size calculation. * data.c (Faset): Likewise for byte index. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-12 11:12:40 +0000 +++ src/ChangeLog 2014-09-13 04:41:54 +0000 @@ -1,3 +1,11 @@ +2014-09-13 Dmitry Antipov + + Prefer ptrdiff_t to int and avoid integer overflows. + * fileio.c (make_temp_name): + * font.c (font_parse_family_registry): Avoid integer + overflow on string size calculation. + * data.c (Faset): Likewise for byte index. + 2014-09-12 Detlev Zundel * buffer.c (syms_of_buffer): DEFSYM Qchoice (Bug#18337). @@ -15,7 +23,7 @@ * lread.c (readevalloop_eager_expand_eval): Add GCPRO and fix bootstrap broken if GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. - Remove redundant GCPROs around Ffuncall and Fapply calls. This + Remove redundant GCPROs around Ffuncall and Fapply calls. This is safe because Ffuncall protects all of its arguments by itself. * charset.c (map_charset_for_dump): Remove redundant GCPRO. * eval.c (Fapply, apply1, call0, call1, call2, call3, call4, call5) === modified file 'src/data.c' --- src/data.c 2014-09-08 06:00:58 +0000 +++ src/data.c 2014-09-13 04:41:54 +0000 @@ -2310,7 +2310,7 @@ { if (! SINGLE_BYTE_CHAR_P (c)) { - int i; + ptrdiff_t i; for (i = SBYTES (array) - 1; i >= 0; i--) if (SREF (array, i) >= 0x80) === modified file 'src/fileio.c' --- src/fileio.c 2014-09-07 07:04:01 +0000 +++ src/fileio.c 2014-09-13 04:41:54 +0000 @@ -728,7 +728,7 @@ make_temp_name (Lisp_Object prefix, bool base64_p) { Lisp_Object val, encoded_prefix; - int len; + ptrdiff_t len; printmax_t pid; char *p, *data; char pidbuf[INT_BUFSIZE_BOUND (printmax_t)]; === modified file 'src/font.c' --- src/font.c 2014-09-07 17:04:19 +0000 +++ src/font.c 2014-09-13 04:41:54 +0000 @@ -1761,7 +1761,7 @@ void font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Object font_spec) { - int len; + ptrdiff_t len; char *p0, *p1; if (! NILP (family) ------------------------------------------------------------ revno: 117869 committer: Sam Steingold branch nick: trunk timestamp: Fri 2014-09-12 15:57:40 -0400 message: Add support for Vertica SQL. * lisp/progmodes/sql.el (sql-product-alist): Add vertica. (sql-vertica-program, sql-vertica-options) (sql-vertica-login-params, sql-comint-vertica, sql-vertica): New functions and variables to support Vertica. Inspired by code by Roman Scherer . diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-09-08 12:38:53 +0000 +++ etc/NEWS 2014-09-12 19:57:40 +0000 @@ -155,6 +155,8 @@ interactive buffer and advances to the next line, skipping whitespace and comments. +*** Add support for Vertica SQL. + ** VC and related modes *** New option `vc-annotate-background-mode' controls whether === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-11 19:44:25 +0000 +++ lisp/ChangeLog 2014-09-12 19:57:40 +0000 @@ -1,3 +1,11 @@ +2014-09-12 Sam Steingold + + * progmodes/sql.el (sql-product-alist): Add vertica. + (sql-vertica-program, sql-vertica-options) + (sql-vertica-login-params, sql-comint-vertica, sql-vertica): + New functions and variables to support Vertica. + Inspired by code by Roman Scherer . + 2014-09-11 Paul Eggert * ses.el (ses-file-format-extend-parameter-list): Rename from === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2014-09-09 20:39:31 +0000 +++ lisp/progmodes/sql.el 2014-09-12 19:57:40 +0000 @@ -505,6 +505,19 @@ :prompt-length 5 :syntax-alist ((?@ . "_")) :terminator ("^go" . "go")) + + (vertica + :name "Vertica" + :sqli-program sql-vertica-program + :sqli-options sql-vertica-options + :sqli-login sql-vertica-login-params + :sqli-comint-func 'sql-comint-vertica + :list-all ("select table_name from v_catalog.tables" . + "select * from v_catalog.tables") + :list-table "\\d %s" + :prompt-regexp "^\\w*=[#>] " + :prompt-length 5 + :prompt-cont-regexp "^\\w*[-(][#>] ") ) "An alist of product specific configuration settings. @@ -5056,6 +5069,51 @@ +(defcustom sql-vertica-program "vsql" + "Command to start the Vertica client." + :version "24.5" + :type 'file + :group 'SQL) + +(defcustom sql-vertica-options '("-P" "pager=off") + "List of additional options for `sql-vertica-program'. +The default value disables the internal pager." + :version "24.5" + :type '(repeat string) + :group 'SQL) + +(defcustom sql-vertica-login-params '(user password database server) + "List of login parameters needed to connect to Vertica." + :version "24.5" + :type 'sql-login-params + :group 'SQL) + +(defun sql-comint-vertica (product options) + "Create comint buffer and connect to Vertica." + (sql-comint product + (nconc + (and (not (string= "" sql-server)) + (list "-h" sql-server)) + (and (not (string= "" sql-database)) + (list "-d" sql-database)) + (and (not (string= "" sql-password)) + (list "-w" sql-password)) + (and (not (string= "" sql-user)) + (list "-U" sql-user)) + options))) + +;;;###autoload +(defun sql-vertica (&optional buffer) + "Run vsql as an inferior process." + (interactive "P") + (sql-product-interactive 'vertica buffer)) + +(provide 'vertica) + +;;; vertica.el ends here + + + (provide 'sql) ;;; sql.el ends here ------------------------------------------------------------ revno: 117868 author: Detlev Zundel committer: Dmitry Antipov branch nick: trunk timestamp: Fri 2014-09-12 15:12:40 +0400 message: * buffer.c (syms_of_buffer): DEFSYM Qchoice (Bug#18337). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-11 13:21:19 +0000 +++ src/ChangeLog 2014-09-12 11:12:40 +0000 @@ -1,3 +1,7 @@ +2014-09-12 Detlev Zundel + + * buffer.c (syms_of_buffer): DEFSYM Qchoice (Bug#18337). + 2014-09-11 Dmitry Antipov * lisp.h (make_local_string): Nitpick indent. === modified file 'src/buffer.c' --- src/buffer.c 2014-09-11 19:44:25 +0000 +++ src/buffer.c 2014-09-12 11:12:40 +0000 @@ -5391,6 +5391,7 @@ staticpro (&Qpermanent_local); staticpro (&Qkill_buffer_hook); + DEFSYM (Qchoice, "choice"); DEFSYM (Qleft, "left"); DEFSYM (Qright, "right"); DEFSYM (Qrange, "range"); ------------------------------------------------------------ revno: 117867 committer: Paul Eggert branch nick: trunk timestamp: Thu 2014-09-11 12:44:25 -0700 message: Spelling fixes. * lisp/ses.el (ses-file-format-extend-parameter-list): Rename from ses-file-format-extend-paramter-list. All uses changed. * lisp/gnus-cloud.el (gnus-cloud-parse-version-1): Fix misspelling of ":delete". diff: === modified file 'doc/misc/vhdl-mode.texi' --- doc/misc/vhdl-mode.texi 2014-06-10 02:20:31 +0000 +++ doc/misc/vhdl-mode.texi 2014-09-11 19:44:25 +0000 @@ -212,7 +212,7 @@ @cindex comment only line Syntactic component lists can contain more than one component, and -individual syntactic compenents need not have relative buffer positions. +individual syntactic components need not have relative buffer positions. The most common example of this is a line that contains a @dfn{comment only line}. @example @@ -416,7 +416,7 @@ @end group @end example -In other words, we want to change the indentation of the statments +In other words, we want to change the indentation of the statements inside the inverter process. Notice that the construct we want to change starts on line 3. To change the indentation of a line, we need to see which syntactic component affect the offset calculations for that @@ -630,7 +630,7 @@ @findex set-offset (vhdl-) Another variable, @code{vhdl-file-offsets}, takes an association list similar to what is allowed in @code{vhdl-offsets-alist}. When the file is -visited, VHDL Mode will automatically institute these offets using +visited, VHDL Mode will automatically institute these offsets using @code{vhdl-set-offset}. @xref{Customizing Indentation}. Note that file style settings (i.e. @code{vhdl-file-style}) are applied @@ -648,7 +648,7 @@ For most users, VHDL Mode will support their coding styles with very little need for customizations. Usually, one of the standard styles defined in @code{vhdl-style-alist} will do the trick. Sometimes, -one of the syntactic symbol offsets will need to be tweeked slightly, or +one of the syntactic symbol offsets will need to be tweaked slightly, or perhaps @code{vhdl-basic-offset} will need to be changed. However, some styles require a more advanced ability for customization, and one of the real strengths of VHDL Mode is that the syntactic analysis model === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-10 21:38:11 +0000 +++ lisp/ChangeLog 2014-09-11 19:44:25 +0000 @@ -1,3 +1,9 @@ +2014-09-11 Paul Eggert + + * ses.el (ses-file-format-extend-parameter-list): Rename from + ses-file-format-extend-paramter-list, to correct a misspelling. + All uses changed. + 2014-09-10 Alan Mackenzie CC Mode: revert recent changes and fix bug 17463 (cc-langs.elc === modified file 'lisp/ChangeLog.16' --- lisp/ChangeLog.16 2014-08-28 22:18:39 +0000 +++ lisp/ChangeLog.16 2014-09-11 19:44:25 +0000 @@ -5052,7 +5052,7 @@ (w32-handle-dropped-file): Convert incoming dropped files from Windows paths to Cygwin ones before passing them on to the rest of Emacs. - (w32-drag-n-drop): New paramter new-frame. Simplify logic. + (w32-drag-n-drop): New parameter new-frame. Simplify logic. (w32-initialize-window-system): Assert we're not initialized twice. * term/x-win.el: Require cl-lib; add ourselves to display-format-alist. === modified file 'lisp/calendar/icalendar.el' --- lisp/calendar/icalendar.el 2014-08-11 00:47:10 +0000 +++ lisp/calendar/icalendar.el 2014-09-11 19:44:25 +0000 @@ -1531,7 +1531,7 @@ Enumerate the evaluated sexp entry for the next `icalendar-export-sexp-enumeration-days' days. NONMARKER is a regular expression matching the start of non-marking entries. -ENTRY-MAIN is the first line of the diary entry. +ENTRY-MAIN is the first line of the diary entry. Optional argument START determines the first day of the enumeration, given as a time value, in same format as returned by @@ -1574,8 +1574,8 @@ (let ((calendar-date-style 'iso)) (icalendar--convert-ordinary-to-ical nonmarker (format "%4d/%02d/%02d %s" y m d see)))) - (;TODO: - (error (format "Unsopported Sexp-entry: %s" + (;TODO: + (error (format "Unsupported Sexp-entry: %s" entry-main)))))) (number-sequence 0 (- icalendar-export-sexp-enumeration-days 1)))))) === modified file 'lisp/composite.el' --- lisp/composite.el 2014-06-28 01:34:17 +0000 +++ lisp/composite.el 2014-09-11 19:44:25 +0000 @@ -702,7 +702,7 @@ (setq xoff (- (lglyph-rbearing fc)))) (if (< dc-width fc-width) ;; The following glyph is wider, but we don't know how to - ;; align both glyphs. So, try the easiet method; + ;; align both glyphs. So, try the easiest method; ;; i.e. align left edges of the glyphs. (setq xoff (- xoff (- dc-width) (- (lglyph-lbearing fc ))) width (- fc-width dc-width))) === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-09-04 15:23:37 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-09-11 19:44:25 +0000 @@ -411,7 +411,7 @@ (when (cdr split) (setq key-have-value t)))))))) ;; If `cur-a' is not one of `args-lst-ak' - ;; assume user is entering an unknow key + ;; assume user is entering an unknown key ;; referenced in last position in signature. (other-key-arg (and (stringp cur-a) args-lst-ak === modified file 'lisp/emacs-lisp/subr-x.el' --- lisp/emacs-lisp/subr-x.el 2014-06-30 20:17:17 +0000 +++ lisp/emacs-lisp/subr-x.el 2014-09-11 19:44:25 +0000 @@ -47,7 +47,7 @@ (_ (car forms)))) (defmacro thread-first (&rest forms) - "Thread FORMS elements as the first argument of their succesor. + "Thread FORMS elements as the first argument of their successor. Example: (thread-first 5 @@ -64,7 +64,7 @@ `(internal--thread-argument t ,@forms)) (defmacro thread-last (&rest forms) - "Thread FORMS elements as the last argument of their succesor. + "Thread FORMS elements as the last argument of their successor. Example: (thread-last 5 @@ -118,7 +118,7 @@ "Process BINDINGS and if all values are non-nil eval THEN, else ELSE. Argument BINDINGS is a list of tuples whose car is a symbol to be bound and (optionally) used in THEN, and its cadr is a sexp to be -evaled to set symbol's value. In the special case you only want +evalled to set symbol's value. In the special case you only want to bind a single value, BINDINGS can just be a plain tuple." (declare (indent 2) (debug ((&rest (symbolp form)) form body))) (when (and (<= (length bindings) 2) @@ -134,7 +134,7 @@ "Process BINDINGS and if all values are non-nil eval BODY. Argument BINDINGS is a list of tuples whose car is a symbol to be bound and (optionally) used in BODY, and its cadr is a sexp to be -evaled to set symbol's value. In the special case you only want +evalled to set symbol's value. In the special case you only want to bind a single value, BINDINGS can just be a plain tuple." (declare (indent 1) (debug if-let)) (list 'if-let bindings (macroexp-progn body))) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-08-26 23:56:11 +0000 +++ lisp/gnus/ChangeLog 2014-09-11 19:44:25 +0000 @@ -1,3 +1,8 @@ +2014-09-11 Paul Eggert + + * gnus-cloud.el (gnus-cloud-parse-version-1): Fix misspelling + of ":delete". + 2014-08-26 Katsumi Yamaoka * gnus-art.el (gnus-article-browse-html-save-cid-content) === modified file 'lisp/gnus/gnus-cloud.el' --- lisp/gnus/gnus-cloud.el 2014-03-24 00:35:00 +0000 +++ lisp/gnus/gnus-cloud.el 2014-09-11 19:44:25 +0000 @@ -125,7 +125,7 @@ (let ((spec (ignore-errors (read (current-buffer)))) length) (when (and (consp spec) - (memq (plist-get spec :type) '(:file :data :deleta))) + (memq (plist-get spec :type) '(:file :data :delete))) (setq length (plist-get spec :length)) (push (append spec (list === modified file 'lisp/gnus/gnus-fun.el' --- lisp/gnus/gnus-fun.el 2014-05-08 03:41:21 +0000 +++ lisp/gnus/gnus-fun.el 2014-09-11 19:44:25 +0000 @@ -239,7 +239,7 @@ ;;;###autoload (defun gnus-insert-random-face-header () - "Insert a randome Face header from `gnus-face-directory'." + "Insert a random Face header from `gnus-face-directory'." (gnus--insert-random-face-with-type 'gnus-random-face 'Face)) (defface gnus-x-face '((t (:foreground "black" :background "white"))) === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2014-09-01 10:21:26 +0000 +++ lisp/ldefs-boot.el 2014-09-11 19:44:25 +0000 @@ -25893,7 +25893,7 @@ NSGraphicsContext => \"NS\", \"Graphics\" and \"Context\" This mode changes the definition of a word so that word commands -treat nomenclature boundaries as word bounaries. +treat nomenclature boundaries as word boundaries. \\{subword-mode-map} === modified file 'lisp/ls-lisp.el' --- lisp/ls-lisp.el 2014-09-01 15:03:45 +0000 +++ lisp/ls-lisp.el 2014-09-11 19:44:25 +0000 @@ -543,7 +543,7 @@ On GNU/Linux systems, if the locale specifies UTF-8 as the codeset, the sorting order will place together file names that differ only by punctuation characters, like `.emacs' and `emacs'. To have a -similar behavior on MS-Widnows, customize `ls-lisp-UCA-like-collation' +similar behavior on MS-Windows, customize `ls-lisp-UCA-like-collation' to a non-nil value." (let ((w32-collate-ignore-punctuation ls-lisp-UCA-like-collation)) (if ls-lisp-use-string-collate === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2014-09-10 21:38:11 +0000 +++ lisp/progmodes/cc-engine.el 2014-09-11 19:44:25 +0000 @@ -3296,7 +3296,7 @@ (setq res (c-remove-stale-state-cache start-point here here-bopl)) (setq cache-pos (car res) scan-backward-pos (cadr res) - cons-separated (car (cddr res)) + cons-separated (car (cddr res)) bopl-state (cadr (cddr res))) ; will be nil if (< here-bopl ; start-point) (if (and scan-backward-pos @@ -6286,7 +6286,7 @@ ;; `*-font-lock-extra-types'); ;; o - 'prefix if it's a known prefix of a type; ;; o - 'found if it's a type that matches one in `c-found-types'; - ;; o - 'maybe if it's an identfier that might be a type; + ;; o - 'maybe if it's an identifier that might be a type; ;; o - 'decltype if it's a decltype(variable) declaration; - or ;; o - nil if it can't be a type (the point isn't moved then). ;; @@ -6668,8 +6668,8 @@ ;; auto foo = 5; ;; car ^ ^ point ;; auto cplusplus_11 (int a, char *b) -> decltype (bar): - ;; car ^ ^ point - ;; + ;; car ^ ^ point + ;; ;; ;; ;; The cdr of the return value is non-nil when a === modified file 'lisp/progmodes/hideif.el' --- lisp/progmodes/hideif.el 2014-07-21 06:03:08 +0000 +++ lisp/progmodes/hideif.el 2014-09-11 19:44:25 +0000 @@ -653,7 +653,7 @@ (stringp id)))) (defun hif-define-operator (tokens) - "`Upgrade' hif-define xxx to '(hif-define xxx)' so it won't be subsitituted." + "`Upgrade' hif-define xxx to '(hif-define xxx)' so it won't be substituted." (let ((result nil) (tok nil)) (while (setq tok (pop tokens)) @@ -975,7 +975,7 @@ (defun hif-define-macro (_parmlist _token-body) "A marker for defined macro with arguments. -This macro cannot be evaluated alone without parameters inputed." +This macro cannot be evaluated alone without parameters input." ;;TODO: input arguments at run time, use minibuffer to query all arguments (error "Argumented macro cannot be evaluated without passing any parameter")) @@ -1144,14 +1144,14 @@ actual-count (length actual-parms)) (if (> formal-count actual-count) - (error "Too few parmameter for macro %S" macro-name) + (error "Too few parameters for macro %S" macro-name) (if (< formal-count actual-count) (or etc (error "Too many parameters for macro %S" macro-name)))) ;; Perform token replacement on the MACRO-BODY with the parameters (while (setq formal (pop formal-parms)) - ;; Prevent repetitive substitutation, thus cannot use `subst' + ;; Prevent repetitive substitution, thus cannot use `subst' ;; for example: ;; #define mac(a,b) (a+b) ;; #define testmac mac(b,y) @@ -1734,7 +1734,7 @@ (or (setcdr SA expr) t) ;; Lazy evaluation, eval only if hif-lookup find it. ;; Define it anyway, even if nil it's still in list - ;; and therefore considerred defined + ;; and therefore considered defined. (push (cons (intern name) expr) hide-ifdef-env))))) ;; #undef (and name @@ -1912,7 +1912,7 @@ (defun hide-ifdef-block (&optional arg start end) "Hide the ifdef block (true or false part) enclosing or before the cursor. -With optional prefix agument ARG, also hide the #ifdefs themselves." +With optional prefix argument ARG, also hide the #ifdefs themselves." (interactive "P\nr") (let ((hide-ifdef-lines arg)) (if mark-active === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2014-09-03 04:21:40 +0000 +++ lisp/progmodes/python.el 2014-09-11 19:44:25 +0000 @@ -2153,7 +2153,7 @@ received in chunks, since `accept-process-output' gives no guarantees they will be grabbed in a single call. An example use case for this would be the CPython shell start-up, where the -banner and the initial prompt are received separetely." +banner and the initial prompt are received separately." (let ((regexp (or regexp comint-prompt-regexp))) (catch 'found (while t @@ -4110,7 +4110,7 @@ (cdr pair)))) (buffer-local-variables from-buffer))) -(defvar comint-last-prompt-overlay) ; Shut up, bytecompiler +(defvar comint-last-prompt-overlay) ; Shut up, byte compiler. (defun python-util-comint-last-prompt () "Return comint last prompt overlay start and end. === modified file 'lisp/progmodes/subword.el' --- lisp/progmodes/subword.el 2014-05-24 20:43:40 +0000 +++ lisp/progmodes/subword.el 2014-09-11 19:44:25 +0000 @@ -113,7 +113,7 @@ NSGraphicsContext => \"NS\", \"Graphics\" and \"Context\" This mode changes the definition of a word so that word commands -treat nomenclature boundaries as word bounaries. +treat nomenclature boundaries as word boundaries. \\{subword-mode-map}" :lighter " ," @@ -130,7 +130,7 @@ ;; N.B. These commands aren't used unless explicitly invoked; they're ;; here for compatibility. Today, subword-mode leaves motion commands ;; alone and uses `find-word-boundary-function-table' to change how -;; `forward-word' and other low-level commands detect word bounaries. +;; `forward-word' and other low-level commands detect word boundaries. ;; This way, all word-related activities, not just the images we ;; imagine here, get subword treatment. @@ -334,7 +334,7 @@ tab) "Assigned to `find-word-boundary-function-table' in `subword-mode' and `superword-mode'; defers to -`subword-find-word-bounary'.") +`subword-find-word-boundary'.") (defconst subword-empty-char-table (make-char-table nil) === modified file 'lisp/rect.el' --- lisp/rect.el 2014-08-04 06:27:14 +0000 +++ lisp/rect.el 2014-09-11 19:44:25 +0000 @@ -113,7 +113,7 @@ (if (window-parameter nil 'rectangle--point-crutches) (setf (window-parameter nil 'rectangle--point-crutches) nil)) (if rectangle--mark-crutches (setq rectangle--mark-crutches nil))) - ;; If move-to-column over-shooted, move back one char so we're + ;; If move-to-column overshot, move back one char so we're ;; at the position where rectangle--highlight-for-redisplay ;; will add the overlay (so that the cursor can be drawn at the ;; right place). === modified file 'lisp/ses.el' --- lisp/ses.el 2014-07-21 17:53:38 +0000 +++ lisp/ses.el 2014-09-11 19:44:25 +0000 @@ -301,7 +301,7 @@ (defmacro ses--metaprogramming (exp) (declare (debug t)) (eval exp t)) (ses--metaprogramming `(progn ,@(mapcar (lambda (x) `(defvar ,(or (car-safe x) x))) ses-localvars))) - + (defun ses-set-localvars () "Set buffer-local and initialize some SES variables." (dolist (x ses-localvars) @@ -1349,11 +1349,11 @@ (goto-char ses--params-marker) (forward-line def)))) -(defun ses-file-format-extend-paramter-list (new-file-format) +(defun ses-file-format-extend-parameter-list (new-file-format) "Extend the global parameters list when file format is updated from 2 to 3. This happens when local printer function are added to a sheet that was created with SES version 2. This is not -undoable. Return nil when there was no change, and non nil otherwise." +undoable. Return nil when there was no change, and non nil otherwise." (save-excursion (cond ((and (= ses--file-format 2) (= 3 new-file-format)) @@ -1759,7 +1759,7 @@ (numberp (nth 2 params)) (> (nth 2 params) 0) (or (<= params-len 3) - (let ((numlocprn (nth 3 params))) + (let ((numlocprn (nth 3 params))) (and (integerp numlocprn) (>= numlocprn 0))))) (error "Invalid SES file")) (setq ses--file-format (car params) @@ -1793,8 +1793,8 @@ (mapc 'ses-printer-record ses-standard-printer-functions) (setq ses--symbolic-formulas nil) - ;; Load local printer definitions. - ;; This must be loaded *BEFORE* cells and column printers because the latters + ;; Load local printer definitions. + ;; This must be loaded *BEFORE* cells and column printers because the latter ;; may call them. (save-excursion (forward-line (* ses--numrows (1+ ses--numcols))) @@ -3462,7 +3462,7 @@ (backward-char)) (insert printer-def-text) (when (= create-printer 1) - (ses-file-format-extend-paramter-list 3) + (ses-file-format-extend-parameter-list 3) (ses-set-parameter 'ses--numlocprn (+ ses--numlocprn create-printer)))))))))) === modified file 'lisp/textmodes/tex-mode.el' --- lisp/textmodes/tex-mode.el 2014-09-05 19:07:52 +0000 +++ lisp/textmodes/tex-mode.el 2014-09-11 19:44:25 +0000 @@ -2576,7 +2576,7 @@ (defcustom tex-print-file-extension ".dvi" "The TeX-compiled file extension for viewing and printing. If you use pdflatex instead of latex, set this to \".pdf\" and modify - `tex-dvi-view-command' and `tex-dvi-print-command' appropriatelty." + `tex-dvi-view-command' and `tex-dvi-print-command' appropriately." :type 'string :group 'tex-view :version "24.5") === modified file 'lisp/window.el' --- lisp/window.el 2014-08-29 10:39:17 +0000 +++ lisp/window.el 2014-09-11 19:44:25 +0000 @@ -3026,12 +3026,12 @@ If necessary and possible, make sure that every window on frame FRAME has its minimum height. Optional argument HORIZONTAL non-nil means to make sure that every window on frame FRAME has -its minimum width. The minimumm height/width of a window is the +its minimum width. The minimum height/width of a window is the respective value returned by `window-min-size' for that window. Return t if all windows were resized appropriately. Return nil if at least one window could not be resized as requested, which -may happen when the FRAME is not large enough to accomodate it." +may happen when the FRAME is not large enough to accommodate it." (let ((value t)) (walk-window-tree (lambda (window) === modified file 'src/alloc.c' --- src/alloc.c 2014-09-10 15:21:46 +0000 +++ src/alloc.c 2014-09-11 19:44:25 +0000 @@ -453,7 +453,7 @@ /* If we can't store all memory addresses in our lisp objects, it's risky to let the heap use mmap and give us addresses from all over our address space. We also can't use mmap for lisp objects - if we might dump: unexec doesn't preserve the contents of mmaped + if we might dump: unexec doesn't preserve the contents of mmapped regions. */ return pointers_fit_in_lispobj_p () && !might_dump; } @@ -7131,7 +7131,7 @@ DEFUN ("suspicious-object", Fsuspicious_object, Ssuspicious_object, 1, 1, 0, doc: /* Return OBJ, maybe marking it for extra scrutiny. -If Emacs is compiled with suspicous object checking, capture +If Emacs is compiled with suspicious object checking, capture a stack trace when OBJ is freed in order to help track down garbage collection bugs. Otherwise, do nothing and return OBJ. */) (Lisp_Object obj) === modified file 'src/buffer.c' --- src/buffer.c 2014-09-07 07:04:01 +0000 +++ src/buffer.c 2014-09-11 19:44:25 +0000 @@ -5943,7 +5943,7 @@ for instance, with `set-window-buffer' or when `display-buffer' displays it. A value of `bottom' means put the horizontal scroll bar at the bottom of -the window; a value of nil means don't show any horizonal scroll bars. +the window; a value of nil means don't show any horizontal scroll bars. A value of t (the default) means do whatever the window's frame specifies. */); === modified file 'src/frame.c' --- src/frame.c 2014-09-11 00:48:57 +0000 +++ src/frame.c 2014-09-11 19:44:25 +0000 @@ -351,7 +351,7 @@ /* Make sure windows sizes of frame F are OK. new_width and new_height are in pixels. A value of -1 means no change is requested for that - size (but the frame may still have to be resized to accomodate + size (but the frame may still have to be resized to accommodate windows with their minimum sizes. The argument INHIBIT can assume the following values: === modified file 'src/frame.h' --- src/frame.h 2014-09-11 00:48:57 +0000 +++ src/frame.h 2014-09-11 19:44:25 +0000 @@ -1288,7 +1288,7 @@ / FRAME_LINE_HEIGHT (f)) /* Return the pixel width/height of frame F with a text size of - width/heigh. */ + width/height. */ #define FRAME_TEXT_TO_PIXEL_WIDTH(f, width) \ ((width) \ + FRAME_SCROLL_BAR_AREA_WIDTH (f) \ === modified file 'test/automated/subr-x-tests.el' --- test/automated/subr-x-tests.el 2014-06-30 19:58:56 +0000 +++ test/automated/subr-x-tests.el 2014-09-11 19:44:25 +0000 @@ -165,7 +165,7 @@ (list 1 2 3)))) (ert-deftest subr-x-test-if-let-false () - "Test `if-let' with falsey bindings." + "Test `if-let' with falsie bindings." (should (equal (if-let (a nil) (list a b c) @@ -205,8 +205,8 @@ "no") (list 1 2 3)))) -(ert-deftest subr-x-test-if-let-and-lazyness-is-preserved () - "Test `if-let' respects `and' lazyness." +(ert-deftest subr-x-test-if-let-and-laziness-is-preserved () + "Test `if-let' respects `and' laziness." (let (a-called b-called c-called) (should (equal (if-let ((a nil) @@ -360,7 +360,7 @@ (list 1 2 3)))) (ert-deftest subr-x-test-when-let-false () - "Test `when-let' with falsey bindings." + "Test `when-let' with falsie bindings." (should (equal (when-let (a nil) (list a b c) @@ -399,8 +399,8 @@ (list a b c)) (list 1 2 3)))) -(ert-deftest subr-x-test-when-let-and-lazyness-is-preserved () - "Test `when-let' respects `and' lazyness." +(ert-deftest subr-x-test-when-let-and-laziness-is-preserved () + "Test `when-let' respects `and' laziness." (let (a-called b-called c-called) (should (equal (progn === modified file 'test/automated/tildify-tests.el' --- test/automated/tildify-tests.el 2014-06-05 14:42:45 +0000 +++ test/automated/tildify-tests.el 2014-09-11 19:44:25 +0000 @@ -1,4 +1,4 @@ -;;; tildify-test.el --- ERT tests for teldify.el +;;; tildify-test.el --- ERT tests for tildify.el ;; Copyright (C) 2014 Free Software Foundation, Inc. ------------------------------------------------------------ revno: 117866 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2014-09-11 17:21:19 +0400 message: Remove redundant GCPROs around Ffuncall and Fapply calls. This is safe because Ffuncall protects all of its arguments by itself. * charset.c (map_charset_for_dump): Remove redundant GCPRO. * eval.c (Fapply, apply1, call0, call1, call2, call3, call4, call5) (call6, call7): Likewise. Use compound literals where applicable. (run_hook_with_args_2): Use compound literal. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-11 13:02:09 +0000 +++ src/ChangeLog 2014-09-11 13:21:19 +0000 @@ -11,6 +11,13 @@ * lread.c (readevalloop_eager_expand_eval): Add GCPRO and fix bootstrap broken if GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. + Remove redundant GCPROs around Ffuncall and Fapply calls. This + is safe because Ffuncall protects all of its arguments by itself. + * charset.c (map_charset_for_dump): Remove redundant GCPRO. + * eval.c (Fapply, apply1, call0, call1, call2, call3, call4, call5) + (call6, call7): Likewise. Use compound literals where applicable. + (run_hook_with_args_2): Use compound literal. + 2014-09-11 Paul Eggert Pacify --enable-gcc-warnings when no window system is used. === modified file 'src/charset.c' --- src/charset.c 2014-09-11 00:29:54 +0000 +++ src/charset.c 2014-09-11 13:21:19 +0000 @@ -667,12 +667,8 @@ { int from_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, from); int to_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, to); - Lisp_Object range; + Lisp_Object range = Fcons (Qnil, Qnil); int c, stop; - struct gcpro gcpro1; - - range = Fcons (Qnil, Qnil); - GCPRO1 (range); c = temp_charset_work->min_char; stop = (temp_charset_work->max_char < 0x20000 @@ -715,7 +711,6 @@ } c++; } - UNGCPRO; } void === modified file 'src/eval.c' --- src/eval.c 2014-09-07 07:04:01 +0000 +++ src/eval.c 2014-09-11 13:21:19 +0000 @@ -2274,12 +2274,10 @@ usage: (apply FUNCTION &rest ARGUMENTS) */) (ptrdiff_t nargs, Lisp_Object *args) { - ptrdiff_t i; - EMACS_INT numargs; + ptrdiff_t i, numargs, funcall_nargs; register Lisp_Object spread_arg; register Lisp_Object *funcall_args; Lisp_Object fun, retval; - struct gcpro gcpro1; USE_SAFE_ALLOCA; fun = args [0]; @@ -2320,10 +2318,9 @@ /* Avoid making funcall cons up a yet another new vector of arguments by explicitly supplying nil's for optional values. */ SAFE_ALLOCA_LISP (funcall_args, 1 + XSUBR (fun)->max_args); - for (i = numargs; i < XSUBR (fun)->max_args;) + for (i = numargs; i < XSUBR (fun)->max_args; /* nothing */) funcall_args[++i] = Qnil; - GCPRO1 (*funcall_args); - gcpro1.nvars = 1 + XSUBR (fun)->max_args; + funcall_nargs = 1 + XSUBR (fun)->max_args; } } funcall: @@ -2332,8 +2329,7 @@ if (!funcall_args) { SAFE_ALLOCA_LISP (funcall_args, 1 + numargs); - GCPRO1 (*funcall_args); - gcpro1.nvars = 1 + numargs; + funcall_nargs = 1 + numargs; } memcpy (funcall_args, args, nargs * word_size); @@ -2346,11 +2342,10 @@ spread_arg = XCDR (spread_arg); } - /* By convention, the caller needs to gcpro Ffuncall's args. */ - retval = Ffuncall (gcpro1.nvars, funcall_args); - UNGCPRO; + /* Ffuncall gcpro's all of its args. */ + retval = Ffuncall (funcall_nargs, funcall_args); + SAFE_FREE (); - return retval; } @@ -2558,41 +2553,22 @@ void run_hook_with_args_2 (Lisp_Object hook, Lisp_Object arg1, Lisp_Object arg2) { - Lisp_Object temp[3]; - temp[0] = hook; - temp[1] = arg1; - temp[2] = arg2; + Frun_hook_with_args (3, ((Lisp_Object []) { hook, arg1, arg2 })); +} - Frun_hook_with_args (3, temp); -} - /* Apply fn to arg. */ Lisp_Object apply1 (Lisp_Object fn, Lisp_Object arg) { - struct gcpro gcpro1; - - GCPRO1 (fn); - if (NILP (arg)) - RETURN_UNGCPRO (Ffuncall (1, &fn)); - gcpro1.nvars = 2; - { - Lisp_Object args[2]; - args[0] = fn; - args[1] = arg; - gcpro1.var = args; - RETURN_UNGCPRO (Fapply (2, args)); - } + return (NILP (arg) ? Ffuncall (1, &fn) + : Fapply (2, ((Lisp_Object []) { fn, arg }))); } /* Call function fn on no arguments. */ Lisp_Object call0 (Lisp_Object fn) { - struct gcpro gcpro1; - - GCPRO1 (fn); - RETURN_UNGCPRO (Ffuncall (1, &fn)); + return Ffuncall (1, &fn); } /* Call function fn with 1 argument arg1. */ @@ -2600,14 +2576,7 @@ Lisp_Object call1 (Lisp_Object fn, Lisp_Object arg1) { - struct gcpro gcpro1; - Lisp_Object args[2]; - - args[0] = fn; - args[1] = arg1; - GCPRO1 (args[0]); - gcpro1.nvars = 2; - RETURN_UNGCPRO (Ffuncall (2, args)); + return Ffuncall (2, ((Lisp_Object []) { fn, arg1 })); } /* Call function fn with 2 arguments arg1, arg2. */ @@ -2615,14 +2584,7 @@ Lisp_Object call2 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2) { - struct gcpro gcpro1; - Lisp_Object args[3]; - args[0] = fn; - args[1] = arg1; - args[2] = arg2; - GCPRO1 (args[0]); - gcpro1.nvars = 3; - RETURN_UNGCPRO (Ffuncall (3, args)); + return Ffuncall (3, ((Lisp_Object []) { fn, arg1, arg2 })); } /* Call function fn with 3 arguments arg1, arg2, arg3. */ @@ -2630,15 +2592,7 @@ Lisp_Object call3 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3) { - struct gcpro gcpro1; - Lisp_Object args[4]; - args[0] = fn; - args[1] = arg1; - args[2] = arg2; - args[3] = arg3; - GCPRO1 (args[0]); - gcpro1.nvars = 4; - RETURN_UNGCPRO (Ffuncall (4, args)); + return Ffuncall (4, ((Lisp_Object []) { fn, arg1, arg2, arg3 })); } /* Call function fn with 4 arguments arg1, arg2, arg3, arg4. */ @@ -2647,16 +2601,7 @@ call4 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4) { - struct gcpro gcpro1; - Lisp_Object args[5]; - args[0] = fn; - args[1] = arg1; - args[2] = arg2; - args[3] = arg3; - args[4] = arg4; - GCPRO1 (args[0]); - gcpro1.nvars = 5; - RETURN_UNGCPRO (Ffuncall (5, args)); + return Ffuncall (5, ((Lisp_Object []) { fn, arg1, arg2, arg3, arg4 })); } /* Call function fn with 5 arguments arg1, arg2, arg3, arg4, arg5. */ @@ -2665,17 +2610,7 @@ call5 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, Lisp_Object arg5) { - struct gcpro gcpro1; - Lisp_Object args[6]; - args[0] = fn; - args[1] = arg1; - args[2] = arg2; - args[3] = arg3; - args[4] = arg4; - args[5] = arg5; - GCPRO1 (args[0]); - gcpro1.nvars = 6; - RETURN_UNGCPRO (Ffuncall (6, args)); + return Ffuncall (6, ((Lisp_Object []) { fn, arg1, arg2, arg3, arg4, arg5 })); } /* Call function fn with 6 arguments arg1, arg2, arg3, arg4, arg5, arg6. */ @@ -2684,18 +2619,8 @@ call6 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, Lisp_Object arg5, Lisp_Object arg6) { - struct gcpro gcpro1; - Lisp_Object args[7]; - args[0] = fn; - args[1] = arg1; - args[2] = arg2; - args[3] = arg3; - args[4] = arg4; - args[5] = arg5; - args[6] = arg6; - GCPRO1 (args[0]); - gcpro1.nvars = 7; - RETURN_UNGCPRO (Ffuncall (7, args)); + return Ffuncall (7, ((Lisp_Object []) + { fn, arg1, arg2, arg3, arg4, arg5, arg6 })); } /* Call function fn with 7 arguments arg1, arg2, arg3, arg4, arg5, arg6, arg7. */ @@ -2704,19 +2629,8 @@ call7 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, Lisp_Object arg5, Lisp_Object arg6, Lisp_Object arg7) { - struct gcpro gcpro1; - Lisp_Object args[8]; - args[0] = fn; - args[1] = arg1; - args[2] = arg2; - args[3] = arg3; - args[4] = arg4; - args[5] = arg5; - args[6] = arg6; - args[7] = arg7; - GCPRO1 (args[0]); - gcpro1.nvars = 8; - RETURN_UNGCPRO (Ffuncall (8, args)); + return Ffuncall (8, ((Lisp_Object []) + { fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7 })); } /* The caller should GCPRO all the elements of ARGS. */ ------------------------------------------------------------ revno: 117865 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2014-09-11 17:02:09 +0400 message: * lread.c (readevalloop_eager_expand_eval): Add GCPRO and fix bootstrap broken if GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-11 09:14:45 +0000 +++ src/ChangeLog 2014-09-11 13:02:09 +0000 @@ -8,6 +8,9 @@ (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6, GCPRO7): Minor restyle. If DEBUG_GCPRO, initialize extra fields. + * lread.c (readevalloop_eager_expand_eval): Add GCPRO and fix + bootstrap broken if GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. + 2014-09-11 Paul Eggert Pacify --enable-gcc-warnings when no window system is used. === modified file 'src/lread.c' --- src/lread.c 2014-09-07 07:04:01 +0000 +++ src/lread.c 2014-09-11 13:02:09 +0000 @@ -1782,15 +1782,17 @@ val = call2 (macroexpand, val, Qnil); if (EQ (CAR_SAFE (val), Qprogn)) { + struct gcpro gcpro1; Lisp_Object subforms = XCDR (val); - val = Qnil; - for (; CONSP (subforms); subforms = XCDR (subforms)) + + GCPRO1 (subforms); + for (val = Qnil; CONSP (subforms); subforms = XCDR (subforms)) val = readevalloop_eager_expand_eval (XCAR (subforms), macroexpand); + UNGCPRO; } else val = eval_sub (call2 (macroexpand, val, Qt)); - return val; } ------------------------------------------------------------ revno: 117864 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2014-09-11 13:14:45 +0400 message: More debugging aids around GCPROs. * lisp.h (struct gcpro) [DEBUG_GCPRO]: Add extra members. (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6, GCPRO7): Minor restyle. If DEBUG_GCPRO, initialize extra fields. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-11 06:21:55 +0000 +++ src/ChangeLog 2014-09-11 09:14:45 +0000 @@ -3,6 +3,11 @@ * lisp.h (make_local_string): Nitpick indent. * print.c (Fprin1_to_string): Remove unused GCPROs. + More debugging aids around GCPROs. + * lisp.h (struct gcpro) [DEBUG_GCPRO]: Add extra members. + (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6, GCPRO7): + Minor restyle. If DEBUG_GCPRO, initialize extra fields. + 2014-09-11 Paul Eggert Pacify --enable-gcc-warnings when no window system is used. === modified file 'src/lisp.h' --- src/lisp.h 2014-09-11 06:21:55 +0000 +++ src/lisp.h 2014-09-11 09:14:45 +0000 @@ -3016,6 +3016,16 @@ ptrdiff_t nvars; #ifdef DEBUG_GCPRO + /* File name where this record is used. */ + const char *name; + + /* Line number in this file. */ + int lineno; + + /* Index in the local chain of records. */ + int idx; + + /* Nesting level. */ int level; #endif }; @@ -3071,122 +3081,150 @@ #ifndef DEBUG_GCPRO -#define GCPRO1(varname) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname; gcpro1.nvars = 1; \ - gcprolist = &gcpro1; } - -#define GCPRO2(varname1, varname2) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcprolist = &gcpro2; } - -#define GCPRO3(varname1, varname2, varname3) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcprolist = &gcpro3; } - -#define GCPRO4(varname1, varname2, varname3, varname4) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \ - gcprolist = &gcpro4; } - -#define GCPRO5(varname1, varname2, varname3, varname4, varname5) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \ - gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \ - gcprolist = &gcpro5; } - -#define GCPRO6(varname1, varname2, varname3, varname4, varname5, varname6) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \ - gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \ - gcpro6.next = &gcpro5; gcpro6.var = &varname6; gcpro6.nvars = 1; \ - gcprolist = &gcpro6; } - -#define GCPRO7(a, b, c, d, e, f, g) \ - {gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ - gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ - gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ - gcpro6.next = &gcpro5; gcpro6.var = &(f); gcpro6.nvars = 1; \ - gcpro7.next = &gcpro6; gcpro7.var = &(g); gcpro7.nvars = 1; \ - gcprolist = &gcpro7; } +#define GCPRO1(a) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcprolist = &gcpro1; } + +#define GCPRO2(a, b) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcprolist = &gcpro2; } + +#define GCPRO3(a, b, c) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcprolist = &gcpro3; } + +#define GCPRO4(a, b, c, d) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcprolist = &gcpro4; } + +#define GCPRO5(a, b, c, d, e) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ + gcprolist = &gcpro5; } + +#define GCPRO6(a, b, c, d, e, f) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ + gcpro6.next = &gcpro5; gcpro6.var = &(f); gcpro6.nvars = 1; \ + gcprolist = &gcpro6; } + +#define GCPRO7(a, b, c, d, e, f, g) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ + gcpro6.next = &gcpro5; gcpro6.var = &(f); gcpro6.nvars = 1; \ + gcpro7.next = &gcpro6; gcpro7.var = &(g); gcpro7.nvars = 1; \ + gcprolist = &gcpro7; } #define UNGCPRO (gcprolist = gcpro1.next) -#else +#else /* !DEBUG_GCPRO */ extern int gcpro_level; -#define GCPRO1(varname) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname; gcpro1.nvars = 1; \ - gcpro1.level = gcpro_level++; \ - gcprolist = &gcpro1; } - -#define GCPRO2(varname1, varname2) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro1.level = gcpro_level; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro2.level = gcpro_level++; \ - gcprolist = &gcpro2; } - -#define GCPRO3(varname1, varname2, varname3) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro1.level = gcpro_level; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcpro3.level = gcpro_level++; \ - gcprolist = &gcpro3; } - -#define GCPRO4(varname1, varname2, varname3, varname4) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro1.level = gcpro_level; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \ - gcpro4.level = gcpro_level++; \ - gcprolist = &gcpro4; } - -#define GCPRO5(varname1, varname2, varname3, varname4, varname5) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro1.level = gcpro_level; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \ - gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \ - gcpro5.level = gcpro_level++; \ - gcprolist = &gcpro5; } - -#define GCPRO6(varname1, varname2, varname3, varname4, varname5, varname6) \ - {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \ - gcpro1.level = gcpro_level; \ - gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \ - gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \ - gcpro6.next = &gcpro5; gcpro6.var = &varname6; gcpro6.nvars = 1; \ - gcpro6.level = gcpro_level++; \ - gcprolist = &gcpro6; } +#define GCPRO1(a) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro1.name = __FILE__; gcpro1.lineno = __LINE__; gcpro1.idx = 1; \ + gcpro1.level = gcpro_level++; \ + gcprolist = &gcpro1; } + +#define GCPRO2(a, b) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro1.name = __FILE__; gcpro1.lineno = __LINE__; gcpro1.idx = 1; \ + gcpro1.level = gcpro_level; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro2.name = __FILE__; gcpro2.lineno = __LINE__; gcpro2.idx = 2; \ + gcpro2.level = gcpro_level++; \ + gcprolist = &gcpro2; } + +#define GCPRO3(a, b, c) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro1.name = __FILE__; gcpro1.lineno = __LINE__; gcpro1.idx = 1; \ + gcpro1.level = gcpro_level; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro2.name = __FILE__; gcpro2.lineno = __LINE__; gcpro2.idx = 2; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro3.name = __FILE__; gcpro3.lineno = __LINE__; gcpro3.idx = 3; \ + gcpro3.level = gcpro_level++; \ + gcprolist = &gcpro3; } + +#define GCPRO4(a, b, c, d) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro1.name = __FILE__; gcpro1.lineno = __LINE__; gcpro1.idx = 1; \ + gcpro1.level = gcpro_level; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro2.name = __FILE__; gcpro2.lineno = __LINE__; gcpro2.idx = 2; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro3.name = __FILE__; gcpro3.lineno = __LINE__; gcpro3.idx = 3; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcpro4.name = __FILE__; gcpro4.lineno = __LINE__; gcpro4.idx = 4; \ + gcpro4.level = gcpro_level++; \ + gcprolist = &gcpro4; } + +#define GCPRO5(a, b, c, d, e) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro1.name = __FILE__; gcpro1.lineno = __LINE__; gcpro1.idx = 1; \ + gcpro1.level = gcpro_level; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro2.name = __FILE__; gcpro2.lineno = __LINE__; gcpro2.idx = 2; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro3.name = __FILE__; gcpro3.lineno = __LINE__; gcpro3.idx = 3; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcpro4.name = __FILE__; gcpro4.lineno = __LINE__; gcpro4.idx = 4; \ + gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ + gcpro5.name = __FILE__; gcpro5.lineno = __LINE__; gcpro5.idx = 5; \ + gcpro5.level = gcpro_level++; \ + gcprolist = &gcpro5; } + +#define GCPRO6(a, b, c, d, e, f) \ + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro1.name = __FILE__; gcpro1.lineno = __LINE__; gcpro1.idx = 1; \ + gcpro1.level = gcpro_level; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro2.name = __FILE__; gcpro2.lineno = __LINE__; gcpro2.idx = 2; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro3.name = __FILE__; gcpro3.lineno = __LINE__; gcpro3.idx = 3; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcpro4.name = __FILE__; gcpro4.lineno = __LINE__; gcpro4.idx = 4; \ + gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ + gcpro5.name = __FILE__; gcpro5.lineno = __LINE__; gcpro5.idx = 5; \ + gcpro6.next = &gcpro5; gcpro6.var = &(f); gcpro6.nvars = 1; \ + gcpro6.name = __FILE__; gcpro6.lineno = __LINE__; gcpro6.idx = 6; \ + gcpro6.level = gcpro_level++; \ + gcprolist = &gcpro6; } #define GCPRO7(a, b, c, d, e, f, g) \ - {gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ - gcpro1.level = gcpro_level; \ - gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ - gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ - gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ - gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ - gcpro6.next = &gcpro5; gcpro6.var = &(f); gcpro6.nvars = 1; \ - gcpro7.next = &gcpro6; gcpro7.var = &(g); gcpro7.nvars = 1; \ - gcpro7.level = gcpro_level++; \ - gcprolist = &gcpro7; } + { gcpro1.next = gcprolist; gcpro1.var = &(a); gcpro1.nvars = 1; \ + gcpro1.name = __FILE__; gcpro1.lineno = __LINE__; gcpro1.idx = 1; \ + gcpro1.level = gcpro_level; \ + gcpro2.next = &gcpro1; gcpro2.var = &(b); gcpro2.nvars = 1; \ + gcpro2.name = __FILE__; gcpro2.lineno = __LINE__; gcpro2.idx = 2; \ + gcpro3.next = &gcpro2; gcpro3.var = &(c); gcpro3.nvars = 1; \ + gcpro3.name = __FILE__; gcpro3.lineno = __LINE__; gcpro3.idx = 3; \ + gcpro4.next = &gcpro3; gcpro4.var = &(d); gcpro4.nvars = 1; \ + gcpro4.name = __FILE__; gcpro4.lineno = __LINE__; gcpro4.idx = 4; \ + gcpro5.next = &gcpro4; gcpro5.var = &(e); gcpro5.nvars = 1; \ + gcpro5.name = __FILE__; gcpro5.lineno = __LINE__; gcpro5.idx = 5; \ + gcpro6.next = &gcpro5; gcpro6.var = &(f); gcpro6.nvars = 1; \ + gcpro6.name = __FILE__; gcpro6.lineno = __LINE__; gcpro6.idx = 6; \ + gcpro7.next = &gcpro6; gcpro7.var = &(g); gcpro7.nvars = 1; \ + gcpro7.name = __FILE__; gcpro7.lineno = __LINE__; gcpro7.idx = 7; \ + gcpro7.level = gcpro_level++; \ + gcprolist = &gcpro7; } #define UNGCPRO \ (--gcpro_level != gcpro1.level \ ------------------------------------------------------------ revno: 117863 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2014-09-11 10:21:55 +0400 message: * lisp.h (make_local_string): Nitpick indent. * print.c (Fprin1_to_string): Remove unused GCPROs. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-11 00:48:57 +0000 +++ src/ChangeLog 2014-09-11 06:21:55 +0000 @@ -1,3 +1,8 @@ +2014-09-11 Dmitry Antipov + + * lisp.h (make_local_string): Nitpick indent. + * print.c (Fprin1_to_string): Remove unused GCPROs. + 2014-09-11 Paul Eggert Pacify --enable-gcc-warnings when no window system is used. === modified file 'src/lisp.h' --- src/lisp.h 2014-09-10 20:56:05 +0000 +++ src/lisp.h 2014-09-11 06:21:55 +0000 @@ -4594,8 +4594,8 @@ Lisp_Object string_; \ if (nbytes_ <= MAX_ALLOCA - sizeof (struct Lisp_String) - 1) \ { \ - struct Lisp_String *ptr_ = alloca (sizeof (struct Lisp_String) + 1 \ - + nbytes_); \ + struct Lisp_String *ptr_ \ + = alloca (sizeof (struct Lisp_String) + 1 + nbytes_); \ string_ = local_string_init (ptr_, data_, nbytes_); \ } \ else \ === modified file 'src/print.c' --- src/print.c 2014-09-07 07:04:01 +0000 +++ src/print.c 2014-09-11 06:21:55 +0000 @@ -583,7 +583,6 @@ { Lisp_Object printcharfun; bool prev_abort_on_gc; - /* struct gcpro gcpro1, gcpro2; */ Lisp_Object save_deactivate_mark; ptrdiff_t count = SPECPDL_INDEX (); struct buffer *previous; @@ -597,7 +596,6 @@ but we don't want to deactivate the mark just for that. No need for specbind, since errors deactivate the mark. */ save_deactivate_mark = Vdeactivate_mark; - /* GCPRO2 (object, save_deactivate_mark); */ prev_abort_on_gc = abort_on_gc; abort_on_gc = 1; @@ -621,7 +619,6 @@ set_buffer_internal (previous); Vdeactivate_mark = save_deactivate_mark; - /* UNGCPRO; */ abort_on_gc = prev_abort_on_gc; return unbind_to (count, object); ------------------------------------------------------------ revno: 117862 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-10 17:48:57 -0700 message: Pacify --enable-gcc-warnings when no window system is used. These warnings found that subscript error, so they seem worthwhile. * composite.c (char_composable_p): Simplify a bit. * frame.c (x_set_frame_parameters): Add an IF_LINT. * frame.c (x_set_horizontal_scroll_bars, x_set_scroll_bar_height): * frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS): * window.c (set_window_scroll_bars): Use USE_HORIZONTAL_SCROLL_BARS for simplicity. * frame.h [! USE_HORIZONTAL_SCROLL_BARS]: Ignore -Wsuggest-attribute=const. * window.h (USE_HORIZONTAL_SCROLL_BARS): New macro. (WINDOW_HAS_HORIZONTAL_SCROLL_BAR): Use it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-11 00:29:54 +0000 +++ src/ChangeLog 2014-09-11 00:48:57 +0000 @@ -1,3 +1,18 @@ +2014-09-11 Paul Eggert + + Pacify --enable-gcc-warnings when no window system is used. + These warnings found that subscript error, so they seem worthwhile. + * composite.c (char_composable_p): Simplify a bit. + * frame.c (x_set_frame_parameters): Add an IF_LINT. + * frame.c (x_set_horizontal_scroll_bars, x_set_scroll_bar_height): + * frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS): + * window.c (set_window_scroll_bars): + Use USE_HORIZONTAL_SCROLL_BARS for simplicity. + * frame.h [! USE_HORIZONTAL_SCROLL_BARS]: + Ignore -Wsuggest-attribute=const. + * window.h (USE_HORIZONTAL_SCROLL_BARS): New macro. + (WINDOW_HAS_HORIZONTAL_SCROLL_BAR): Use it. + 2014-09-10 Paul Eggert * charset.c (Fget_unused_iso_final_char): Fix subscript error. === modified file 'src/composite.c' --- src/composite.c 2014-06-25 12:11:08 +0000 +++ src/composite.c 2014-09-11 00:48:57 +0000 @@ -928,7 +928,7 @@ char_composable_p (int c) { Lisp_Object val; - return (c > ' ' + return (c > ' ' && (c == 0x200C || c == 0x200D || (val = CHAR_TABLE_REF (Vunicode_category_table, c), (INTEGERP (val) && (XINT (val) <= UNICODE_CATEGORY_So))))); @@ -1016,24 +1016,19 @@ val = CHAR_TABLE_REF (Vcomposition_function_table, c); if (! NILP (val)) { - Lisp_Object elt; - int ridx; - - for (ridx = 0; CONSP (val); val = XCDR (val), ridx++) + for (int ridx = 0; CONSP (val); val = XCDR (val), ridx++) { - elt = XCAR (val); + Lisp_Object elt = XCAR (val); if (VECTORP (elt) && ASIZE (elt) == 3 && NATNUMP (AREF (elt, 1)) && charpos - 1 - XFASTINT (AREF (elt, 1)) >= start) - break; - } - if (CONSP (val)) - { - cmp_it->rule_idx = ridx; - cmp_it->lookback = XFASTINT (AREF (elt, 1)); - cmp_it->stop_pos = charpos - 1 - cmp_it->lookback; - cmp_it->ch = c; - return; + { + cmp_it->rule_idx = ridx; + cmp_it->lookback = XFASTINT (AREF (elt, 1)); + cmp_it->stop_pos = charpos - 1 - cmp_it->lookback; + cmp_it->ch = c; + return; + } } } } === modified file 'src/frame.c' --- src/frame.c 2014-09-07 07:04:01 +0000 +++ src/frame.c 2014-09-11 00:48:57 +0000 @@ -3002,7 +3002,7 @@ /* If both of these parameters are present, it's more efficient to set them both at once. So we wait until we've looked at the entire list before we set them. */ - int width, height; + int width, height IF_LINT (= 0); bool width_change = 0, height_change = 0; /* Same here. */ @@ -3771,9 +3771,7 @@ void x_set_horizontal_scroll_bars (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { -#if (defined (HAVE_WINDOW_SYSTEM) \ - && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ - || defined (HAVE_NTGUI))) +#if USE_HORIZONTAL_SCROLL_BARS if ((NILP (arg) && FRAME_HAS_HORIZONTAL_SCROLL_BARS (f)) || (!NILP (arg) && !FRAME_HAS_HORIZONTAL_SCROLL_BARS (f))) { @@ -3823,9 +3821,7 @@ void x_set_scroll_bar_height (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { -#if (defined (HAVE_WINDOW_SYSTEM) \ - && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ - || defined (HAVE_NTGUI))) +#if USE_HORIZONTAL_SCROLL_BARS int unit = FRAME_LINE_HEIGHT (f); if (NILP (arg)) === modified file 'src/frame.h' --- src/frame.h 2014-08-04 16:47:27 +0000 +++ src/frame.h 2014-09-11 00:48:57 +0000 @@ -868,9 +868,7 @@ #endif /* HAVE_WINDOW_SYSTEM */ /* Whether horizontal scroll bars are currently enabled for frame F. */ -#if (defined (HAVE_WINDOW_SYSTEM) \ - && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ - || defined (HAVE_NTGUI))) +#if USE_HORIZONTAL_SCROLL_BARS #define FRAME_HAS_HORIZONTAL_SCROLL_BARS(f) \ ((f)->horizontal_scroll_bars) #else @@ -1501,4 +1499,11 @@ INLINE_HEADER_END +/* Suppress -Wsuggest-attribute=const if there are no scroll bars. + This is for functions like x_set_horizontal_scroll_bars that have + no effect in this case. */ +#if ! USE_HORIZONTAL_SCROLL_BARS && 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# pragma GCC diagnostic ignored "-Wsuggest-attribute=const" +#endif + #endif /* not EMACS_FRAME_H */ === modified file 'src/window.c' --- src/window.c 2014-09-07 07:04:01 +0000 +++ src/window.c 2014-09-11 00:48:57 +0000 @@ -7376,9 +7376,7 @@ } } -#if (defined (HAVE_WINDOW_SYSTEM) \ - && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ - || defined (HAVE_NTGUI))) +#if USE_HORIZONTAL_SCROLL_BARS { int iheight = (NILP (height) ? -1 : (CHECK_NATNUM (height), XINT (height))); === modified file 'src/window.h' --- src/window.h 2014-08-04 16:47:27 +0000 +++ src/window.h 2014-09-11 00:48:57 +0000 @@ -785,11 +785,17 @@ (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (W) \ || WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (W)) -/* Say whether horizontal scroll bars are currently enabled for window - W. Horizontal scrollbars exist for toolkit versions only. */ #if (defined (HAVE_WINDOW_SYSTEM) \ && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ || defined (HAVE_NTGUI))) +# define USE_HORIZONTAL_SCROLL_BARS true +#else +# define USE_HORIZONTAL_SCROLL_BARS false +#endif + +/* Say whether horizontal scroll bars are currently enabled for window + W. Horizontal scrollbars exist for toolkit versions only. */ +#if USE_HORIZONTAL_SCROLL_BARS #define WINDOW_HAS_HORIZONTAL_SCROLL_BAR(W) \ ((WINDOW_PSEUDO_P (W) || MINI_NON_ONLY_WINDOW_P (W)) \ ? false \ ------------------------------------------------------------ revno: 117861 author: Paul Eggert committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-10 17:29:54 -0700 message: * charset.c (Fget_unused_iso_final_char): Fix subscript error. Use check_iso_charset_parameter instead of doing the checks by hand. (check_iso_charset_parameter): Move up. Check parameters a bit more carefully, and return true for 96-char sets. All callers changed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-10 20:56:05 +0000 +++ src/ChangeLog 2014-09-11 00:29:54 +0000 @@ -1,3 +1,10 @@ +2014-09-10 Paul Eggert + + * charset.c (Fget_unused_iso_final_char): Fix subscript error. + Use check_iso_charset_parameter instead of doing the checks by hand. + (check_iso_charset_parameter): Move up. Check parameters a bit + more carefully, and return true for 96-char sets. All callers changed. + 2014-09-10 Paul Eggert Simplify lisp.h by removing the __COUNTER__ business. === modified file 'src/charset.c' --- src/charset.c 2014-09-01 16:05:43 +0000 +++ src/charset.c 2014-09-11 00:29:54 +0000 @@ -1400,6 +1400,32 @@ return Qnil; } +/* Check that DIMENSION, CHARS, and FINAL_CHAR specify a valid ISO charset. + Return true if it's a 96-character set, false if 94. */ + +static bool +check_iso_charset_parameter (Lisp_Object dimension, Lisp_Object chars, + Lisp_Object final_char) +{ + CHECK_NUMBER (dimension); + CHECK_NUMBER (chars); + CHECK_CHARACTER (final_char); + + if (! (1 <= XINT (dimension) && XINT (dimension) <= 3)) + error ("Invalid DIMENSION %"pI"d, it should be 1, 2, or 3", + XINT (dimension)); + + bool chars_flag = XINT (chars) == 96; + if (! (chars_flag || XINT (chars) == 94)) + error ("Invalid CHARS %"pI"d, it should be 94 or 96", XINT (chars)); + + int final_ch = XFASTINT (final_char); + if (! ('0' <= final_ch && final_ch <= '~')) + error ("Invalid FINAL-CHAR '%c', it should be '0'..'~'", final_ch); + + return chars_flag; +} + DEFUN ("get-unused-iso-final-char", Fget_unused_iso_final_char, Sget_unused_iso_final_char, 2, 2, 0, doc: /* @@ -1412,35 +1438,12 @@ return nil. */) (Lisp_Object dimension, Lisp_Object chars) { - int final_char; - - CHECK_NUMBER (dimension); - CHECK_NUMBER (chars); - if (XINT (dimension) != 1 && XINT (dimension) != 2 && XINT (dimension) != 3) - args_out_of_range_3 (dimension, make_number (1), make_number (3)); - if (XINT (chars) != 94 && XINT (chars) != 96) - args_out_of_range_3 (chars, make_number (94), make_number (96)); - for (final_char = '0'; final_char <= '?'; final_char++) - if (ISO_CHARSET_TABLE (XINT (dimension), XINT (chars), final_char) < 0) - break; - return (final_char <= '?' ? make_number (final_char) : Qnil); -} - -static void -check_iso_charset_parameter (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char) -{ - CHECK_NATNUM (dimension); - CHECK_NATNUM (chars); - CHECK_CHARACTER (final_char); - - if (XINT (dimension) > 3) - error ("Invalid DIMENSION %"pI"d, it should be 1, 2, or 3", - XINT (dimension)); - if (XINT (chars) != 94 && XINT (chars) != 96) - error ("Invalid CHARS %"pI"d, it should be 94 or 96", XINT (chars)); - if (XINT (final_char) < '0' || XINT (final_char) > '~') - error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", - (int)XINT (final_char)); + bool chars_flag = check_iso_charset_parameter (dimension, chars, + make_number ('0')); + for (int final_char = '0'; final_char <= '?'; final_char++) + if (ISO_CHARSET_TABLE (XINT (dimension), chars_flag, final_char) < 0) + return make_number (final_char); + return Qnil; } @@ -1454,12 +1457,10 @@ (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char, Lisp_Object charset) { int id; - bool chars_flag; CHECK_CHARSET_GET_ID (charset, id); - check_iso_charset_parameter (dimension, chars, final_char); - chars_flag = XINT (chars) == 96; - ISO_CHARSET_TABLE (XINT (dimension), chars_flag, XINT (final_char)) = id; + bool chars_flag = check_iso_charset_parameter (dimension, chars, final_char); + ISO_CHARSET_TABLE (XINT (dimension), chars_flag, XFASTINT (final_char)) = id; return Qnil; } @@ -2113,13 +2114,9 @@ DIMENSION, CHARS, and FINAL-CHAR. */) (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char) { - int id; - bool chars_flag; - - check_iso_charset_parameter (dimension, chars, final_char); - chars_flag = XFASTINT (chars) == 96; - id = ISO_CHARSET_TABLE (XFASTINT (dimension), chars_flag, - XFASTINT (final_char)); + bool chars_flag = check_iso_charset_parameter (dimension, chars, final_char); + int id = ISO_CHARSET_TABLE (XINT (dimension), chars_flag, + XFASTINT (final_char)); return (id >= 0 ? CHARSET_NAME (CHARSET_FROM_ID (id)) : Qnil); } ------------------------------------------------------------ revno: 117860 committer: Alan Mackenzie branch nick: trunk timestamp: Wed 2014-09-10 21:38:11 +0000 message: CC Mode: revert recent changes and fix bug 17463 (cc-langs.elc gets loaded at run-time). * progmodes/cc-langs.el (c-no-parens-syntax-table): Rename the c-lang-const to c-make-no-parens-syntax-table and correct the logic. (c-no-parens-syntax-table): Correct the logic of the c-lang-defvar. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-10 16:32:36 +0000 +++ lisp/ChangeLog 2014-09-10 21:38:11 +0000 @@ -1,3 +1,13 @@ +2014-09-10 Alan Mackenzie + + CC Mode: revert recent changes and fix bug 17463 (cc-langs.elc + gets loaded at run-time). + * progmodes/cc-langs.el (c-no-parens-syntax-table): Rename the + c-lang-const to c-make-no-parens-syntax-table and correct the + logic. + (c-no-parens-syntax-table): Correct the logic of the + c-lang-defvar. + 2014-09-10 Stefan Monnier CC-mode: Set open-paren-in-column-0-is-defun-start to nil; === modified file 'lisp/progmodes/cc-awk.el' --- lisp/progmodes/cc-awk.el 2014-09-09 15:08:08 +0000 +++ lisp/progmodes/cc-awk.el 2014-09-10 21:38:11 +0000 @@ -40,8 +40,28 @@ ;;; Code: -(require 'cc-defs) -(require 'cc-engine) +(eval-when-compile + (let ((load-path + (if (and (boundp 'byte-compile-dest-file) + (stringp byte-compile-dest-file)) + (cons (file-name-directory byte-compile-dest-file) load-path) + load-path))) + (load "cc-bytecomp" nil t))) + +(cc-require 'cc-defs) + +;; Silence the byte compiler. +(cc-bytecomp-defvar font-lock-mode) ; Checked with boundp before use. +(cc-bytecomp-defvar c-new-BEG) +(cc-bytecomp-defvar c-new-END) + +;; Some functions in cc-engine that are used below. There's a cyclic +;; dependency so it can't be required here. (Perhaps some functions +;; could be moved to cc-engine to avoid it.) +(cc-bytecomp-defun c-backward-token-1) +(cc-bytecomp-defun c-beginning-of-statement-1) +(cc-bytecomp-defun c-backward-sws) +(cc-bytecomp-defun c-forward-sws) (defvar awk-mode-syntax-table (let ((st (make-syntax-table))) @@ -75,111 +95,111 @@ ;; Emacs has in the past used \r to mark hidden lines in some fashion (and ;; maybe still does). -(defconst c-awk-esc-pair-re "\\\\\\(.\\|\n\\|\r\\|\\'\\)" - "Matches any escaped (with \) character-pair, including an escaped newline.") -(defconst c-awk-non-eol-esc-pair-re "\\\\\\(.\\|\\'\\)" - "Matches any escaped (with \) character-pair, apart from an escaped newline.") -(defconst c-awk-comment-without-nl "#.*" -"Matches an AWK comment, not including the terminating NL (if any). -Note that the \"enclosing\" (elisp) regexp must ensure the # is real.") -(defconst c-awk-nl-or-eob "\\(\n\\|\r\\|\\'\\)" - "Matches a newline, or the end of buffer.") +(defconst c-awk-esc-pair-re "\\\\\\(.\\|\n\\|\r\\|\\'\\)") +;; Matches any escaped (with \) character-pair, including an escaped newline. +(defconst c-awk-non-eol-esc-pair-re "\\\\\\(.\\|\\'\\)") +;; Matches any escaped (with \) character-pair, apart from an escaped newline. +(defconst c-awk-comment-without-nl "#.*") +;; Matches an AWK comment, not including the terminating NL (if any). Note +;; that the "enclosing" (elisp) regexp must ensure the # is real. +(defconst c-awk-nl-or-eob "\\(\n\\|\r\\|\\'\\)") +;; Matches a newline, or the end of buffer. ;; "Space" regular expressions. (eval-and-compile - (defconst c-awk-escaped-nl "\\\\[\n\r]" - "Matches an escaped newline.")) + (defconst c-awk-escaped-nl "\\\\[\n\r]")) +;; Matches an escaped newline. (eval-and-compile - (defconst c-awk-escaped-nls* (concat "\\(" c-awk-escaped-nl "\\)*") - "Matches a possibly empty sequence of escaped newlines. -Used in `awk-font-lock-keywords'.")) + (defconst c-awk-escaped-nls* (concat "\\(" c-awk-escaped-nl "\\)*"))) +;; Matches a possibly empty sequence of escaped newlines. Used in +;; awk-font-lock-keywords. ;; (defconst c-awk-escaped-nls*-with-space* ;; (concat "\\(" c-awk-escaped-nls* "\\|" "[ \t]+" "\\)*")) ;; The above RE was very slow. It's runtime was doubling with each additional ;; space :-( Reformulate it as below: (eval-and-compile (defconst c-awk-escaped-nls*-with-space* - (concat "\\(" c-awk-escaped-nl "\\|" "[ \t]" "\\)*") - "Matches a possibly empty sequence of escaped newlines with optional -interspersed spaces and tabs. Used in `awk-font-lock-keywords'.")) + (concat "\\(" c-awk-escaped-nl "\\|" "[ \t]" "\\)*"))) +;; Matches a possibly empty sequence of escaped newlines with optional +;; interspersed spaces and tabs. Used in awk-font-lock-keywords. (defconst c-awk-blank-or-comment-line-re - (concat "[ \t]*\\(#\\|\\\\?$\\)") - "Match (the tail of) a line containing at most either a comment or an -escaped EOL.") + (concat "[ \t]*\\(#\\|\\\\?$\\)")) +;; Matche (the tail of) a line containing at most either a comment or an +;; escaped EOL. ;; REGEXPS FOR "HARMLESS" STRINGS/LINES. -(defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)" - "Matches an underline NOT followed by \".") -(defconst c-awk-harmless-char-re "[^_#/\"{}();\\\\\n\r]" - "Matches any character not significant in the state machine applying -syntax-table properties to \"s and /s.") +(defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)") +;; Matches an underline NOT followed by ". +(defconst c-awk-harmless-char-re "[^_#/\"{}();\\\\\n\r]") +;; Matches any character not significant in the state machine applying +;; syntax-table properties to "s and /s. (defconst c-awk-harmless-string*-re - (concat "\\(" c-awk-harmless-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*") - "Matches a (possibly empty) sequence of characters insignificant in the -state machine applying syntax-table properties to \"s and /s.") + (concat "\\(" c-awk-harmless-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*")) +;; Matches a (possibly empty) sequence of characters insignificant in the +;; state machine applying syntax-table properties to "s and /s. (defconst c-awk-harmless-string*-here-re - (concat "\\=" c-awk-harmless-string*-re) -"Matches the (possibly empty) sequence of \"insignificant\" chars at point.") + (concat "\\=" c-awk-harmless-string*-re)) +;; Matches the (possibly empty) sequence of "insignificant" chars at point. -(defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]" - "Matches any character but a _, #, /, \", \\, or newline. N.B. _\" starts a -localization string in gawk 3.1.") +(defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]") +;; Matches any character but a _, #, /, ", \, or newline. N.B. _" starts a +;; localization string in gawk 3.1 (defconst c-awk-harmless-line-string*-re - (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*") - "Matches a (possibly empty) sequence of chars without unescaped /, \", \\, -#, or newlines.") + (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*")) +;; Matches a (possibly empty) sequence of chars without unescaped /, ", \, +;; #, or newlines. (defconst c-awk-harmless-line-re (concat c-awk-harmless-line-string*-re - "\\(" c-awk-comment-without-nl "\\)?" c-awk-nl-or-eob) - "Matches (the tail of) an AWK \"logical\" line not containing an unescaped -\" or /. \"logical\" means \"possibly containing escaped newlines\". A comment -is matched as part of the line even if it contains a \" or a /. The End of -buffer is also an end of line.") + "\\(" c-awk-comment-without-nl "\\)?" c-awk-nl-or-eob)) +;; Matches (the tail of) an AWK \"logical\" line not containing an unescaped +;; " or /. "logical" means "possibly containing escaped newlines". A comment +;; is matched as part of the line even if it contains a " or a /. The End of +;; buffer is also an end of line. (defconst c-awk-harmless-lines+-here-re - (concat "\\=\\(" c-awk-harmless-line-re "\\)+") - "Matches a sequence of (at least one) \"harmless-line\" at point.") + (concat "\\=\\(" c-awk-harmless-line-re "\\)+")) +;; Matches a sequence of (at least one) \"harmless-line\" at point. ;; REGEXPS FOR AWK STRINGS. -(defconst c-awk-string-ch-re "[^\"\\\n\r]" - "Matches any character which can appear unescaped in a string.") +(defconst c-awk-string-ch-re "[^\"\\\n\r]") +;; Matches any character which can appear unescaped in a string. (defconst c-awk-string-innards-re - (concat "\\(" c-awk-string-ch-re "\\|" c-awk-esc-pair-re "\\)*") - "Matches the inside of an AWK string (i.e. without the enclosing quotes).") + (concat "\\(" c-awk-string-ch-re "\\|" c-awk-esc-pair-re "\\)*")) +;; Matches the inside of an AWK string (i.e. without the enclosing quotes). (defconst c-awk-string-without-end-here-re - (concat "\\=_?\"" c-awk-string-innards-re) - "Matches an AWK string at point up to, but not including, any terminator. -A gawk 3.1+ string may look like _\"localizable string\".") + (concat "\\=_?\"" c-awk-string-innards-re)) +;; Matches an AWK string at point up to, but not including, any terminator. +;; A gawk 3.1+ string may look like _"localizable string". (defconst c-awk-possibly-open-string-re (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-esc-pair-re "\\)*" "\\(\"\\|$\\|\\'\\)")) ;; REGEXPS FOR AWK REGEXPS. -(defconst c-awk-regexp-normal-re "[^[/\\\n\r]" - "Matches any AWK regexp character which doesn't require special analysis.") -(defconst c-awk-escaped-newlines*-re "\\(\\\\[\n\r]\\)*" - "Matches a (possibly empty) sequence of escaped newlines.") +(defconst c-awk-regexp-normal-re "[^[/\\\n\r]") +;; Matches any AWK regexp character which doesn't require special analysis. +(defconst c-awk-escaped-newlines*-re "\\(\\\\[\n\r]\\)*") +;; Matches a (possibly empty) sequence of escaped newlines. ;; NOTE: In what follows, "[asdf]" in a regexp will be called a "character ;; list", and "[:alpha:]" inside a character list will be known as a ;; "character class". These terms for these things vary between regexp ;; descriptions . (defconst c-awk-regexp-char-class-re - "\\[:[a-z]+:\\]" - "Matches a character class spec (e.g. [:alpha:]).") + "\\[:[a-z]+:\\]") + ;; Matches a character class spec (e.g. [:alpha:]). (defconst c-awk-regexp-char-list-re (concat "\\[" c-awk-escaped-newlines*-re "^?" c-awk-escaped-newlines*-re "]?" "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-class-re - "\\|" "[^]\n\r]" "\\)*" "\\(]\\|$\\)") - "Matches a regexp char list, up to (but not including) EOL if the ] is -missing.") + "\\|" "[^]\n\r]" "\\)*" "\\(]\\|$\\)")) +;; Matches a regexp char list, up to (but not including) EOL if the ] is +;; missing. (defconst c-awk-regexp-innards-re (concat "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-list-re - "\\|" c-awk-regexp-normal-re "\\)*") - "Matches the inside of an AWK regexp (i.e. without the enclosing /s)") + "\\|" c-awk-regexp-normal-re "\\)*")) +;; Matches the inside of an AWK regexp (i.e. without the enclosing /s) (defconst c-awk-regexp-without-end-re - (concat "/" c-awk-regexp-innards-re) - "Matches an AWK regexp up to, but not including, any terminating /.") + (concat "/" c-awk-regexp-innards-re)) +;; Matches an AWK regexp up to, but not including, any terminating /. ;; REGEXPS used for scanning an AWK buffer in order to decide IF A '/' IS A ;; REGEXP OPENER OR A DIVISION SIGN. By "state" in the following is meant @@ -187,47 +207,47 @@ ;; division sign. (defconst c-awk-neutral-re ; "\\([{}@` \t]\\|\\+\\+\\|--\\|\\\\.\\)+") ; changed, 2003/6/7 - "\\([}@` \t]\\|\\+\\+\\|--\\|\\\\\\(.\\|[\n\r]\\)\\)" - "A \"neutral\" char(pair). Doesn't change the \"state\" of a subsequent /. -This is space/tab, close brace, an auto-increment/decrement operator or an -escaped character. Or one of the (invalid) characters @ or `. But NOT an -end of line (unless escaped).") + "\\([}@` \t]\\|\\+\\+\\|--\\|\\\\\\(.\\|[\n\r]\\)\\)") +;; A "neutral" char(pair). Doesn't change the "state" of a subsequent /. +;; This is space/tab, close brace, an auto-increment/decrement operator or an +;; escaped character. Or one of the (invalid) characters @ or `. But NOT an +;; end of line (unless escaped). (defconst c-awk-neutrals*-re - (concat "\\(" c-awk-neutral-re "\\)*") - "A (possibly empty) string of neutral characters (or character pairs).") -(defconst c-awk-var-num-ket-re "[]\)0-9a-zA-Z_$.\x80-\xff]+" - "Matches a char which is a constituent of a variable or number, or a ket -\(i.e. closing bracKET), round or square. Assume that all characters \\x80 to -\\xff are \"letters\".") + (concat "\\(" c-awk-neutral-re "\\)*")) +;; A (possibly empty) string of neutral characters (or character pairs). +(defconst c-awk-var-num-ket-re "[]\)0-9a-zA-Z_$.\x80-\xff]+") +;; Matches a char which is a constituent of a variable or number, or a ket +;; (i.e. closing bracKET), round or square. Assume that all characters \x80 to +;; \xff are "letters". (defconst c-awk-div-sign-re - (concat c-awk-var-num-ket-re c-awk-neutrals*-re "/") - "Will match a piece of AWK buffer ending in / which is a division sign, in -a context where an immediate / would be a regexp bracket. It follows a -variable or number (with optional intervening \"neutral\" characters). This -will only work when there won't be a preceding \" or / before the sought / -to foul things up.") + (concat c-awk-var-num-ket-re c-awk-neutrals*-re "/")) +;; Will match a piece of AWK buffer ending in / which is a division sign, in +;; a context where an immediate / would be a regexp bracket. It follows a +;; variable or number (with optional intervening "neutral" characters). This +;; will only work when there won't be a preceding " or / before the sought / +;; to foul things up. (defconst c-awk-non-arith-op-bra-re - "[[\({&=:!><,?;'~|]" - "Matches an opening BRAcket (of any sort), or any operator character -apart from +,-,/,*,%. For the purpose at hand (detecting a / which is a -regexp bracket) these arith ops are unnecessary and a pain, because of \"++\" -and \"--\".") + "[[\({&=:!><,?;'~|]") +;; Matches an opening BRAcket (of any sort), or any operator character +;; apart from +,-,/,*,%. For the purpose at hand (detecting a / which is a +;; regexp bracket) these arith ops are unnecessary and a pain, because of "++" +;; and "--". (defconst c-awk-regexp-sign-re - (concat c-awk-non-arith-op-bra-re c-awk-neutrals*-re "/") - "Will match a piece of AWK buffer ending in / which is an opening regexp -bracket, in a context where an immediate / would be a division sign. This -will only work when there won't be a preceding \" or / before the sought / -to foul things up.") + (concat c-awk-non-arith-op-bra-re c-awk-neutrals*-re "/")) +;; Will match a piece of AWK buffer ending in / which is an opening regexp +;; bracket, in a context where an immediate / would be a division sign. This +;; will only work when there won't be a preceding " or / before the sought / +;; to foul things up. (defconst c-awk-pre-exp-alphanum-kwd-re (concat "\\(^\\|\\=\\|[^_\n\r]\\)\\<" (regexp-opt '("print" "return" "case") t) - "\\>\\([^_\n\r]\\|$\\)") - "Matches all AWK keywords which can precede expressions (including -/regexp/).") + "\\>\\([^_\n\r]\\|$\\)")) +;; Matches all AWK keywords which can precede expressions (including +;; /regexp/). (defconst c-awk-kwd-regexp-sign-re - (concat c-awk-pre-exp-alphanum-kwd-re c-awk-escaped-nls*-with-space* "/") - "Matches a piece of AWK buffer ending in /, where is a keyword -which can precede an expression.") + (concat c-awk-pre-exp-alphanum-kwd-re c-awk-escaped-nls*-with-space* "/")) +;; Matches a piece of AWK buffer ending in /, where is a keyword +;; which can precede an expression. ;; REGEXPS USED FOR FINDING THE POSITION OF A "virtual semicolon" (defconst c-awk-_-harmless-nonws-char-re "[^#/\"\\\\\n\r \t]") @@ -239,16 +259,16 @@ c-awk-possibly-open-string-re "\\)" "\\)*")) -(defconst c-awk-space*-/-re (concat c-awk-escaped-nls*-with-space* "/") - "Matches optional whitespace followed by \"/\".") +(defconst c-awk-space*-/-re (concat c-awk-escaped-nls*-with-space* "/")) +;; Matches optional whitespace followed by "/". (defconst c-awk-space*-regexp-/-re - (concat c-awk-escaped-nls*-with-space* "\\s\"") - "Matches optional whitespace followed by a \"/\" with string syntax (a matched -regexp delimiter).") + (concat c-awk-escaped-nls*-with-space* "\\s\"")) +;; Matches optional whitespace followed by a "/" with string syntax (a matched +;; regexp delimiter). (defconst c-awk-space*-unclosed-regexp-/-re - (concat c-awk-escaped-nls*-with-space* "\\s\|") - "Matches optional whitespace followed by a \"/\" with string fence syntax (an -unmatched regexp delimiter).") + (concat c-awk-escaped-nls*-with-space* "\\s\|")) +;; Matches optional whitespace followed by a "/" with string fence syntax (an +;; unmatched regexp delimiter). ;; ACM, 2002/5/29: @@ -303,16 +323,16 @@ ;; statement of a do-while. (defun c-awk-after-if-for-while-condition-p (&optional do-lim) - "Are we just after the ) in \"if/for/while ()\"? - -Note that the end of the ) in a do .... while () doesn't -count, since the purpose of this routine is essentially to decide -whether to indent the next line. - -DO-LIM sets a limit on how far back we search for the \"do\" of a possible -do-while. - -This function might do hidden buffer changes." + ;; Are we just after the ) in "if/for/while ()"? + ;; + ;; Note that the end of the ) in a do .... while () doesn't + ;; count, since the purpose of this routine is essentially to decide + ;; whether to indent the next line. + ;; + ;; DO-LIM sets a limit on how far back we search for the "do" of a possible + ;; do-while. + ;; + ;; This function might do hidden buffer changes. (and (eq (char-before) ?\)) (save-excursion @@ -326,9 +346,9 @@ 'beginning))))))))) (defun c-awk-after-function-decl-param-list () - "Are we just after the ) in \"function foo (bar)\" ? - -This function might do hidden buffer changes." + ;; Are we just after the ) in "function foo (bar)" ? + ;; + ;; This function might do hidden buffer changes. (and (eq (char-before) ?\)) (save-excursion (let ((par-pos (c-safe (scan-lists (point) -1 0)))) @@ -341,10 +361,10 @@ ;; 2002/11/8: FIXME! Check c-backward-token-1/2 for success (0 return code). (defun c-awk-after-continue-token () - "Are we just after a token which can be continued onto the next line without -a backslash? - -This function might do hidden buffer changes." +;; Are we just after a token which can be continued onto the next line without +;; a backslash? +;; +;; This function might do hidden buffer changes. (save-excursion (c-backward-token-1) ; FIXME 2002/10/27. What if this fails? (if (and (looking-at "[&|]") (not (bobp))) @@ -352,10 +372,10 @@ (looking-at "[,{?:]\\|&&\\|||\\|do\\>\\|else\\>"))) (defun c-awk-after-rbrace-or-statement-semicolon () - "Are we just after a } or a ; which closes a statement? -Be careful about ;s in for loop control bits. They don't count! - -This function might do hidden buffer changes." + ;; Are we just after a } or a ; which closes a statement? + ;; Be careful about ;s in for loop control bits. They don't count! + ;; + ;; This function might do hidden buffer changes. (or (eq (char-before) ?\}) (and (eq (char-before) ?\;) @@ -368,22 +388,22 @@ (looking-at "for\\>"))))))))) (defun c-awk-back-to-contentful-text-or-NL-prop () - "Move back to just after the first found of either (i) an EOL which has -the `c-awk-NL-prop' text-property set; or (ii) non-ws text; or (iii) BOB. -We return either the value of `c-awk-NL-prop' (in case (i)) or nil. -Calling functions can best distinguish cases (ii) and (iii) with `bolp'. - -Note that an escaped eol counts as whitespace here. - -Kludge: If `c-backward-syntactic-ws' gets stuck at a BOL, it is likely -that the previous line contains an unterminated string (without \\). In -this case, assume that the previous line's `c-awk-NL-prop' is a $. - -POINT MUST BE AT THE START OF A LINE when calling this function. This -is to ensure that the various backward-comment functions will work -properly. - -This function might do hidden buffer changes." + ;; Move back to just after the first found of either (i) an EOL which has + ;; the c-awk-NL-prop text-property set; or (ii) non-ws text; or (iii) BOB. + ;; We return either the value of c-awk-NL-prop (in case (i)) or nil. + ;; Calling functions can best distinguish cases (ii) and (iii) with (bolp). + ;; + ;; Note that an escaped eol counts as whitespace here. + ;; + ;; Kludge: If c-backward-syntactic-ws gets stuck at a BOL, it is likely + ;; that the previous line contains an unterminated string (without \). In + ;; this case, assume that the previous line's c-awk-NL-prop is a $. + ;; + ;; POINT MUST BE AT THE START OF A LINE when calling this function. This + ;; is to ensure that the various backward-comment functions will work + ;; properly. + ;; + ;; This function might do hidden buffer changes. (let ((nl-prop nil) bol-pos bsws-pos) ; starting pos for a backward-syntactic-ws call. (while ;; We are at a BOL here. Go back one line each iteration. @@ -418,19 +438,19 @@ nl-prop)) (defun c-awk-calculate-NL-prop-prev-line (&optional do-lim) - "Calculate and set the value of the `c-awk-NL-prop' on the immediately -preceding EOL. This may also involve doing the same for several -preceding EOLs. - -NOTE that if the property was already set, we return it without -recalculation. (This is by accident rather than design.) - -Return the property which got set (or was already set) on the previous -line. Return nil if we hit BOB. - -See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. - -This function might do hidden buffer changes." + ;; Calculate and set the value of the c-awk-NL-prop on the immediately + ;; preceding EOL. This may also involve doing the same for several + ;; preceding EOLs. + ;; + ;; NOTE that if the property was already set, we return it without + ;; recalculation. (This is by accident rather than design.) + ;; + ;; Return the property which got set (or was already set) on the previous + ;; line. Return nil if we hit BOB. + ;; + ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. + ;; + ;; This function might do hidden buffer changes. (save-excursion (save-match-data (beginning-of-line) @@ -473,25 +493,25 @@ nl-prop)))) (defun c-awk-get-NL-prop-prev-line (&optional do-lim) - "Get the `c-awk-NL-prop' text-property from the previous line, calculating -it if necessary. Return nil if we're already at BOB. -See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. - -This function might do hidden buffer changes." + ;; Get the c-awk-NL-prop text-property from the previous line, calculating + ;; it if necessary. Return nil if we're already at BOB. + ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. + ;; + ;; This function might do hidden buffer changes. (if (bobp) nil (or (c-get-char-property (c-point 'eopl) 'c-awk-NL-prop) (c-awk-calculate-NL-prop-prev-line do-lim)))) (defun c-awk-get-NL-prop-cur-line (&optional do-lim) - "Get the `c-awk-NL-prop' text-property from the current line, calculating it -if necessary. (As a special case, the property doesn't get set on an -empty line at EOB (there's no position to set the property on), but the -function returns the property value an EOL would have got.) - -See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. - -This function might do hidden buffer changes." + ;; Get the c-awk-NL-prop text-property from the current line, calculating it + ;; if necessary. (As a special case, the property doesn't get set on an + ;; empty line at EOB (there's no position to set the property on), but the + ;; function returns the property value an EOL would have got.) + ;; + ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. + ;; + ;; This function might do hidden buffer changes. (save-excursion (let ((extra-nl nil)) (end-of-line) ; Necessary for the following test to work. @@ -502,17 +522,17 @@ (if extra-nl (delete-char -1)))))) (defsubst c-awk-prev-line-incomplete-p (&optional do-lim) - "Is there an incomplete statement at the end of the previous line? -See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. - -This function might do hidden buffer changes." + ;; Is there an incomplete statement at the end of the previous line? + ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. + ;; + ;; This function might do hidden buffer changes. (memq (c-awk-get-NL-prop-prev-line do-lim) '(?\\ ?\{))) (defsubst c-awk-cur-line-incomplete-p (&optional do-lim) - "Is there an incomplete statement at the end of the current line? -See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. - -This function might do hidden buffer changes." + ;; Is there an incomplete statement at the end of the current line? + ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. + ;; + ;; This function might do hidden buffer changes. (memq (c-awk-get-NL-prop-cur-line do-lim) '(?\\ ?\{))) ;; NOTES ON "VIRTUAL SEMICOLONS" @@ -525,7 +545,7 @@ ;; never counts as a virtual one. (defun c-awk-at-vsemi-p (&optional pos) - "Is there a virtual semicolon at POS (or POINT)?" + ;; Is there a virtual semicolon at POS (or POINT)? (save-excursion (let* (nl-prop (pos-or-point (progn (if pos (goto-char pos)) (point))) @@ -565,29 +585,29 @@ (eq nl-prop ?\$)))))) (defun c-awk-vsemi-status-unknown-p () - "Are we unsure whether there is a virtual semicolon on the current line? -DO NOT under any circumstances attempt to calculate this; that would -defeat the (admittedly kludgy) purpose of this function, which is to -prevent an infinite recursion in `c-beginning-of-statement-1' when point -starts at a `while' token." + ;; Are we unsure whether there is a virtual semicolon on the current line? + ;; DO NOT under any circumstances attempt to calculate this; that would + ;; defeat the (admittedly kludgy) purpose of this function, which is to + ;; prevent an infinite recursion in c-beginning-of-statement-1 when point + ;; starts at a `while' token. (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) (defun c-awk-clear-NL-props (beg end) - "This function is run from `before-change-hooks.' It clears the -`c-awk-NL-prop' text property from beg to the end of the buffer (The END -parameter is ignored). This ensures that the indentation engine will -never use stale values for this property. - -This function might do hidden buffer changes." + ;; This function is run from before-change-hooks. It clears the + ;; c-awk-NL-prop text property from beg to the end of the buffer (The END + ;; parameter is ignored). This ensures that the indentation engine will + ;; never use stale values for this property. + ;; + ;; This function might do hidden buffer changes. (save-restriction (widen) (c-clear-char-properties beg (point-max) 'c-awk-NL-prop))) (defun c-awk-unstick-NL-prop () - "Ensure that the text property `c-awk-NL-prop' is \"non-sticky\". -Without this, a new newline inserted after an old newline (e.g. by C-j) would -inherit any `c-awk-NL-prop' from the old newline. This would be a Bad -Thing. This function's action is required by `c-put-char-property'." + ;; Ensure that the text property c-awk-NL-prop is "non-sticky". Without + ;; this, a new newline inserted after an old newline (e.g. by C-j) would + ;; inherit any c-awk-NL-prop from the old newline. This would be a Bad + ;; Thing. This function's action is required by c-put-char-property. (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in XEmacs (not (assoc 'c-awk-NL-prop text-property-default-nonsticky))) (setq text-property-default-nonsticky @@ -630,15 +650,15 @@ ;; to allow this. (defun c-awk-beginning-of-logical-line (&optional pos) - "Go back to the start of the (apparent) current line (or the start of the -line containing POS), returning the buffer position of that point. I.e., -go back to the last line which doesn't have an escaped EOL before it. - -This is guaranteed to be \"safe\" for syntactic analysis, i.e. outwith any -comment, string or regexp. IT MAY WELL BE that this function should not be -executed on a narrowed buffer. - -This function might do hidden buffer changes." +;; Go back to the start of the (apparent) current line (or the start of the +;; line containing POS), returning the buffer position of that point. I.e., +;; go back to the last line which doesn't have an escaped EOL before it. +;; +;; This is guaranteed to be "safe" for syntactic analysis, i.e. outwith any +;; comment, string or regexp. IT MAY WELL BE that this function should not be +;; executed on a narrowed buffer. +;; +;; This function might do hidden buffer changes. (if pos (goto-char pos)) (forward-line 0) (while (and (> (point) (point-min)) @@ -647,15 +667,15 @@ (point)) (defun c-awk-beyond-logical-line (&optional pos) - "Return the position just beyond the (apparent) current logical line, or the -one containing POS. This is usually the beginning of the next line which -doesn't follow an escaped EOL. At EOB, this will be EOB. - -Point is unchanged. - -This is guaranteed to be \"safe\" for syntactic analysis, i.e. outwith any -comment, string or regexp. IT MAY WELL BE that this function should not be -executed on a narrowed buffer." +;; Return the position just beyond the (apparent) current logical line, or the +;; one containing POS. This is usually the beginning of the next line which +;; doesn't follow an escaped EOL. At EOB, this will be EOB. +;; +;; Point is unchanged. +;; +;; This is guaranteed to be "safe" for syntactic analysis, i.e. outwith any +;; comment, string or regexp. IT MAY WELL BE that this function should not be +;; executed on a narrowed buffer. (save-excursion (if pos (goto-char pos)) (end-of-line) @@ -673,19 +693,19 @@ ;; or comment. (defun c-awk-set-string-regexp-syntax-table-properties (beg end) - "BEG and END bracket a (possibly unterminated) string or regexp. The -opening delimiter is after BEG, and the closing delimiter, IF ANY, is AFTER -END. Set the appropriate syntax-table properties on the delimiters and -contents of this string/regex. - -\"String\" here can also mean a gawk 3.1 \"localizable\" string which starts -with _\". In this case, we step over the _ and ignore it; It will get it's -font from an entry in `awk-font-lock-keywords'. - -If the closing delimiter is missing (i.e., there is an EOL there) set the -STRING-FENCE property on the opening \" or / and closing EOL. - -This function does hidden buffer changes." +;; BEG and END bracket a (possibly unterminated) string or regexp. The +;; opening delimiter is after BEG, and the closing delimiter, IF ANY, is AFTER +;; END. Set the appropriate syntax-table properties on the delimiters and +;; contents of this string/regex. +;; +;; "String" here can also mean a gawk 3.1 "localizable" string which starts +;; with _". In this case, we step over the _ and ignore it; It will get it's +;; font from an entry in awk-font-lock-keywords. +;; +;; If the closing delimiter is missing (i.e., there is an EOL there) set the +;; STRING-FENCE property on the opening " or / and closing EOL. +;; +;; This function does hidden buffer changes. (if (eq (char-after beg) ?_) (setq beg (1+ beg))) ;; First put the properties on the delimiters. @@ -706,13 +726,13 @@ (c-put-char-property (1- (point)) 'syntax-table '(1)))))) (defun c-awk-syntax-tablify-string () - "Point is at the opening \" or _\" of a string. Set the syntax-table -properties on this string, leaving point just after the string. - -The result is nil if a / immediately after the string would be a regexp -opener, t if it would be a division sign. - -This function does hidden buffer changes." + ;; Point is at the opening " or _" of a string. Set the syntax-table + ;; properties on this string, leaving point just after the string. + ;; + ;; The result is nil if a / immediately after the string would be a regexp + ;; opener, t if it would be a division sign. + ;; + ;; This function does hidden buffer changes. (search-forward-regexp c-awk-string-without-end-here-re nil t) ; a (possibly unterminated) string (c-awk-set-string-regexp-syntax-table-properties (match-beginning 0) (match-end 0)) @@ -725,19 +745,19 @@ (t nil))) ; Unterminated string at EOB (defun c-awk-syntax-tablify-/ (anchor anchor-state-/div) - "Point is at a /. Determine whether this is a division sign or a regexp -opener, and if the latter, apply syntax-table properties to the entire -regexp. Point is left immediately after the division sign or regexp, as -the case may be. - -ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a -division sign (value t) or a regexp opener (value nil). The idea is that -we analyze the line from ANCHOR up till point to determine what the / at -point is. - -The result is what ANCHOR-STATE-/DIV (see above) is where point is left. - -This function does hidden buffer changes." + ;; Point is at a /. Determine whether this is a division sign or a regexp + ;; opener, and if the latter, apply syntax-table properties to the entire + ;; regexp. Point is left immediately after the division sign or regexp, as + ;; the case may be. + ;; + ;; ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a + ;; division sign (value t) or a regexp opener (value nil). The idea is that + ;; we analyze the line from ANCHOR up till point to determine what the / at + ;; point is. + ;; + ;; The result is what ANCHOR-STATE-/DIV (see above) is where point is left. + ;; + ;; This function does hidden buffer changes. (let ((/point (point))) (goto-char anchor) ;; Analyze the line to find out what the / is. @@ -762,30 +782,30 @@ (t nil))))) ; Unterminated regexp at EOB (defun c-awk-set-syntax-table-properties (lim) - "Scan the buffer text between point and LIM, setting (and clearing) the -syntax-table property where necessary. - -This function is designed to be called as the FUNCTION in a MATCHER in -font-lock-syntactic-keywords, and it always returns NIL (to inhibit -repeated calls from font-lock: See elisp info page \"Search-based -Fontification\"). It also gets called, with a bit of glue, from -after-change-functions when font-lock isn't active. Point is left -\"undefined\" after this function exits. THE BUFFER SHOULD HAVE BEEN -WIDENED, AND ANY PRECIOUS MATCH-DATA SAVED BEFORE CALLING THIS ROUTINE. - -We need to set/clear the syntax-table property on: -\(i) / - It is set to \"string\" on a / which is the opening or closing - delimiter of the properly terminated regexp (and left unset on a - division sign). -\(ii) the opener of an unterminated string/regexp, we set the property - \"generic string delimiter\" on both the opening \" or / and the end of the - line where the closing delimiter is missing. -\(iii) \"s inside strings/regexps (these will all be escaped \"s). They are - given the property \"punctuation\". This will later allow other routines - to use the regexp \"\\\\S\\\"*\" to skip over the string innards. -\(iv) Inside a comment, all syntax-table properties are cleared. - -This function does hidden buffer changes." +;; Scan the buffer text between point and LIM, setting (and clearing) the +;; syntax-table property where necessary. +;; +;; This function is designed to be called as the FUNCTION in a MATCHER in +;; font-lock-syntactic-keywords, and it always returns NIL (to inhibit +;; repeated calls from font-lock: See elisp info page "Search-based +;; Fontification"). It also gets called, with a bit of glue, from +;; after-change-functions when font-lock isn't active. Point is left +;; "undefined" after this function exits. THE BUFFER SHOULD HAVE BEEN +;; WIDENED, AND ANY PRECIOUS MATCH-DATA SAVED BEFORE CALLING THIS ROUTINE. +;; +;; We need to set/clear the syntax-table property on: +;; (i) / - It is set to "string" on a / which is the opening or closing +;; delimiter of the properly terminated regexp (and left unset on a +;; division sign). +;; (ii) the opener of an unterminated string/regexp, we set the property +;; "generic string delimiter" on both the opening " or / and the end of the +;; line where the closing delimiter is missing. +;; (iii) "s inside strings/regexps (these will all be escaped "s). They are +;; given the property "punctuation". This will later allow other routines +;; to use the regexp "\\S\"*" to skip over the string innards. +;; (iv) Inside a comment, all syntax-table properties are cleared. +;; +;; This function does hidden buffer changes. (let (anchor (anchor-state-/div nil)) ; t means a following / would be a div sign. (c-awk-beginning-of-logical-line) ; ACM 2002/7/21. This is probably redundant. @@ -825,26 +845,26 @@ ;; Set in c-awk-record-region-clear-NL and used in c-awk-after-change. (defun c-awk-record-region-clear-NL (beg end) - "This function is called exclusively from the `before-change-functions' hook. -It does two things: Finds the end of the (logical) line on which END lies, -and clears `c-awk-NL-prop' text properties from this point onwards. BEG is -ignored. - -On entry, the buffer will have been widened and match-data will have been -saved; point is undefined on both entry and exit; the return value is -ignored. - -This function does hidden buffer changes." +;; This function is called exclusively from the before-change-functions hook. +;; It does two things: Finds the end of the (logical) line on which END lies, +;; and clears c-awk-NL-prop text properties from this point onwards. BEG is +;; ignored. +;; +;; On entry, the buffer will have been widened and match-data will have been +;; saved; point is undefined on both entry and exit; the return value is +;; ignored. +;; +;; This function does hidden buffer changes. (c-save-buffer-state () (setq c-awk-old-ByLL (c-awk-beyond-logical-line end)) (c-save-buffer-state nil (c-awk-clear-NL-props end (point-max))))) (defun c-awk-end-of-change-region (beg end old-len) - "Find the end of the region which needs to be font-locked after a change. -This is the end of the logical line on which the change happened, either -as it was before the change, or as it is now, whichever is later. -N.B. point is left undefined." + ;; Find the end of the region which needs to be font-locked after a change. + ;; This is the end of the logical line on which the change happened, either + ;; as it was before the change, or as it is now, whichever is later. + ;; N.B. point is left undefined. (max (+ (- c-awk-old-ByLL old-len) (- end beg)) (c-awk-beyond-logical-line end))) @@ -855,25 +875,22 @@ ;; Don't overlook the possibility of the buffer change being the "recapturing" ;; of a previously escaped newline. -(defvar c-new-BEG) -(defvar c-new-END) - ;; ACM 2008-02-05: (defun c-awk-extend-and-syntax-tablify-region (beg end old-len) - "Expand the region (BEG END) as needed to (c-new-BEG c-new-END) then put -`syntax-table' properties on this region. - -This function is called from an after-change function, BEG END and -OLD-LEN being the standard parameters. - -Point is undefined both before and after this function call, the buffer -has been widened, and match-data saved. The return value is ignored. - -It prepares the buffer for font -locking, hence must get called before `font-lock-after-change-function'. - -This function is the AWK value of `c-before-font-lock-function'. -It does hidden buffer changes." + ;; Expand the region (BEG END) as needed to (c-new-BEG c-new-END) then put + ;; `syntax-table' properties on this region. + ;; + ;; This function is called from an after-change function, BEG END and + ;; OLD-LEN being the standard parameters. + ;; + ;; Point is undefined both before and after this function call, the buffer + ;; has been widened, and match-data saved. The return value is ignored. + ;; + ;; It prepares the buffer for font + ;; locking, hence must get called before `font-lock-after-change-function'. + ;; + ;; This function is the AWK value of `c-before-font-lock-function'. + ;; It does hidden buffer changes. (c-save-buffer-state () (setq c-new-END (c-awk-end-of-change-region beg end old-len)) (setq c-new-BEG (c-awk-beginning-of-logical-line beg)) @@ -945,8 +962,7 @@ "match" "mktime" "or" "print" "printf" "rand" "rshift" "sin" "split" "sprintf" "sqrt" "srand" "stopme" "strftime" "strtonum" "sub" "substr" "system" - "systime" "tolower" "toupper" "xor") - t) + "systime" "tolower" "toupper" "xor") t) "\\>") 0 c-preprocessor-face-name)) @@ -977,21 +993,21 @@ ;; The following three regexps differ from those earlier on in cc-awk.el in ;; that they assume the syntax-table properties have been set. They are thus ;; not useful for code which sets these properties. -(defconst c-awk-terminated-regexp-or-string-here-re "\\=\\s\"\\S\"*\\s\"" - "Matches a terminated string/regexp.") +(defconst c-awk-terminated-regexp-or-string-here-re "\\=\\s\"\\S\"*\\s\"") +;; Matches a terminated string/regexp. -(defconst c-awk-unterminated-regexp-or-string-here-re "\\=\\s|\\S|*$" - "Matches an unterminated string/regexp, NOT including the eol at the end.") +(defconst c-awk-unterminated-regexp-or-string-here-re "\\=\\s|\\S|*$") +;; Matches an unterminated string/regexp, NOT including the eol at the end. (defconst c-awk-harmless-pattern-characters* - (concat "\\([^{;#/\"\\\\\n\r]\\|" c-awk-esc-pair-re "\\)*") - "Matches any \"harmless\" character in a pattern or an escaped character pair.") + (concat "\\([^{;#/\"\\\\\n\r]\\|" c-awk-esc-pair-re "\\)*")) +;; Matches any "harmless" character in a pattern or an escaped character pair. (defun c-awk-at-statement-end-p () - "Point is not inside a comment or string. Is it AT the end of a -statement? This means immediately after the last non-ws character of the -statement. The caller is responsible for widening the buffer, if -appropriate." + ;; Point is not inside a comment or string. Is it AT the end of a + ;; statement? This means immediately after the last non-ws character of the + ;; statement. The caller is responsible for widening the buffer, if + ;; appropriate. (and (not (bobp)) (save-excursion (backward-char) @@ -1041,13 +1057,13 @@ (eq arg 0))))) (defun c-awk-forward-awk-pattern () - "Point is at the start of an AWK pattern (which may be null) or function -declaration. Move to the pattern's end, and past any trailing space or -comment. Typically, we stop at the { which denotes the corresponding AWK -action/function body. Otherwise we stop at the EOL (or ;) marking the -absence of an explicit action. - -This function might do hidden buffer changes." + ;; Point is at the start of an AWK pattern (which may be null) or function + ;; declaration. Move to the pattern's end, and past any trailing space or + ;; comment. Typically, we stop at the { which denotes the corresponding AWK + ;; action/function body. Otherwise we stop at the EOL (or ;) marking the + ;; absence of an explicit action. + ;; + ;; This function might do hidden buffer changes. (while (progn (search-forward-regexp c-awk-harmless-pattern-characters*) @@ -1064,9 +1080,9 @@ ((looking-at "/") (forward-char) t))))) ; division sign. (defun c-awk-end-of-defun1 () - "Point is at the start of a \"defun\". Move to its end. Return end position. - -This function might do hidden buffer changes." + ;; point is at the start of a "defun". Move to its end. Return end position. + ;; + ;; This function might do hidden buffer changes. (c-awk-forward-awk-pattern) (cond ((looking-at "{") (goto-char (scan-sexps (point) 1))) @@ -1076,10 +1092,10 @@ (point)) (defun c-awk-beginning-of-defun-p () - "Are we already at the beginning of a defun? (i.e. at code in column 0 -which isn't a }, and isn't a continuation line of any sort. - -This function might do hidden buffer changes." + ;; Are we already at the beginning of a defun? (i.e. at code in column 0 + ;; which isn't a }, and isn't a continuation line of any sort. + ;; + ;; This function might do hidden buffer changes. (and (looking-at "^[^#} \t\n\r]") (not (c-awk-prev-line-incomplete-p)))) @@ -1129,5 +1145,6 @@ (goto-char (min start-point end-point))))))) -(provide 'cc-awk) -;;; cc-awk.el ends here +(cc-provide 'cc-awk) ; Changed from 'awk-mode, ACM 2002/5/21 + +;;; awk-mode.el ends here === modified file 'lisp/progmodes/cc-defs.el' --- lisp/progmodes/cc-defs.el 2014-09-10 16:32:36 +0000 +++ lisp/progmodes/cc-defs.el 2014-09-10 21:38:11 +0000 @@ -195,7 +195,7 @@ to it is returned. This function does not modify the point or the mark." (if (eq (car-safe position) 'quote) - (let ((position (nth 1 position))) + (let ((position (eval position))) (cond ((eq position 'bol) @@ -885,7 +885,7 @@ `(c-lang-major-mode-is ,mode) (if (eq (car-safe mode) 'quote) - (let ((mode (nth 1 mode))) + (let ((mode (eval mode))) (if (listp mode) `(memq c-buffer-is-cc-mode ',mode) `(eq c-buffer-is-cc-mode ',mode))) @@ -900,10 +900,26 @@ ;; properties set on a single character and that never spread to any ;; other characters. +(eval-and-compile + ;; Constant used at compile time to decide whether or not to use + ;; XEmacs extents. Check all the extent functions we'll use since + ;; some packages might add compatibility aliases for some of them in + ;; Emacs. + (defconst c-use-extents (and (cc-bytecomp-fboundp 'extent-at) + (cc-bytecomp-fboundp 'set-extent-property) + (cc-bytecomp-fboundp 'set-extent-properties) + (cc-bytecomp-fboundp 'make-extent) + (cc-bytecomp-fboundp 'extent-property) + (cc-bytecomp-fboundp 'delete-extent) + (cc-bytecomp-fboundp 'map-extents)))) + ;; `c-put-char-property' is complex enough in XEmacs and Emacs < 21 to ;; make it a function. (defalias 'c-put-char-property-fun - (cond ((featurep 'xemacs) + (cc-eval-when-compile + (cond (c-use-extents + ;; XEmacs. + (byte-compile (lambda (pos property value) (let ((ext (extent-at pos nil property))) (if ext @@ -912,19 +928,20 @@ (cons property (cons value '(start-open t - end-open t)))))))) + end-open t))))))))) ((not (cc-bytecomp-boundp 'text-property-default-nonsticky)) ;; In Emacs < 21 we have to mess with the `rear-nonsticky' property. + (byte-compile (lambda (pos property value) (put-text-property pos (1+ pos) property value) (let ((prop (get-text-property pos 'rear-nonsticky))) (or (memq property prop) (put-text-property pos (1+ pos) 'rear-nonsticky - (cons property prop)))))) + (cons property prop))))))) ;; This won't be used for anything. - (t #'ignore))) + (t 'ignore)))) (cc-bytecomp-defun c-put-char-property-fun) ; Make it known below. (defmacro c-put-char-property (pos property value) @@ -939,38 +956,42 @@ ;; 21) then it's assumed that the property is present on it. ;; ;; This macro does a hidden buffer change. - (if (or (featurep 'xemacs) + (setq property (eval property)) + (if (or c-use-extents (not (cc-bytecomp-boundp 'text-property-default-nonsticky))) ;; XEmacs and Emacs < 21. - `(c-put-char-property-fun ,pos ,property ,value) + `(c-put-char-property-fun ,pos ',property ,value) ;; In Emacs 21 we got the `rear-nonsticky' property covered ;; by `text-property-default-nonsticky'. `(let ((-pos- ,pos)) - (put-text-property -pos- (1+ -pos-) ,property ,value)))) + (put-text-property -pos- (1+ -pos-) ',property ,value)))) (defmacro c-get-char-property (pos property) ;; Get the value of the given property on the character at POS if ;; it's been put there by `c-put-char-property'. PROPERTY is ;; assumed to be constant. - (if (featurep 'xemacs) + (setq property (eval property)) + (if c-use-extents ;; XEmacs. - `(let ((ext (extent-at ,pos nil ,property))) - (if ext (extent-property ext ,property))) + `(let ((ext (extent-at ,pos nil ',property))) + (if ext (extent-property ext ',property))) ;; Emacs. - `(get-text-property ,pos ,property))) + `(get-text-property ,pos ',property))) ;; `c-clear-char-property' is complex enough in Emacs < 21 to make it ;; a function, since we have to mess with the `rear-nonsticky' property. (defalias 'c-clear-char-property-fun - (unless (or (featurep 'xemacs) + (cc-eval-when-compile + (unless (or c-use-extents (cc-bytecomp-boundp 'text-property-default-nonsticky)) + (byte-compile (lambda (pos property) (when (get-text-property pos property) (remove-text-properties pos (1+ pos) (list property nil)) (put-text-property pos (1+ pos) 'rear-nonsticky (delq property (get-text-property - pos 'rear-nonsticky))))))) + pos 'rear-nonsticky))))))))) (cc-bytecomp-defun c-clear-char-property-fun) ; Make it known below. (defmacro c-clear-char-property (pos property) @@ -979,10 +1000,8 @@ ;; constant. ;; ;; This macro does a hidden buffer change. - (if (eq 'quote (car-safe property)) - (setq property (nth 1 property)) - (error "`property' should be a quoted constant")) - (cond ((featurep 'xemacs) + (setq property (eval property)) + (cond (c-use-extents ;; XEmacs. `(let ((ext (extent-at ,pos nil ',property))) (if ext (delete-extent ext)))) @@ -1007,10 +1026,8 @@ ;; `syntax-table'. ;; ;; This macro does hidden buffer changes. - (if (eq 'quote (car-safe property)) - (setq property (nth 1 property)) - (error "`property' should be a quoted constant")) - (if (featurep 'xemacs) + (setq property (eval property)) + (if c-use-extents ;; XEmacs. `(map-extents (lambda (ext ignored) (delete-extent ext)) @@ -1080,7 +1097,7 @@ which have the value VALUE, as tested by `equal'. These properties are assumed to be over individual characters, having been put there by c-put-char-property. POINT remains unchanged." - (if (featurep 'xemacs) + (if c-use-extents ;; XEmacs `(let ((-property- ,property)) (map-extents (lambda (ext val) @@ -1544,6 +1561,32 @@ (defconst c-emacs-features (let (list) + (if (boundp 'infodock-version) + ;; I've no idea what this actually is, but it's legacy. /mast + (setq list (cons 'infodock list))) + + ;; XEmacs uses 8-bit modify-syntax-entry flags. + ;; Emacs uses a 1-bit flag. We will have to set up our + ;; syntax tables differently to handle this. + (let ((table (copy-syntax-table)) + entry) + (modify-syntax-entry ?a ". 12345678" table) + (cond + ;; Emacs + ((arrayp table) + (setq entry (aref table ?a)) + ;; In Emacs, table entries are cons cells + (if (consp entry) (setq entry (car entry)))) + ;; XEmacs + ((fboundp 'get-char-table) + (setq entry (get-char-table ?a table))) + ;; incompatible + (t (error "CC Mode is incompatible with this version of Emacs"))) + (setq list (cons (if (= (logand (lsh entry -16) 255) 255) + '8-bit + '1-bit) + list))) + ;; Check whether beginning/end-of-defun call ;; beginning/end-of-defun-function nicely, passing through the ;; argument and respecting the return code. @@ -1566,12 +1609,35 @@ (not (end-of-defun)))) (setq list (cons 'argumentative-bod-function list)))) - (with-temp-buffer - (let ((parse-sexp-lookup-properties t) - (parse-sexp-ignore-comments t) - (lookup-syntax-properties t)) ; XEmacs + (let ((buf (generate-new-buffer " test")) + parse-sexp-lookup-properties + parse-sexp-ignore-comments + lookup-syntax-properties) ; XEmacs + (with-current-buffer buf (set-syntax-table (make-syntax-table)) + ;; For some reason we have to set some of these after the + ;; buffer has been made current. (Specifically, + ;; `parse-sexp-ignore-comments' in Emacs 21.) + (setq parse-sexp-lookup-properties t + parse-sexp-ignore-comments t + lookup-syntax-properties t) + + ;; Find out if the `syntax-table' text property works. + (modify-syntax-entry ?< ".") + (modify-syntax-entry ?> ".") + (insert "<()>") + (c-mark-<-as-paren (point-min)) + (c-mark->-as-paren (+ 3 (point-min))) + (goto-char (point-min)) + (c-forward-sexp) + (if (= (point) (+ 4 (point-min))) + (setq list (cons 'syntax-properties list)) + (error (concat + "CC Mode is incompatible with this version of Emacs - " + "support for the `syntax-table' text property " + "is required."))) + ;; Find out if generic comment delimiters work. (c-safe (modify-syntax-entry ?x "!") @@ -1608,11 +1674,11 @@ (cond ;; XEmacs. Afaik this is currently an Emacs-only ;; feature, but it's good to be prepared. - ((featurep 'xemacs) + ((memq '8-bit list) (modify-syntax-entry ?/ ". 1456") (modify-syntax-entry ?* ". 23")) ;; Emacs - (t + ((memq '1-bit list) (modify-syntax-entry ?/ ". 124b") (modify-syntax-entry ?* ". 23"))) (modify-syntax-entry ?\n "> b") @@ -1621,7 +1687,16 @@ (if (bobp) (setq list (cons 'col-0-paren list))))) - (set-buffer-modified-p nil))) + (set-buffer-modified-p nil)) + (kill-buffer buf)) + + ;; See if `parse-partial-sexp' returns the eighth element. + (if (c-safe (>= (length (save-excursion (parse-partial-sexp (point) (point)))) + 10)) + (setq list (cons 'pps-extended-state list)) + (error (concat + "CC Mode is incompatible with this version of Emacs - " + "`parse-partial-sexp' has to return at least 10 elements."))) ;;(message "c-emacs-features: %S" list) list) @@ -1630,16 +1705,29 @@ features supporting those needed by CC Mode. The following values might be present: -`argumentative-bod-function' `beginning-of-defun' passes ARG through - to a non-null `beginning-of-defun-function.' It is assumed - that `end-of-defun' does the same thing. -`gen-comment-delim' Generic comment delimiters work +'8-bit 8 bit syntax entry flags (XEmacs style). +'1-bit 1 bit syntax entry flags (Emacs style). +'argumentative-bod-function beginning-of-defun passes ARG through + to a non-null beginning-of-defun-function. It is assumed + the end-of-defun does the same thing. +'syntax-properties It works to override the syntax for specific characters + in the buffer with the 'syntax-table property. It's + always set - CC Mode no longer works in emacsen without + this feature. +'gen-comment-delim Generic comment delimiters work (i.e. the syntax class `!'). -`gen-string-delim' Generic string delimiters work +'gen-string-delim Generic string delimiters work (i.e. the syntax class `|'). -`posix-char-classes' The regexp engine understands POSIX character classes. -`col-0-paren' It's possible to turn off the ad-hoc rule that a paren - in column zero is the start of a defun.") +'pps-extended-state `parse-partial-sexp' returns a list with at least 10 + elements, i.e. it contains the position of the start of + the last comment or string. It's always set - CC Mode + no longer works in emacsen without this feature. +'posix-char-classes The regexp engine understands POSIX character classes. +'col-0-paren It's possible to turn off the ad-hoc rule that a paren + in column zero is the start of a defun. +'infodock This is Infodock (based on XEmacs). + +'8-bit and '1-bit are mutually exclusive.") ;;; Some helper constants. @@ -1935,6 +2023,11 @@ language. NAME and LANG are not evaluated so they should not be quoted." + (or (symbolp name) + (error "Not a symbol: %S" name)) + (or (symbolp lang) + (error "Not a symbol: %S" lang)) + (let ((sym (intern (symbol-name name) c-lang-constants)) (mode (when lang (intern (concat (symbol-name lang) "-mode"))))) @@ -2095,56 +2188,57 @@ value)))) (defun c-find-assignment-for-mode (source-pos mode match-any-lang _name) - "Find the first assignment entry that applies to MODE at or after -SOURCE-POS. If MATCH-ANY-LANG is non-nil, entries with `t' as -the language list are considered to match, otherwise they don't. -On return SOURCE-POS is updated to point to the next assignment -after the returned one. If no assignment is found, -`c-lang--novalue' is returned as a magic value. - -SOURCE-POS is a vector that points out a specific assignment in -the double alist that's used in the `source' property. The first -element is the position in the top alist which is indexed with -the source files, and the second element is the position in the -nested bindings alist. - -NAME is only used for error messages." + ;; Find the first assignment entry that applies to MODE at or after + ;; SOURCE-POS. If MATCH-ANY-LANG is non-nil, entries with `t' as + ;; the language list are considered to match, otherwise they don't. + ;; On return SOURCE-POS is updated to point to the next assignment + ;; after the returned one. If no assignment is found, + ;; `c-lang--novalue' is returned as a magic value. + ;; + ;; SOURCE-POS is a vector that points out a specific assignment in + ;; the double alist that's used in the `source' property. The first + ;; element is the position in the top alist which is indexed with + ;; the source files, and the second element is the position in the + ;; nested bindings alist. + ;; + ;; NAME is only used for error messages. (catch 'found (let ((file-entry (elt source-pos 0)) (assignment-entry (elt source-pos 1)) assignment) - (while (or assignment-entry - ;; Handled the last assignment from one file, begin on the - ;; next. Due to the check in `c-lang-defconst', we know - ;; there's at least one. - (when file-entry - - (unless (aset source-pos 1 - (setq assignment-entry (cdar file-entry))) - ;; The file containing the source definitions has not - ;; been loaded. - (let ((file (symbol-name (caar file-entry))) - (c-lang-constants-under-evaluation nil)) - ;;(message (concat "Loading %s to get the source " - ;; "value for language constant %s") - ;; file name) - (load file nil t)) - - (unless (setq assignment-entry (cdar file-entry)) - ;; The load didn't fill in the source for the - ;; constant as expected. The situation is - ;; probably that a derived mode was written for - ;; and compiled with another version of CC Mode, - ;; and the requested constant isn't in the - ;; currently loaded one. Put in a dummy - ;; assignment that matches no language. - (setcdr (car file-entry) - (setq assignment-entry (list (list nil)))))) - - (aset source-pos 0 (setq file-entry (cdr file-entry))) - t)) + (while (if assignment-entry + t + ;; Handled the last assignment from one file, begin on the + ;; next. Due to the check in `c-lang-defconst', we know + ;; there's at least one. + (when file-entry + + (unless (aset source-pos 1 + (setq assignment-entry (cdar file-entry))) + ;; The file containing the source definitions has not + ;; been loaded. + (let ((file (symbol-name (caar file-entry))) + (c-lang-constants-under-evaluation nil)) + ;;(message (concat "Loading %s to get the source " + ;; "value for language constant %s") + ;; file name) + (load file nil t)) + + (unless (setq assignment-entry (cdar file-entry)) + ;; The load didn't fill in the source for the + ;; constant as expected. The situation is + ;; probably that a derived mode was written for + ;; and compiled with another version of CC Mode, + ;; and the requested constant isn't in the + ;; currently loaded one. Put in a dummy + ;; assignment that matches no language. + (setcdr (car file-entry) + (setq assignment-entry (list (list nil)))))) + + (aset source-pos 0 (setq file-entry (cdr file-entry))) + t)) (setq assignment (car assignment-entry)) (aset source-pos 1 === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2014-09-10 16:32:36 +0000 +++ lisp/progmodes/cc-engine.el 2014-09-10 21:38:11 +0000 @@ -2222,8 +2222,6 @@ ((and (not not-in-delimiter) ; inside a comment starter (not (bobp)) (progn (backward-char) - ;; FIXME: We never add category-properties to - ;; c-emacs-features! (and (not (and (memq 'category-properties c-emacs-features) (looking-at "\\s!"))) (looking-at c-comment-start-regexp)))) @@ -4121,10 +4119,10 @@ (c-end-of-current-token last-token-end-pos)) (setq last-token-end-pos (point)))))) ;; Inside a token. - (goto-char (if lookbehind-submatch - ;; See the NOTE above. - state-pos - (min last-token-end-pos bound)))) + (if lookbehind-submatch + ;; See the NOTE above. + (goto-char state-pos) + (goto-char (min last-token-end-pos bound)))) (t ;; A real match. === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2014-09-10 16:32:36 +0000 +++ lisp/progmodes/cc-fonts.el 2014-09-10 21:38:11 +0000 @@ -201,18 +201,17 @@ :version "24.1" :group 'c) -;; This indicates the "font locking context", and is set just before -;; fontification is done. If non-nil, it says, e.g., point starts -;; from within a #if preprocessor construct. -(defvar c-font-lock-context nil) -(make-variable-buffer-local 'c-font-lock-context) -(cc-bytecomp-defvar c-font-lock-context) - (eval-and-compile ;; We need the following definitions during compilation since they're ;; used when the `c-lang-defconst' initializers are evaluated. Define ;; them at runtime too for the sake of derived modes. + ;; This indicates the "font locking context", and is set just before + ;; fontification is done. If non-nil, it says, e.g., point starts + ;; from within a #if preprocessor construct. + (defvar c-font-lock-context nil) + (make-variable-buffer-local 'c-font-lock-context) + (defmacro c-put-font-lock-face (from to face) ;; Put a face on a region (overriding any existing face) in the way ;; font-lock would do it. In XEmacs that means putting an @@ -273,29 +272,18 @@ (c-got-face-at (point) c-literal-faces)))) t)) - (defvar c-font-byte-compile t - "If non-nil, byte-compile the dynamically-generated functions.") - - (defun c--compile (exp) - (cond - ((byte-code-function-p exp) (error "Already byte-compiled: %S" exp)) - ((not (eq (car-safe exp) 'lambda)) - (error "Expected a (lambda ..): %S" exp)) - (c-font-byte-compile (byte-compile exp)) - (t (eval (macroexpand-all exp))))) - (defun c-make-syntactic-matcher (regexp) - "Return a function suitable for use in place of a -regexp string in a `font-lock-keywords' matcher, except that -only matches outside comments and string literals count. - -This function does not do any hidden buffer changes, but the -generated functions will. (They are however used in places -covered by the font-lock context.)" - (c--compile + ;; Returns a byte compiled function suitable for use in place of a + ;; regexp string in a `font-lock-keywords' matcher, except that + ;; only matches outside comments and string literals count. + ;; + ;; This function does not do any hidden buffer changes, but the + ;; generated functions will. (They are however used in places + ;; covered by the font-lock context.) + (byte-compile `(lambda (limit) (let (res) - (while (and (setq res (re-search-forward ,regexp limit t)) + (while (and (setq res (re-search-forward ,regexp limit t)) (progn (goto-char (match-beginning 0)) (or (c-skip-comments-and-strings limit) @@ -344,34 +332,34 @@ highlights)))) (defun c-make-font-lock-search-function (regexp &rest highlights) - "This function makes a byte compiled function that works much like -a matcher element in `font-lock-keywords'. It cuts out a little -bit of the overhead compared to a real matcher. The main reason -is however to pass the real search limit to the anchored -matcher(s), since most (if not all) font-lock implementations -arbitrarily limit anchored matchers to the same line, and also -to insulate against various other irritating differences between -the different (X)Emacs font-lock packages. - -REGEXP is the matcher, which must be a regexp. Only matches -where the beginning is outside any comment or string literal are -significant. - -HIGHLIGHTS is a list of highlight specs, just like in -`font-lock-keywords', with these limitations: The face is always -overridden (no big disadvantage, since hits in comments etc are -filtered anyway), there is no \"laxmatch\", and an anchored matcher -is always a form which must do all the fontification directly. -`limit' is a variable bound to the real limit in the context of -the anchored matcher forms. - -This function does not do any hidden buffer changes, but the -generated functions will. (They are however used in places -covered by the font-lock context.)" - - ;; Note: Set c-font-byte-compile to nil to debug the generated + ;; This function makes a byte compiled function that works much like + ;; a matcher element in `font-lock-keywords'. It cuts out a little + ;; bit of the overhead compared to a real matcher. The main reason + ;; is however to pass the real search limit to the anchored + ;; matcher(s), since most (if not all) font-lock implementations + ;; arbitrarily limit anchored matchers to the same line, and also + ;; to insulate against various other irritating differences between + ;; the different (X)Emacs font-lock packages. + ;; + ;; REGEXP is the matcher, which must be a regexp. Only matches + ;; where the beginning is outside any comment or string literal are + ;; significant. + ;; + ;; HIGHLIGHTS is a list of highlight specs, just like in + ;; `font-lock-keywords', with these limitations: The face is always + ;; overridden (no big disadvantage, since hits in comments etc are + ;; filtered anyway), there is no "laxmatch", and an anchored matcher + ;; is always a form which must do all the fontification directly. + ;; `limit' is a variable bound to the real limit in the context of + ;; the anchored matcher forms. + ;; + ;; This function does not do any hidden buffer changes, but the + ;; generated functions will. (They are however used in places + ;; covered by the font-lock context.) + + ;; Note: Replace `byte-compile' with `eval' to debug the generated ;; lambda more easily. - (c--compile + (byte-compile `(lambda (limit) (let ( ;; The font-lock package in Emacs is known to clobber ;; `parse-sexp-lookup-properties' (when it exists). @@ -414,44 +402,44 @@ nil))) (defun c-make-font-lock-BO-decl-search-function (regexp &rest highlights) - "This function makes a byte compiled function that first moves back -to the beginning of the current declaration (if any), then searches -forward for matcher elements (as in `font-lock-keywords') and -fontifies them. - -The motivation for moving back to the declaration start is to -establish a context for the current text when, e.g., a character -is typed on a C++ inheritance continuation line, or a jit-lock -chunk starts there. - -The new function works much like a matcher element in -`font-lock-keywords'. It cuts out a little bit of the overhead -compared to a real matcher. The main reason is however to pass the -real search limit to the anchored matcher(s), since most (if not -all) font-lock implementations arbitrarily limit anchored matchers -to the same line, and also to insulate against various other -irritating differences between the different (X)Emacs font-lock -packages. - -REGEXP is the matcher, which must be a regexp. Only matches -where the beginning is outside any comment or string literal are -significant. - -HIGHLIGHTS is a list of highlight specs, just like in -`font-lock-keywords', with these limitations: The face is always -overridden (no big disadvantage, since hits in comments etc are -filtered anyway), there is no \"laxmatch\", and an anchored matcher -is always a form which must do all the fontification directly. -`limit' is a variable bound to the real limit in the context of -the anchored matcher forms. - -This function does not do any hidden buffer changes, but the -generated functions will. (They are however used in places -covered by the font-lock context.)" - - ;; Note: Set c-font-byte-compile to nil to debug the generated + ;; This function makes a byte compiled function that first moves back + ;; to the beginning of the current declaration (if any), then searches + ;; forward for matcher elements (as in `font-lock-keywords') and + ;; fontifies them. + ;; + ;; The motivation for moving back to the declaration start is to + ;; establish a context for the current text when, e.g., a character + ;; is typed on a C++ inheritance continuation line, or a jit-lock + ;; chunk starts there. + ;; + ;; The new function works much like a matcher element in + ;; `font-lock-keywords'. It cuts out a little bit of the overhead + ;; compared to a real matcher. The main reason is however to pass the + ;; real search limit to the anchored matcher(s), since most (if not + ;; all) font-lock implementations arbitrarily limit anchored matchers + ;; to the same line, and also to insulate against various other + ;; irritating differences between the different (X)Emacs font-lock + ;; packages. + ;; + ;; REGEXP is the matcher, which must be a regexp. Only matches + ;; where the beginning is outside any comment or string literal are + ;; significant. + ;; + ;; HIGHLIGHTS is a list of highlight specs, just like in + ;; `font-lock-keywords', with these limitations: The face is always + ;; overridden (no big disadvantage, since hits in comments etc are + ;; filtered anyway), there is no "laxmatch", and an anchored matcher + ;; is always a form which must do all the fontification directly. + ;; `limit' is a variable bound to the real limit in the context of + ;; the anchored matcher forms. + ;; + ;; This function does not do any hidden buffer changes, but the + ;; generated functions will. (They are however used in places + ;; covered by the font-lock context.) + + ;; Note: Replace `byte-compile' with `eval' to debug the generated ;; lambda more easily. - (c--compile + (byte-compile `(lambda (limit) (let ( ;; The font-lock package in Emacs is known to clobber ;; `parse-sexp-lookup-properties' (when it exists). @@ -469,40 +457,40 @@ nil))) (defun c-make-font-lock-context-search-function (normal &rest state-stanzas) - "This function makes a byte compiled function that works much like -a matcher element in `font-lock-keywords', with the following -enhancement: the generated function will test for particular \"font -lock contexts\" at the start of the region, i.e. is this point in -the middle of some particular construct? if so the generated -function will first fontify the tail of the construct, before -going into the main loop and fontify full constructs up to limit. - -The generated function takes one parameter called `limit', and -will fontify the region between POINT and LIMIT. - -NORMAL is a list of the form (REGEXP HIGHLIGHTS .....), and is -used to fontify the \"regular\" bit of the region. -STATE-STANZAS is list of elements of the form (STATE LIM REGEXP -HIGHLIGHTS), each element coding one possible font lock context. - -o - REGEXP is a font-lock regular expression (NOT a function), -o - HIGHLIGHTS is a list of zero or more highlighters as defined - on page \"Search-based Fontification\" in the elisp manual. As - yet (2009-06), they must have OVERRIDE set, and may not have - LAXMATCH set. - -o - STATE is the \"font lock context\" (e.g. in-cpp-expr) and is - not quoted. -o - LIM is a lisp form whose evaluation will yield the limit - position in the buffer for fontification by this stanza. - -This function does not do any hidden buffer changes, but the -generated functions will. (They are however used in places -covered by the font-lock context.)" - - ;; Note: Set c-font-byte-compile to nil to debug the generated + ;; This function makes a byte compiled function that works much like + ;; a matcher element in `font-lock-keywords', with the following + ;; enhancement: the generated function will test for particular "font + ;; lock contexts" at the start of the region, i.e. is this point in + ;; the middle of some particular construct? if so the generated + ;; function will first fontify the tail of the construct, before + ;; going into the main loop and fontify full constructs up to limit. + ;; + ;; The generated function takes one parameter called `limit', and + ;; will fontify the region between POINT and LIMIT. + ;; + ;; NORMAL is a list of the form (REGEXP HIGHLIGHTS .....), and is + ;; used to fontify the "regular" bit of the region. + ;; STATE-STANZAS is list of elements of the form (STATE LIM REGEXP + ;; HIGHLIGHTS), each element coding one possible font lock context. + + ;; o - REGEXP is a font-lock regular expression (NOT a function), + ;; o - HIGHLIGHTS is a list of zero or more highlighters as defined + ;; on page "Search-based Fontification" in the elisp manual. As + ;; yet (2009-06), they must have OVERRIDE set, and may not have + ;; LAXMATCH set. + ;; + ;; o - STATE is the "font lock context" (e.g. in-cpp-expr) and is + ;; not quoted. + ;; o - LIM is a lisp form whose evaluation will yield the limit + ;; position in the buffer for fontification by this stanza. + ;; + ;; This function does not do any hidden buffer changes, but the + ;; generated functions will. (They are however used in places + ;; covered by the font-lock context.) + ;; + ;; Note: Replace `byte-compile' with `eval' to debug the generated ;; lambda more easily. - (c--compile + (byte-compile `(lambda (limit) (let ( ;; The font-lock package in Emacs is known to clobber ;; `parse-sexp-lookup-properties' (when it exists). @@ -534,10 +522,10 @@ (form &rest &or ("quote" (&rest form)) ("`" (&rest form)) form)));)) (defun c-fontify-recorded-types-and-refs () - "Convert the ranges recorded on `c-record-type-identifiers' and -`c-record-ref-identifiers' to fontification. - -This function does hidden buffer changes." + ;; Convert the ranges recorded on `c-record-type-identifiers' and + ;; `c-record-ref-identifiers' to fontification. + ;; + ;; This function does hidden buffer changes. (let (elem) (while (consp c-record-type-identifiers) (setq elem (car c-record-type-identifiers) @@ -593,7 +581,7 @@ ;; Use an anchored matcher to put paren syntax ;; on the brackets. - (,(c--compile + (,(byte-compile `(lambda (limit) (let ((beg (match-beginning ,(+ ncle-depth re-depth sws-depth 1))) @@ -695,10 +683,10 @@ "\\)") `(,(1+ ncle-depth) c-preprocessor-face-name t))) - (eval . (list ',(c-make-syntactic-matcher - (concat noncontinued-line-end - (c-lang-const c-opt-cpp-prefix) - "if\\(n\\)def\\>")) + (eval . (list ,(c-make-syntactic-matcher + (concat noncontinued-line-end + (c-lang-const c-opt-cpp-prefix) + "if\\(n\\)def\\>")) ,(+ ncle-depth 1) c-negation-char-face-name 'append)) @@ -757,11 +745,11 @@ ;; this, but it doesn't give the control we want since any ;; fontification done inside the function will be ;; unconditionally overridden. - (,(c-make-font-lock-search-function - ;; Match a char before the string starter to make - ;; `c-skip-comments-and-strings' work correctly. - (concat ".\\(" c-string-limit-regexp "\\)") - '((c-font-lock-invalid-string)))) + ,(c-make-font-lock-search-function + ;; Match a char before the string starter to make + ;; `c-skip-comments-and-strings' work correctly. + (concat ".\\(" c-string-limit-regexp "\\)") + '((c-font-lock-invalid-string))) ;; Fontify keyword constants. ,@(when (c-lang-const c-constant-kwds) @@ -813,8 +801,7 @@ (c-backward-syntactic-ws) (setq id-end (point)) (< (skip-chars-backward - ,(c-lang-const c-symbol-chars)) - 0)) + ,(c-lang-const c-symbol-chars)) 0)) (not (get-text-property (point) 'face))) (c-put-font-lock-face (point) id-end c-reference-face-name) @@ -822,7 +809,7 @@ nil (goto-char (match-end 0))))) - `((,(c--compile + `((,(byte-compile ;; Must use a function here since we match longer than ;; we want to move before doing a new search. This is ;; not necessary for XEmacs since it restarts the @@ -1577,7 +1564,9 @@ ;; Note that this function won't attempt to fontify beyond the end of the ;; current enum block, if any. (let* ((paren-state (c-parse-state)) - (encl-pos (c-most-enclosing-brace paren-state))) + (encl-pos (c-most-enclosing-brace paren-state)) + (start (point)) + ) (when (and encl-pos (eq (char-after encl-pos) ?\{) @@ -1628,16 +1617,17 @@ t `(;; Objective-C methods. ,@(when (c-major-mode-is 'objc-mode) `((,(c-lang-const c-opt-method-key) - (,(lambda (limit) - (let (;; The font-lock package in Emacs is known to clobber - ;; `parse-sexp-lookup-properties' (when it exists). - (parse-sexp-lookup-properties - (cc-eval-when-compile - (boundp 'parse-sexp-lookup-properties)))) - (save-restriction - (narrow-to-region (point-min) limit) - (c-font-lock-objc-method))) - nil) + (,(byte-compile + (lambda (limit) + (let (;; The font-lock package in Emacs is known to clobber + ;; `parse-sexp-lookup-properties' (when it exists). + (parse-sexp-lookup-properties + (cc-eval-when-compile + (boundp 'parse-sexp-lookup-properties)))) + (save-restriction + (narrow-to-region (point-min) limit) + (c-font-lock-objc-method))) + nil)) (goto-char (match-end 1)))))) ;; Fontify all type names and the identifiers in the @@ -1752,7 +1742,7 @@ ;; Fontify types preceded by `c-type-prefix-kwds' (e.g. "struct"). ,@(when (c-lang-const c-type-prefix-kwds) - `((,(c--compile + `((,(byte-compile `(lambda (limit) (c-fontify-types-and-refs ((c-promote-possible-types t) @@ -2305,7 +2295,7 @@ limit "[-+]" nil - (lambda (_match-pos _inside-macro) + (lambda (match-pos inside-macro) (forward-char) (c-font-lock-objc-method)))) nil) === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2014-09-10 16:32:36 +0000 +++ lisp/progmodes/cc-langs.el 2014-09-10 21:38:11 +0000 @@ -153,8 +153,8 @@ c-emacs-variable-inits-tail c-emacs-variable-inits)) (defmacro c-lang-defvar (var val &optional doc) - "Declare the buffer local variable VAR to get the value VAL. -VAL is evaluated and assigned at mode initialization. More precisely, VAL is + "Declares the buffer local variable VAR to get the value VAL. VAL is +evaluated and assigned at mode initialization. More precisely, VAL is evaluated and bound to VAR when the result from the macro `c-init-language-vars' is evaluated. @@ -218,54 +218,55 @@ ;; Some helper functions used when building the language constants. (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate) - "Extract a subset of the operators in the list OPS in a DWIM:ey way. -The return value is a plain list of operators: - -OPS either has the structure of `c-operators', is a single -group in `c-operators', or is a plain list of operators. - -OPGROUP-FILTER specifies how to select the operator groups. It -can be t to choose all groups, a list of group type symbols -\(such as 'prefix) to accept, or a function which will be called -with the group symbol for each group and should return non-nil -if that group is to be included. - -If XLATE is given, it's a function which is called for each -matching operator and its return value is collected instead. -If it returns a list, the elements are spliced directly into -the final result, which is returned as a list with duplicates -removed using `equal'. - -`c-mode-syntax-table' for the current mode is in effect during -the whole procedure." + ;; Extract a subset of the operators in the list OPS in a DWIM:ey + ;; way. The return value is a plain list of operators: + ;; + ;; OPS either has the structure of `c-operators', is a single + ;; group in `c-operators', or is a plain list of operators. + ;; + ;; OPGROUP-FILTER specifies how to select the operator groups. It + ;; can be t to choose all groups, a list of group type symbols + ;; (such as 'prefix) to accept, or a function which will be called + ;; with the group symbol for each group and should return non-nil + ;; if that group is to be included. + ;; + ;; If XLATE is given, it's a function which is called for each + ;; matching operator and its return value is collected instead. + ;; If it returns a list, the elements are spliced directly into + ;; the final result, which is returned as a list with duplicates + ;; removed using `equal'. + ;; + ;; `c-mode-syntax-table' for the current mode is in effect during + ;; the whole procedure. (unless (listp (car-safe ops)) (setq ops (list ops))) - (let ((opgroup-filter - (cond ((eq opgroup-filter t) (lambda (opgroup) t)) - ((not (functionp opgroup-filter)) - `(lambda (opgroup) (memq opgroup ',opgroup-filter))) - (t opgroup-filter))) - (op-filter - (cond ((eq op-filter t) (lambda (op) t)) - ((stringp op-filter) `(lambda (op) (string-match ,op-filter op))) - (t op-filter)))) - (unless xlate - (setq xlate #'identity)) - (c-with-syntax-table (c-lang-const c-mode-syntax-table) - (cl-delete-duplicates - (cl-mapcan (lambda (opgroup) - (when (if (symbolp (car opgroup)) - (when (funcall opgroup-filter (car opgroup)) - (setq opgroup (cdr opgroup)) - t) - t) - (cl-mapcan (lambda (op) - (when (funcall op-filter op) - (let ((res (funcall xlate op))) - (if (listp res) res (list res))))) - opgroup))) - ops) - :test #'equal))))) + (cond ((eq opgroup-filter t) + (setq opgroup-filter (lambda (opgroup) t))) + ((not (functionp opgroup-filter)) + (setq opgroup-filter `(lambda (opgroup) + (memq opgroup ',opgroup-filter))))) + (cond ((eq op-filter t) + (setq op-filter (lambda (op) t))) + ((stringp op-filter) + (setq op-filter `(lambda (op) + (string-match ,op-filter op))))) + (unless xlate + (setq xlate 'identity)) + (c-with-syntax-table (c-lang-const c-mode-syntax-table) + (cl-delete-duplicates + (cl-mapcan (lambda (opgroup) + (when (if (symbolp (car opgroup)) + (when (funcall opgroup-filter (car opgroup)) + (setq opgroup (cdr opgroup)) + t) + t) + (cl-mapcan (lambda (op) + (when (funcall op-filter op) + (let ((res (funcall xlate op))) + (if (listp res) res (list res))))) + opgroup))) + ops) + :test 'equal)))) ;;; Various mode specific values that aren't language related. @@ -349,12 +350,16 @@ ;; all languages now require dual comments, we make this the ;; default. (cond - ((featurep 'xemacs) + ;; XEmacs + ((memq '8-bit c-emacs-features) (modify-syntax-entry ?/ ". 1456" table) (modify-syntax-entry ?* ". 23" table)) - (t + ;; Emacs + ((memq '1-bit c-emacs-features) (modify-syntax-entry ?/ ". 124b" table) - (modify-syntax-entry ?* ". 23" table))) + (modify-syntax-entry ?* ". 23" table)) + ;; incompatible + (t (error "CC Mode is incompatible with this version of Emacs"))) (modify-syntax-entry ?\n "> b" table) ;; Give CR the same syntax as newline, for selective-display @@ -363,19 +368,19 @@ (c-lang-defconst c-make-mode-syntax-table "Functions that generates the mode specific syntax tables. The syntax tables aren't stored directly since they're quite large." - t (lambda () - (let ((table (make-syntax-table))) - (c-populate-syntax-table table) - ;; Mode specific syntaxes. - (cond ((or (c-major-mode-is 'objc-mode) (c-major-mode-is 'java-mode)) - ;; Let '@' be part of symbols in ObjC to cope with - ;; its compiler directives as single keyword tokens. - ;; This is then necessary since it's assumed that - ;; every keyword is a single symbol. - (modify-syntax-entry ?@ "_" table)) - ((c-major-mode-is 'pike-mode) - (modify-syntax-entry ?@ "." table))) - table))) + t `(lambda () + (let ((table (make-syntax-table))) + (c-populate-syntax-table table) + ;; Mode specific syntaxes. + ,(cond ((or (c-major-mode-is 'objc-mode) (c-major-mode-is 'java-mode)) + ;; Let '@' be part of symbols in ObjC to cope with + ;; its compiler directives as single keyword tokens. + ;; This is then necessary since it's assumed that + ;; every keyword is a single symbol. + `(modify-syntax-entry ?@ "_" table)) + ((c-major-mode-is 'pike-mode) + `(modify-syntax-entry ?@ "." table))) + table))) (c-lang-defconst c-mode-syntax-table ;; The syntax tables in evaluated form. Only used temporarily when @@ -393,15 +398,15 @@ ;; CALLED!!! t nil (java c++) `(lambda () - (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) - (modify-syntax-entry ?< "(>" table) + (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) + (modify-syntax-entry ?< "(>" table) (modify-syntax-entry ?> ")<" table) table))) (c-lang-defvar c++-template-syntax-table (and (c-lang-const c++-make-template-syntax-table) (funcall (c-lang-const c++-make-template-syntax-table)))) -(c-lang-defconst c-no-parens-syntax-table +(c-lang-defconst c-make-no-parens-syntax-table ;; A variant of the standard syntax table which is used to find matching ;; "<"s and ">"s which have been marked as parens using syntax table ;; properties. The other paren characters (e.g. "{", ")" "]") are given a @@ -409,18 +414,20 @@ ;; even when there's unbalanced other parens inside them. ;; ;; This variable is nil for languages which don't have template stuff. - t `(lambda () - (if (c-lang-const c-recognize-<>-arglists) - (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) - (modify-syntax-entry ?\( "." table) - (modify-syntax-entry ?\) "." table) - (modify-syntax-entry ?\[ "." table) - (modify-syntax-entry ?\] "." table) - (modify-syntax-entry ?\{ "." table) - (modify-syntax-entry ?\} "." table) - table)))) + t (if (c-lang-const c-recognize-<>-arglists) + `(lambda () + ;(if (c-lang-const c-recognize-<>-arglists) + (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) + (modify-syntax-entry ?\( "." table) + (modify-syntax-entry ?\) "." table) + (modify-syntax-entry ?\[ "." table) + (modify-syntax-entry ?\] "." table) + (modify-syntax-entry ?\{ "." table) + (modify-syntax-entry ?\} "." table) + table)))) (c-lang-defvar c-no-parens-syntax-table - (funcall (c-lang-const c-no-parens-syntax-table))) + (and (c-lang-const c-make-no-parens-syntax-table) + (funcall (c-lang-const c-make-no-parens-syntax-table)))) (c-lang-defconst c-identifier-syntax-modifications "A list that describes the modifications that should be done to the @@ -1137,8 +1144,7 @@ c++ (append '("&" "<%" "%>" "<:" ":>" "%:" "%:%:") (c-lang-const c-other-op-syntax-tokens)) objc (append '("#" "##" ; Used by cpp. - "+" "-") - (c-lang-const c-other-op-syntax-tokens)) + "+" "-") (c-lang-const c-other-op-syntax-tokens)) idl (append '("#" "##") ; Used by cpp. (c-lang-const c-other-op-syntax-tokens)) pike (append '("..") @@ -2465,24 +2471,27 @@ ;; Note: No `*-kwds' language constants may be defined below this point. -(defconst c-kwds-lang-consts - ;; List of all the language constants that contain keyword lists. - (let (list) - (mapatoms (lambda (sym) - (when (and ;; (boundp sym) - (string-match "-kwds\\'" (symbol-name sym))) - ;; Make the list of globally interned symbols - ;; instead of ones interned in `c-lang-constants'. - (setq list (cons (intern (symbol-name sym)) list)))) - c-lang-constants) - list)) +(eval-and-compile + (defconst c-kwds-lang-consts + ;; List of all the language constants that contain keyword lists. + (let (list) + (mapatoms (lambda (sym) + (when (and (boundp sym) + (string-match "-kwds\\'" (symbol-name sym))) + ;; Make the list of globally interned symbols + ;; instead of ones interned in `c-lang-constants'. + (setq list (cons (intern (symbol-name sym)) list)))) + c-lang-constants) + list))) (c-lang-defconst c-keywords ;; All keywords as a list. t (cl-delete-duplicates - (apply #'append (mapcar (lambda (kwds-lang-const) - (c-get-lang-constant kwds-lang-const)) - c-kwds-lang-consts)) + (c-lang-defconst-eval-immediately + `(append ,@(mapcar (lambda (kwds-lang-const) + `(c-lang-const ,kwds-lang-const)) + c-kwds-lang-consts) + nil)) :test 'string-equal)) (c-lang-defconst c-keywords-regexp @@ -2494,10 +2503,18 @@ ;; An alist with all the keywords in the cars. The cdr for each ;; keyword is a list of the symbols for the `*-kwds' lists that ;; contains it. - t (let (kwd-list kwd + t (let ((kwd-list-alist + (c-lang-defconst-eval-immediately + `(list ,@(mapcar (lambda (kwds-lang-const) + `(cons ',kwds-lang-const + (c-lang-const ,kwds-lang-const))) + c-kwds-lang-consts)))) + lang-const kwd-list kwd result-alist elem) - (dolist (lang-const c-kwds-lang-consts) - (setq kwd-list (c-get-lang-constant lang-const)) + (while kwd-list-alist + (setq lang-const (caar kwd-list-alist) + kwd-list (cdar kwd-list-alist) + kwd-list-alist (cdr kwd-list-alist)) (while kwd-list (setq kwd (car kwd-list) kwd-list (cdr kwd-list)) @@ -2583,13 +2600,12 @@ right-assoc-sequence) t)) - ;; (unambiguous-prefix-ops (cl-set-difference nonkeyword-prefix-ops - ;; in-or-postfix-ops - ;; :test 'string-equal)) - ;; (ambiguous-prefix-ops (cl-intersection nonkeyword-prefix-ops - ;; in-or-postfix-ops - ;; :test 'string-equal)) - ) + (unambiguous-prefix-ops (set-difference nonkeyword-prefix-ops + in-or-postfix-ops + :test 'string-equal)) + (ambiguous-prefix-ops (intersection nonkeyword-prefix-ops + in-or-postfix-ops + :test 'string-equal))) (concat "\\(" === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2014-09-10 16:32:36 +0000 +++ lisp/progmodes/cc-mode.el 2014-09-10 21:38:11 +0000 @@ -95,9 +95,14 @@ (cc-require 'cc-menus) (cc-require 'cc-guess) +;; Silence the compiler. +(cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs +(cc-bytecomp-defun run-mode-hooks) ; Emacs 21.1 + ;; We set these variables during mode init, yet we don't require ;; font-lock. -(defvar font-lock-defaults) +(cc-bytecomp-defvar font-lock-defaults) +(cc-bytecomp-defvar font-lock-syntactic-keywords) ;; Menu support for both XEmacs and Emacs. If you don't have easymenu ;; with your version of Emacs, you are incompatible! @@ -547,8 +552,11 @@ ;; heuristic that open parens in column 0 are defun starters. Since ;; we have c-state-cache, that heuristic isn't useful and only causes ;; trouble, so turn it off. - (when (memq 'col-0-paren c-emacs-features) - (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil)) +;; 2006/12/17: This facility is somewhat confused, and doesn't really seem +;; helpful. Comment it out for now. +;; (when (memq 'col-0-paren c-emacs-features) +;; (make-local-variable 'open-paren-in-column-0-is-defun-start) +;; (setq open-paren-in-column-0-is-defun-start nil)) (c-clear-found-types) @@ -808,7 +816,7 @@ (defmacro c-run-mode-hooks (&rest hooks) ;; Emacs 21.1 has introduced a system with delayed mode hooks that ;; requires the use of the new function `run-mode-hooks'. - (if (fboundp 'run-mode-hooks) + (if (cc-bytecomp-fboundp 'run-mode-hooks) `(run-mode-hooks ,@hooks) `(progn ,@(mapcar (lambda (hook) `(run-hooks ,hook)) hooks)))) @@ -1224,8 +1232,8 @@ (font-lock-mark-block-function . c-mark-function))) - (set (make-local-variable 'font-lock-fontify-region-function) - #'c-font-lock-fontify-region) + (make-local-variable 'font-lock-fontify-region-function) + (setq font-lock-fontify-region-function 'c-font-lock-fontify-region) (if (featurep 'xemacs) (make-local-hook 'font-lock-mode-hook)) ------------------------------------------------------------ revno: 117859 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-10 13:56:05 -0700 message: Simplify lisp.h by removing the __COUNTER__ business. Problem reported by Dmitry Antipov in: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00220.html * lisp.h (make_local_vector, make_local_string) (build_local_string): Simplify by not bothering with __COUNTER__. The __COUNTER__ business wasn't working properly, and was needed only for hypothetical future expansion anyway. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-10 17:56:38 +0000 +++ src/ChangeLog 2014-09-10 20:56:05 +0000 @@ -1,3 +1,13 @@ +2014-09-10 Paul Eggert + + Simplify lisp.h by removing the __COUNTER__ business. + Problem reported by Dmitry Antipov in: + http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00220.html + * lisp.h (make_local_vector, make_local_string) + (build_local_string): Simplify by not bothering with __COUNTER__. + The __COUNTER__ business wasn't working properly, and was needed + only for hypothetical future expansion anyway. + 2014-09-10 Alp Aker * nsterm.m (ns_draw_fringe_bitmap): Use the same logic as other === modified file 'src/lisp.h' --- src/lisp.h 2014-09-10 16:52:50 +0000 +++ src/lisp.h 2014-09-10 20:56:05 +0000 @@ -4563,58 +4563,50 @@ # define scoped_list3(x, y, z) list3 (x, y, z) #endif -#if USE_STACK_LISP_OBJECTS && HAVE_STATEMENT_EXPRESSIONS && defined __COUNTER__ +#if USE_STACK_LISP_OBJECTS && HAVE_STATEMENT_EXPRESSIONS # define USE_LOCAL_ALLOCATORS /* Return a function-scoped vector of length SIZE, with each element being INIT. */ -# define make_local_vector(size, init) \ - make_local_vector_n (size, init, __COUNTER__) -# define make_local_vector_n(size_arg, init_arg, n) \ +# define make_local_vector(size, init) \ ({ \ - ptrdiff_t size##n = size_arg; \ - Lisp_Object init##n = init_arg; \ - Lisp_Object vec##n; \ - if (size##n <= (MAX_ALLOCA - header_size) / word_size) \ + ptrdiff_t size_ = size; \ + Lisp_Object init_ = init; \ + Lisp_Object vec_; \ + if (size_ <= (MAX_ALLOCA - header_size) / word_size) \ { \ - void *ptr##n = alloca (size##n * word_size + header_size); \ - vec##n = local_vector_init (ptr##n, size##n, init##n); \ + void *ptr_ = alloca (size_ * word_size + header_size); \ + vec_ = local_vector_init (ptr_, size_, init_); \ } \ else \ - vec##n = Fmake_vector (make_number (size##n), init##n); \ - vec##n; \ + vec_ = Fmake_vector (make_number (size_), init_); \ + vec_; \ }) /* Return a function-scoped string with contents DATA and length NBYTES. */ -# define make_local_string(data, nbytes) \ - make_local_string (data, nbytes, __COUNTER__) -# define make_local_string_n(data_arg, nbytes_arg, n) \ +# define make_local_string(data, nbytes) \ ({ \ - char const *data##n = data_arg; \ - ptrdiff_t nbytes##n = nbytes_arg; \ - Lisp_Object string##n; \ - if (nbytes##n <= MAX_ALLOCA - sizeof (struct Lisp_String) - 1) \ + char const *data_ = data; \ + ptrdiff_t nbytes_ = nbytes; \ + Lisp_Object string_; \ + if (nbytes_ <= MAX_ALLOCA - sizeof (struct Lisp_String) - 1) \ { \ - struct Lisp_String *ptr##n \ - = alloca (sizeof (struct Lisp_String) + 1 + nbytes); \ - string##n = local_string_init (ptr##n, data##n, nbytes##n); \ + struct Lisp_String *ptr_ = alloca (sizeof (struct Lisp_String) + 1 \ + + nbytes_); \ + string_ = local_string_init (ptr_, data_, nbytes_); \ } \ else \ - string##n = make_string (data##n, nbytes##n); \ - string##n; \ + string_ = make_string (data_, nbytes_); \ + string_; \ }) /* Return a function-scoped string with contents DATA. */ -# define build_local_string(data) build_local_string_n (data, __COUNTER__) -# define build_local_string_n(data_arg, n) \ - ({ \ - char const *data##n = data_arg; \ - make_local_string (data##n, strlen (data##n)); \ - }) +# define build_local_string(data) \ + ({ char const *data_ = data; make_local_string (data_, strlen (data_)); }) #else ------------------------------------------------------------ revno: 117858 fixes bug: http://debbugs.gnu.org/18437 committer: Alp Aker branch nick: trunk timestamp: Wed 2014-09-10 13:56:38 -0400 message: * nsterm.m (ns_draw_fringe_bitmap): Use the same logic as other terms to determine bitmap color. (Bug#18437) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-10 17:51:53 +0000 +++ src/ChangeLog 2014-09-10 17:56:38 +0000 @@ -1,3 +1,8 @@ +2014-09-10 Alp Aker + + * nsterm.m (ns_draw_fringe_bitmap): Use the same logic as other + terms to determine bitmap color. (Bug#18437) + 2014-09-10 Eli Zaretskii * w32.c (sys_write): Use SAFE_NALLOCA for the NL -> CRLF === modified file 'src/nsterm.m' --- src/nsterm.m 2014-07-27 14:45:26 +0000 +++ src/nsterm.m 2014-09-10 17:56:38 +0000 @@ -2347,7 +2347,18 @@ to erase the whole background. */ [ns_lookup_indexed_color(face->background, f) set]; NSRectFill (r); - [img setXBMColor: ns_lookup_indexed_color(face->foreground, f)]; + + { + NSColor *bm_color; + if (!p->cursor_p) + bm_color = ns_lookup_indexed_color(face->foreground, f); + else if (p->overlay_p) + bm_color = ns_lookup_indexed_color(face->background, f); + else + bm_color = f->output_data.ns->cursor_color; + [img setXBMColor: bm_color]; + } + #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 [img drawInRect: r fromRect: NSZeroRect ------------------------------------------------------------ revno: 117857 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2014-09-10 20:51:53 +0300 message: src/w32.c (sys_write): Use SAFE_NALLOCA for the NL -> CRLF translation buffer. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-10 17:18:38 +0000 +++ src/ChangeLog 2014-09-10 17:51:53 +0000 @@ -1,3 +1,8 @@ +2014-09-10 Eli Zaretskii + + * w32.c (sys_write): Use SAFE_NALLOCA for the NL -> CRLF + translation buffer. + 2014-09-10 Paul Eggert * xterm.c (handle_one_xevent): Add braces to pacify gcc -Wall. === modified file 'src/w32.c' --- src/w32.c 2014-08-25 15:55:46 +0000 +++ src/w32.c 2014-09-10 17:51:53 +0000 @@ -8241,6 +8241,7 @@ sys_write (int fd, const void * buffer, unsigned int count) { int nchars; + USE_SAFE_ALLOCA; if (fd < 0) { @@ -8259,30 +8260,33 @@ /* Perform text mode translation if required. */ if ((fd_info[fd].flags & FILE_BINARY) == 0) { - char * tmpbuf = alloca (count * 2); - unsigned char * src = (void *)buffer; - unsigned char * dst = tmpbuf; + char * tmpbuf; + const unsigned char * src = buffer; + unsigned char * dst; int nbytes = count; + SAFE_NALLOCA (tmpbuf, 2, count); + dst = tmpbuf; + while (1) { unsigned char *next; - /* copy next line or remaining bytes */ + /* Copy next line or remaining bytes. */ next = _memccpy (dst, src, '\n', nbytes); if (next) { - /* copied one line ending with '\n' */ + /* Copied one line ending with '\n'. */ int copied = next - dst; nbytes -= copied; src += copied; - /* insert '\r' before '\n' */ + /* Insert '\r' before '\n'. */ next[-1] = '\r'; next[0] = '\n'; dst = next + 1; count++; } else - /* copied remaining partial line -> now finished */ + /* Copied remaining partial line -> now finished. */ break; } buffer = tmpbuf; @@ -8296,31 +8300,44 @@ HANDLE wait_hnd[2] = { interrupt_handle, ovl->hEvent }; DWORD active = 0; + /* This is async (a.k.a. "overlapped") I/O, so the return value + of FALSE from WriteFile means either an error or the output + will be completed asynchronously (ERROR_IO_PENDING). */ if (!WriteFile (hnd, buffer, count, (DWORD*) &nchars, ovl)) { if (GetLastError () != ERROR_IO_PENDING) { errno = EIO; - return -1; + nchars = -1; } - if (detect_input_pending ()) - active = MsgWaitForMultipleObjects (2, wait_hnd, FALSE, INFINITE, - QS_ALLINPUT); else - active = WaitForMultipleObjects (2, wait_hnd, FALSE, INFINITE); - if (active == WAIT_OBJECT_0) - { /* User pressed C-g, cancel write, then leave. Don't bother - cleaning up as we may only get stuck in buggy drivers. */ - PurgeComm (hnd, PURGE_TXABORT | PURGE_TXCLEAR); - CancelIo (hnd); - errno = EIO; - return -1; - } - if (active == WAIT_OBJECT_0 + 1 - && !GetOverlappedResult (hnd, ovl, (DWORD*) &nchars, TRUE)) { - errno = EIO; - return -1; + /* Wait for the write to complete, and watch C-g while + at that. */ + if (detect_input_pending ()) + active = MsgWaitForMultipleObjects (2, wait_hnd, FALSE, + INFINITE, QS_ALLINPUT); + else + active = WaitForMultipleObjects (2, wait_hnd, FALSE, INFINITE); + switch (active) + { + case WAIT_OBJECT_0: + /* User pressed C-g, cancel write, then leave. + Don't bother cleaning up as we may only get stuck + in buggy drivers. */ + PurgeComm (hnd, PURGE_TXABORT | PURGE_TXCLEAR); + CancelIo (hnd); + errno = EIO; /* Why not EINTR? */ + nchars = -1; + break; + case WAIT_OBJECT_0 + 1: + if (!GetOverlappedResult (hnd, ovl, (DWORD*) &nchars, TRUE)) + { + errno = EIO; + nchars = -1; + } + break; + } } } } @@ -8381,6 +8398,7 @@ } } + SAFE_FREE (); return nchars; } ------------------------------------------------------------ revno: 117856 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-10 10:18:38 -0700 message: * xterm.c (handle_one_xevent): Add braces to pacify gcc -Wall. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-10 17:02:42 +0000 +++ src/ChangeLog 2014-09-10 17:18:38 +0000 @@ -1,3 +1,7 @@ +2014-09-10 Paul Eggert + + * xterm.c (handle_one_xevent): Add braces to pacify gcc -Wall. + 2014-09-10 Jan Djärv * xterm.c (handle_one_xevent): Detect iconified by looking at === modified file 'src/xterm.c' --- src/xterm.c 2014-09-10 17:02:42 +0000 +++ src/xterm.c 2014-09-10 17:18:38 +0000 @@ -6846,28 +6846,30 @@ dpyinfo->last_user_time = event->xproperty.time; f = x_top_window_to_frame (dpyinfo, event->xproperty.window); if (f && event->xproperty.atom == dpyinfo->Xatom_net_wm_state) - if (x_handle_net_wm_state (f, &event->xproperty) - && FRAME_ICONIFIED_P (f) - && f->output_data.x->net_wm_state_hidden_seen) - { - /* Gnome shell does not iconify us when C-z is pressed. - It hides the frame. So if our state says we aren't - hidden anymore, treat it as deiconified. */ - SET_FRAME_VISIBLE (f, 1); - SET_FRAME_ICONIFIED (f, 0); - f->output_data.x->has_been_visible = 1; - f->output_data.x->net_wm_state_hidden_seen = 0; - inev.ie.kind = DEICONIFY_EVENT; - XSETFRAME (inev.ie.frame_or_window, f); - } - else if (! FRAME_ICONIFIED_P (f) - && f->output_data.x->net_wm_state_hidden_seen) - { - SET_FRAME_VISIBLE (f, 0); - SET_FRAME_ICONIFIED (f, 1); - inev.ie.kind = ICONIFY_EVENT; - XSETFRAME (inev.ie.frame_or_window, f); - } + { + if (x_handle_net_wm_state (f, &event->xproperty) + && FRAME_ICONIFIED_P (f) + && f->output_data.x->net_wm_state_hidden_seen) + { + /* Gnome shell does not iconify us when C-z is pressed. + It hides the frame. So if our state says we aren't + hidden anymore, treat it as deiconified. */ + SET_FRAME_VISIBLE (f, 1); + SET_FRAME_ICONIFIED (f, 0); + f->output_data.x->has_been_visible = 1; + f->output_data.x->net_wm_state_hidden_seen = 0; + inev.ie.kind = DEICONIFY_EVENT; + XSETFRAME (inev.ie.frame_or_window, f); + } + else if (! FRAME_ICONIFIED_P (f) + && f->output_data.x->net_wm_state_hidden_seen) + { + SET_FRAME_VISIBLE (f, 0); + SET_FRAME_ICONIFIED (f, 1); + inev.ie.kind = ICONIFY_EVENT; + XSETFRAME (inev.ie.frame_or_window, f); + } + } x_handle_property_notify (&event->xproperty); xft_settings_event (dpyinfo, event); ------------------------------------------------------------ revno: 117855 committer: Jan D. branch nick: trunk timestamp: Wed 2014-09-10 19:02:42 +0200 message: Detect iconified under Compiz/Unity * xterm.c (handle_one_xevent): Detect iconified by looking at _NET_WM_STATE_HIDDEN. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-10 16:52:50 +0000 +++ src/ChangeLog 2014-09-10 17:02:42 +0000 @@ -1,3 +1,8 @@ +2014-09-10 Jan Djärv + + * xterm.c (handle_one_xevent): Detect iconified by looking at + _NET_WM_STATE_HIDDEN. + 2014-09-10 Paul Eggert * lisp.h (DEFINE_GDB_SYMBOL_ENUM): Remove. === modified file 'src/xterm.c' --- src/xterm.c 2014-09-09 03:22:36 +0000 +++ src/xterm.c 2014-09-10 17:02:42 +0000 @@ -6860,6 +6860,14 @@ inev.ie.kind = DEICONIFY_EVENT; XSETFRAME (inev.ie.frame_or_window, f); } + else if (! FRAME_ICONIFIED_P (f) + && f->output_data.x->net_wm_state_hidden_seen) + { + SET_FRAME_VISIBLE (f, 0); + SET_FRAME_ICONIFIED (f, 1); + inev.ie.kind = ICONIFY_EVENT; + XSETFRAME (inev.ie.frame_or_window, f); + } x_handle_property_notify (&event->xproperty); xft_settings_event (dpyinfo, event); ------------------------------------------------------------ revno: 117854 author: Paul Eggert committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-10 09:52:50 -0700 message: * lisp.h (DEFINE_GDB_SYMBOL_ENUM): Remove. These can generate a constant with the correct value but the wrong width, which doesn't work as a printf argument. All uses removed. Problem reported by Dmitry Antipov in: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00213.html (ENUMABLE): Remove; no longer needed. (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val): Remove; no longer needed because of the above change. Each definiens moved to the only use. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-10 06:38:38 +0000 +++ src/ChangeLog 2014-09-10 16:52:50 +0000 @@ -1,5 +1,15 @@ 2014-09-10 Paul Eggert + * lisp.h (DEFINE_GDB_SYMBOL_ENUM): Remove. + These can generate a constant with the correct value but the wrong + width, which doesn't work as a printf argument. All uses removed. + Problem reported by Dmitry Antipov in: + http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00213.html + (ENUMABLE): Remove; no longer needed. + (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val): + Remove; no longer needed because of the above change. + Each definiens moved to the only use. + Improve the experimental local and scoped allocation. * alloc.c (local_string_init, local_vector_init): New functions, defined if USE_LOCAL_ALLOCATORS. === modified file 'src/lisp.h' --- src/lisp.h 2014-09-10 06:38:38 +0000 +++ src/lisp.h 2014-09-10 16:52:50 +0000 @@ -36,31 +36,15 @@ /* Define a TYPE constant ID as an externally visible name. Use like this: - #define ID_val (some integer preprocessor expression) - #if ENUMABLE (ID_val) - DEFINE_GDB_SYMBOL_ENUM (ID) - #else DEFINE_GDB_SYMBOL_BEGIN (TYPE, ID) - # define ID ID_val + # define ID (some integer preprocessor expression of type TYPE) DEFINE_GDB_SYMBOL_END (ID) - #endif This hack is for the benefit of compilers that do not make macro - definitions visible to the debugger. It's used for symbols that - .gdbinit needs, symbols whose values may not fit in 'int' (where an - enum would suffice). - - Some GCC versions before GCC 4.2 omit enums in debugging output; - see GCC bug 23336. So don't use enums with older GCC. */ - -#if !defined __GNUC__ || 4 < __GNUC__ + (2 <= __GNUC_MINOR__) -# define ENUMABLE(val) (INT_MIN <= (val) && (val) <= INT_MAX) -#else -# define ENUMABLE(val) 0 -#endif - -#define DEFINE_GDB_SYMBOL_ENUM(id) enum { id = id##_val }; -#if defined MAIN_PROGRAM + definitions or enums visible to the debugger. It's used for symbols + that .gdbinit needs. */ + +#ifdef MAIN_PROGRAM # define DEFINE_GDB_SYMBOL_BEGIN(type, id) type const id EXTERNALLY_VISIBLE # define DEFINE_GDB_SYMBOL_END(id) = id; #else @@ -600,25 +584,15 @@ /* In the size word of a vector, this bit means the vector has been marked. */ -#define ARRAY_MARK_FLAG_val PTRDIFF_MIN -#if ENUMABLE (ARRAY_MARK_FLAG_val) -DEFINE_GDB_SYMBOL_ENUM (ARRAY_MARK_FLAG) -#else DEFINE_GDB_SYMBOL_BEGIN (ptrdiff_t, ARRAY_MARK_FLAG) -# define ARRAY_MARK_FLAG ARRAY_MARK_FLAG_val +# define ARRAY_MARK_FLAG PTRDIFF_MIN DEFINE_GDB_SYMBOL_END (ARRAY_MARK_FLAG) -#endif /* In the size word of a struct Lisp_Vector, this bit means it's really some other vector-like object. */ -#define PSEUDOVECTOR_FLAG_val (PTRDIFF_MAX - PTRDIFF_MAX / 2) -#if ENUMABLE (PSEUDOVECTOR_FLAG_val) -DEFINE_GDB_SYMBOL_ENUM (PSEUDOVECTOR_FLAG) -#else DEFINE_GDB_SYMBOL_BEGIN (ptrdiff_t, PSEUDOVECTOR_FLAG) -# define PSEUDOVECTOR_FLAG PSEUDOVECTOR_FLAG_val +# define PSEUDOVECTOR_FLAG (PTRDIFF_MAX - PTRDIFF_MAX / 2) DEFINE_GDB_SYMBOL_END (PSEUDOVECTOR_FLAG) -#endif /* In a pseudovector, the size field actually contains a word with one PSEUDOVECTOR_FLAG bit set, and one of the following values extracted @@ -671,14 +645,9 @@ that cons. */ /* Mask for the value (as opposed to the type bits) of a Lisp object. */ -#define VALMASK_val (USE_LSB_TAG ? - (1 << GCTYPEBITS) : VAL_MAX) -#if ENUMABLE (VALMASK_val) -DEFINE_GDB_SYMBOL_ENUM (VALMASK) -#else DEFINE_GDB_SYMBOL_BEGIN (EMACS_INT, VALMASK) -# define VALMASK VALMASK_val +# define VALMASK (USE_LSB_TAG ? - (1 << GCTYPEBITS) : VAL_MAX) DEFINE_GDB_SYMBOL_END (VALMASK) -#endif /* Largest and smallest representable fixnum values. These are the C values. They are macros for use in static initializers. */ ------------------------------------------------------------ revno: 117853 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2014-09-10 12:32:36 -0400 message: CC-mode: Set open-paren-in-column-0-is-defun-start to nil; plus misc cleanup. * lisp/progmodes/cc-mode.el (c-basic-common-init): Set open-paren-in-column-0-is-defun-start. (adaptive-fill-first-line-regexp, font-lock-syntactic-keywords): Remove declarations, unused. (run-mode-hooks): Remove declaration. (font-lock-defaults): Use plain `defvar' to declare. (c-run-mode-hooks): Test existence of run-mode-hooks with fboundp. * lisp/progmodes/cc-langs.el (c-filter-ops): Avoid `setq'. (c-make-mode-syntax-table): Don't micro-optimize. (c-keywords, c-keyword-member-alist): Simplify. (c-kwds-lang-consts): Don't eval at compile-time. (c-primary-expr-regexp): Comment out unused vars. * lisp/progmodes/cc-fonts.el (c-font-lock-context): Declare at top-level. (c-font-byte-compile): New var. (c--compile): New function. Use it instead of `byte-compile'. (c-cpp-matchers): Quote the value returned by `c-make-syntactic-matcher' in case it's not self-evaluating. (c-basic-matchers-before): Avoid a plain MATCHER as keyword, wrap it in parentheses instead (in case MATCHER happens to be a list). (c-font-lock-enum-tail): Remove unused var `start'. (c-font-lock-objc-methods): Silence byte-compiler warnings. * lisp/progmodes/cc-engine.el (c-syntactic-re-search-forward): Sink an `if' test into an argument. * lisp/progmodes/cc-defs.el (c-point, c-major-mode-is, c-put-char-property) (c-get-char-property): Don't use `eval' just to unquote a constant. (c-use-extents): Remove. Use (featurep 'xemacs), compiled more efficiently. (c-put-char-property-fun): Don't call `byte-compile' by hand. (c-clear-char-property, c-clear-char-properties): Check that `property' is a quoted constant. (c-emacs-features): Remove `infodock', `syntax-properties', and `pps-extended-state' (never used), `8-bit' and `1-bit' (use (featurep 'xemacs) instead). Use `with-temp-buffer' and let-bind vars after changing buffer, so we don't have to setq them again afterwards. (c-lang-const): Remove redundant symbolp assertions. (c-find-assignment-for-mode): Use `or'. * lisp/Makefile.in (compile-one-process): Remove cc-mode dependency. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-09 20:39:31 +0000 +++ lisp/ChangeLog 2014-09-10 16:32:36 +0000 @@ -1,3 +1,45 @@ +2014-09-10 Stefan Monnier + + CC-mode: Set open-paren-in-column-0-is-defun-start to nil; + plus misc cleanup. + * progmodes/cc-mode.el (c-basic-common-init): + Set open-paren-in-column-0-is-defun-start. + (adaptive-fill-first-line-regexp, font-lock-syntactic-keywords): + Remove declarations, unused. + (run-mode-hooks): Remove declaration. + (font-lock-defaults): Use plain `defvar' to declare. + (c-run-mode-hooks): Test existence of run-mode-hooks with fboundp. + * progmodes/cc-langs.el (c-filter-ops): Avoid `setq'. + (c-make-mode-syntax-table): Don't micro-optimize. + (c-keywords, c-keyword-member-alist): Simplify. + (c-kwds-lang-consts): Don't eval at compile-time. + (c-primary-expr-regexp): Comment out unused vars. + * progmodes/cc-fonts.el (c-font-lock-context): Declare at top-level. + (c-font-byte-compile): New var. + (c--compile): New function. Use it instead of `byte-compile'. + (c-cpp-matchers): Quote the value returned by + `c-make-syntactic-matcher' in case it's not self-evaluating. + (c-basic-matchers-before): Avoid a plain MATCHER as keyword, wrap it in + parentheses instead (in case MATCHER happens to be a list). + (c-font-lock-enum-tail): Remove unused var `start'. + (c-font-lock-objc-methods): Silence byte-compiler warnings. + * progmodes/cc-engine.el (c-syntactic-re-search-forward): Sink an `if' + test into an argument. + * progmodes/cc-defs.el (c-point, c-major-mode-is, c-put-char-property) + (c-get-char-property): Don't use `eval' just to unquote a constant. + (c-use-extents): Remove. Use (featurep 'xemacs), compiled + more efficiently. + (c-put-char-property-fun): Don't call `byte-compile' by hand. + (c-clear-char-property, c-clear-char-properties): Check that `property' + is a quoted constant. + (c-emacs-features): Remove `infodock', `syntax-properties', and + `pps-extended-state' (never used), `8-bit' and `1-bit' (use (featurep + 'xemacs) instead). Use `with-temp-buffer' and let-bind vars after + changing buffer, so we don't have to setq them again afterwards. + (c-lang-const): Remove redundant symbolp assertions. + (c-find-assignment-for-mode): Use `or'. + * Makefile.in (compile-one-process): Remove cc-mode dependency. + 2014-09-09 Sam Steingold * progmodes/sql.el (sql-default-directory): Fix type annotation. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2014-09-09 15:08:08 +0000 +++ lisp/Makefile.in 2014-09-10 16:32:36 +0000 @@ -387,7 +387,7 @@ # There is no reason to use this rule unless you only have a single # core and CPU time is an issue. .PHONY: compile-one-process -compile-one-process: $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc +compile-one-process: $(LOADDEFS) compile-first $(emacs) $(BYTE_COMPILE_FLAGS) \ --eval "(batch-byte-recompile-directory 0)" $(lisp) === modified file 'lisp/progmodes/cc-defs.el' --- lisp/progmodes/cc-defs.el 2014-08-28 20:37:13 +0000 +++ lisp/progmodes/cc-defs.el 2014-09-10 16:32:36 +0000 @@ -195,7 +195,7 @@ to it is returned. This function does not modify the point or the mark." (if (eq (car-safe position) 'quote) - (let ((position (eval position))) + (let ((position (nth 1 position))) (cond ((eq position 'bol) @@ -885,7 +885,7 @@ `(c-lang-major-mode-is ,mode) (if (eq (car-safe mode) 'quote) - (let ((mode (eval mode))) + (let ((mode (nth 1 mode))) (if (listp mode) `(memq c-buffer-is-cc-mode ',mode) `(eq c-buffer-is-cc-mode ',mode))) @@ -900,26 +900,10 @@ ;; properties set on a single character and that never spread to any ;; other characters. -(eval-and-compile - ;; Constant used at compile time to decide whether or not to use - ;; XEmacs extents. Check all the extent functions we'll use since - ;; some packages might add compatibility aliases for some of them in - ;; Emacs. - (defconst c-use-extents (and (cc-bytecomp-fboundp 'extent-at) - (cc-bytecomp-fboundp 'set-extent-property) - (cc-bytecomp-fboundp 'set-extent-properties) - (cc-bytecomp-fboundp 'make-extent) - (cc-bytecomp-fboundp 'extent-property) - (cc-bytecomp-fboundp 'delete-extent) - (cc-bytecomp-fboundp 'map-extents)))) - ;; `c-put-char-property' is complex enough in XEmacs and Emacs < 21 to ;; make it a function. (defalias 'c-put-char-property-fun - (cc-eval-when-compile - (cond (c-use-extents - ;; XEmacs. - (byte-compile + (cond ((featurep 'xemacs) (lambda (pos property value) (let ((ext (extent-at pos nil property))) (if ext @@ -928,20 +912,19 @@ (cons property (cons value '(start-open t - end-open t))))))))) + end-open t)))))))) ((not (cc-bytecomp-boundp 'text-property-default-nonsticky)) ;; In Emacs < 21 we have to mess with the `rear-nonsticky' property. - (byte-compile (lambda (pos property value) (put-text-property pos (1+ pos) property value) (let ((prop (get-text-property pos 'rear-nonsticky))) (or (memq property prop) (put-text-property pos (1+ pos) 'rear-nonsticky - (cons property prop))))))) + (cons property prop)))))) ;; This won't be used for anything. - (t 'ignore)))) + (t #'ignore))) (cc-bytecomp-defun c-put-char-property-fun) ; Make it known below. (defmacro c-put-char-property (pos property value) @@ -956,42 +939,38 @@ ;; 21) then it's assumed that the property is present on it. ;; ;; This macro does a hidden buffer change. - (setq property (eval property)) - (if (or c-use-extents + (if (or (featurep 'xemacs) (not (cc-bytecomp-boundp 'text-property-default-nonsticky))) ;; XEmacs and Emacs < 21. - `(c-put-char-property-fun ,pos ',property ,value) + `(c-put-char-property-fun ,pos ,property ,value) ;; In Emacs 21 we got the `rear-nonsticky' property covered ;; by `text-property-default-nonsticky'. `(let ((-pos- ,pos)) - (put-text-property -pos- (1+ -pos-) ',property ,value)))) + (put-text-property -pos- (1+ -pos-) ,property ,value)))) (defmacro c-get-char-property (pos property) ;; Get the value of the given property on the character at POS if ;; it's been put there by `c-put-char-property'. PROPERTY is ;; assumed to be constant. - (setq property (eval property)) - (if c-use-extents + (if (featurep 'xemacs) ;; XEmacs. - `(let ((ext (extent-at ,pos nil ',property))) - (if ext (extent-property ext ',property))) + `(let ((ext (extent-at ,pos nil ,property))) + (if ext (extent-property ext ,property))) ;; Emacs. - `(get-text-property ,pos ',property))) + `(get-text-property ,pos ,property))) ;; `c-clear-char-property' is complex enough in Emacs < 21 to make it ;; a function, since we have to mess with the `rear-nonsticky' property. (defalias 'c-clear-char-property-fun - (cc-eval-when-compile - (unless (or c-use-extents + (unless (or (featurep 'xemacs) (cc-bytecomp-boundp 'text-property-default-nonsticky)) - (byte-compile (lambda (pos property) (when (get-text-property pos property) (remove-text-properties pos (1+ pos) (list property nil)) (put-text-property pos (1+ pos) 'rear-nonsticky (delq property (get-text-property - pos 'rear-nonsticky))))))))) + pos 'rear-nonsticky))))))) (cc-bytecomp-defun c-clear-char-property-fun) ; Make it known below. (defmacro c-clear-char-property (pos property) @@ -1000,8 +979,10 @@ ;; constant. ;; ;; This macro does a hidden buffer change. - (setq property (eval property)) - (cond (c-use-extents + (if (eq 'quote (car-safe property)) + (setq property (nth 1 property)) + (error "`property' should be a quoted constant")) + (cond ((featurep 'xemacs) ;; XEmacs. `(let ((ext (extent-at ,pos nil ',property))) (if ext (delete-extent ext)))) @@ -1026,8 +1007,10 @@ ;; `syntax-table'. ;; ;; This macro does hidden buffer changes. - (setq property (eval property)) - (if c-use-extents + (if (eq 'quote (car-safe property)) + (setq property (nth 1 property)) + (error "`property' should be a quoted constant")) + (if (featurep 'xemacs) ;; XEmacs. `(map-extents (lambda (ext ignored) (delete-extent ext)) @@ -1097,7 +1080,7 @@ which have the value VALUE, as tested by `equal'. These properties are assumed to be over individual characters, having been put there by c-put-char-property. POINT remains unchanged." - (if c-use-extents + (if (featurep 'xemacs) ;; XEmacs `(let ((-property- ,property)) (map-extents (lambda (ext val) @@ -1561,32 +1544,6 @@ (defconst c-emacs-features (let (list) - (if (boundp 'infodock-version) - ;; I've no idea what this actually is, but it's legacy. /mast - (setq list (cons 'infodock list))) - - ;; XEmacs uses 8-bit modify-syntax-entry flags. - ;; Emacs uses a 1-bit flag. We will have to set up our - ;; syntax tables differently to handle this. - (let ((table (copy-syntax-table)) - entry) - (modify-syntax-entry ?a ". 12345678" table) - (cond - ;; Emacs - ((arrayp table) - (setq entry (aref table ?a)) - ;; In Emacs, table entries are cons cells - (if (consp entry) (setq entry (car entry)))) - ;; XEmacs - ((fboundp 'get-char-table) - (setq entry (get-char-table ?a table))) - ;; incompatible - (t (error "CC Mode is incompatible with this version of Emacs"))) - (setq list (cons (if (= (logand (lsh entry -16) 255) 255) - '8-bit - '1-bit) - list))) - ;; Check whether beginning/end-of-defun call ;; beginning/end-of-defun-function nicely, passing through the ;; argument and respecting the return code. @@ -1609,35 +1566,12 @@ (not (end-of-defun)))) (setq list (cons 'argumentative-bod-function list)))) - (let ((buf (generate-new-buffer " test")) - parse-sexp-lookup-properties - parse-sexp-ignore-comments - lookup-syntax-properties) ; XEmacs - (with-current-buffer buf + (with-temp-buffer + (let ((parse-sexp-lookup-properties t) + (parse-sexp-ignore-comments t) + (lookup-syntax-properties t)) ; XEmacs (set-syntax-table (make-syntax-table)) - ;; For some reason we have to set some of these after the - ;; buffer has been made current. (Specifically, - ;; `parse-sexp-ignore-comments' in Emacs 21.) - (setq parse-sexp-lookup-properties t - parse-sexp-ignore-comments t - lookup-syntax-properties t) - - ;; Find out if the `syntax-table' text property works. - (modify-syntax-entry ?< ".") - (modify-syntax-entry ?> ".") - (insert "<()>") - (c-mark-<-as-paren (point-min)) - (c-mark->-as-paren (+ 3 (point-min))) - (goto-char (point-min)) - (c-forward-sexp) - (if (= (point) (+ 4 (point-min))) - (setq list (cons 'syntax-properties list)) - (error (concat - "CC Mode is incompatible with this version of Emacs - " - "support for the `syntax-table' text property " - "is required."))) - ;; Find out if generic comment delimiters work. (c-safe (modify-syntax-entry ?x "!") @@ -1674,11 +1608,11 @@ (cond ;; XEmacs. Afaik this is currently an Emacs-only ;; feature, but it's good to be prepared. - ((memq '8-bit list) + ((featurep 'xemacs) (modify-syntax-entry ?/ ". 1456") (modify-syntax-entry ?* ". 23")) ;; Emacs - ((memq '1-bit list) + (t (modify-syntax-entry ?/ ". 124b") (modify-syntax-entry ?* ". 23"))) (modify-syntax-entry ?\n "> b") @@ -1687,16 +1621,7 @@ (if (bobp) (setq list (cons 'col-0-paren list))))) - (set-buffer-modified-p nil)) - (kill-buffer buf)) - - ;; See if `parse-partial-sexp' returns the eighth element. - (if (c-safe (>= (length (save-excursion (parse-partial-sexp (point) (point)))) - 10)) - (setq list (cons 'pps-extended-state list)) - (error (concat - "CC Mode is incompatible with this version of Emacs - " - "`parse-partial-sexp' has to return at least 10 elements."))) + (set-buffer-modified-p nil))) ;;(message "c-emacs-features: %S" list) list) @@ -1705,29 +1630,16 @@ features supporting those needed by CC Mode. The following values might be present: -'8-bit 8 bit syntax entry flags (XEmacs style). -'1-bit 1 bit syntax entry flags (Emacs style). -'argumentative-bod-function beginning-of-defun passes ARG through - to a non-null beginning-of-defun-function. It is assumed - the end-of-defun does the same thing. -'syntax-properties It works to override the syntax for specific characters - in the buffer with the 'syntax-table property. It's - always set - CC Mode no longer works in emacsen without - this feature. -'gen-comment-delim Generic comment delimiters work +`argumentative-bod-function' `beginning-of-defun' passes ARG through + to a non-null `beginning-of-defun-function.' It is assumed + that `end-of-defun' does the same thing. +`gen-comment-delim' Generic comment delimiters work (i.e. the syntax class `!'). -'gen-string-delim Generic string delimiters work +`gen-string-delim' Generic string delimiters work (i.e. the syntax class `|'). -'pps-extended-state `parse-partial-sexp' returns a list with at least 10 - elements, i.e. it contains the position of the start of - the last comment or string. It's always set - CC Mode - no longer works in emacsen without this feature. -'posix-char-classes The regexp engine understands POSIX character classes. -'col-0-paren It's possible to turn off the ad-hoc rule that a paren - in column zero is the start of a defun. -'infodock This is Infodock (based on XEmacs). - -'8-bit and '1-bit are mutually exclusive.") +`posix-char-classes' The regexp engine understands POSIX character classes. +`col-0-paren' It's possible to turn off the ad-hoc rule that a paren + in column zero is the start of a defun.") ;;; Some helper constants. @@ -2023,11 +1935,6 @@ language. NAME and LANG are not evaluated so they should not be quoted." - (or (symbolp name) - (error "Not a symbol: %S" name)) - (or (symbolp lang) - (error "Not a symbol: %S" lang)) - (let ((sym (intern (symbol-name name) c-lang-constants)) (mode (when lang (intern (concat (symbol-name lang) "-mode"))))) @@ -2188,57 +2095,56 @@ value)))) (defun c-find-assignment-for-mode (source-pos mode match-any-lang _name) - ;; Find the first assignment entry that applies to MODE at or after - ;; SOURCE-POS. If MATCH-ANY-LANG is non-nil, entries with `t' as - ;; the language list are considered to match, otherwise they don't. - ;; On return SOURCE-POS is updated to point to the next assignment - ;; after the returned one. If no assignment is found, - ;; `c-lang--novalue' is returned as a magic value. - ;; - ;; SOURCE-POS is a vector that points out a specific assignment in - ;; the double alist that's used in the `source' property. The first - ;; element is the position in the top alist which is indexed with - ;; the source files, and the second element is the position in the - ;; nested bindings alist. - ;; - ;; NAME is only used for error messages. + "Find the first assignment entry that applies to MODE at or after +SOURCE-POS. If MATCH-ANY-LANG is non-nil, entries with `t' as +the language list are considered to match, otherwise they don't. +On return SOURCE-POS is updated to point to the next assignment +after the returned one. If no assignment is found, +`c-lang--novalue' is returned as a magic value. + +SOURCE-POS is a vector that points out a specific assignment in +the double alist that's used in the `source' property. The first +element is the position in the top alist which is indexed with +the source files, and the second element is the position in the +nested bindings alist. + +NAME is only used for error messages." (catch 'found (let ((file-entry (elt source-pos 0)) (assignment-entry (elt source-pos 1)) assignment) - (while (if assignment-entry - t - ;; Handled the last assignment from one file, begin on the - ;; next. Due to the check in `c-lang-defconst', we know - ;; there's at least one. - (when file-entry - - (unless (aset source-pos 1 - (setq assignment-entry (cdar file-entry))) - ;; The file containing the source definitions has not - ;; been loaded. - (let ((file (symbol-name (caar file-entry))) - (c-lang-constants-under-evaluation nil)) - ;;(message (concat "Loading %s to get the source " - ;; "value for language constant %s") - ;; file name) - (load file nil t)) - - (unless (setq assignment-entry (cdar file-entry)) - ;; The load didn't fill in the source for the - ;; constant as expected. The situation is - ;; probably that a derived mode was written for - ;; and compiled with another version of CC Mode, - ;; and the requested constant isn't in the - ;; currently loaded one. Put in a dummy - ;; assignment that matches no language. - (setcdr (car file-entry) - (setq assignment-entry (list (list nil)))))) - - (aset source-pos 0 (setq file-entry (cdr file-entry))) - t)) + (while (or assignment-entry + ;; Handled the last assignment from one file, begin on the + ;; next. Due to the check in `c-lang-defconst', we know + ;; there's at least one. + (when file-entry + + (unless (aset source-pos 1 + (setq assignment-entry (cdar file-entry))) + ;; The file containing the source definitions has not + ;; been loaded. + (let ((file (symbol-name (caar file-entry))) + (c-lang-constants-under-evaluation nil)) + ;;(message (concat "Loading %s to get the source " + ;; "value for language constant %s") + ;; file name) + (load file nil t)) + + (unless (setq assignment-entry (cdar file-entry)) + ;; The load didn't fill in the source for the + ;; constant as expected. The situation is + ;; probably that a derived mode was written for + ;; and compiled with another version of CC Mode, + ;; and the requested constant isn't in the + ;; currently loaded one. Put in a dummy + ;; assignment that matches no language. + (setcdr (car file-entry) + (setq assignment-entry (list (list nil)))))) + + (aset source-pos 0 (setq file-entry (cdr file-entry))) + t)) (setq assignment (car assignment-entry)) (aset source-pos 1 === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2014-08-24 20:50:11 +0000 +++ lisp/progmodes/cc-engine.el 2014-09-10 16:32:36 +0000 @@ -2222,6 +2222,8 @@ ((and (not not-in-delimiter) ; inside a comment starter (not (bobp)) (progn (backward-char) + ;; FIXME: We never add category-properties to + ;; c-emacs-features! (and (not (and (memq 'category-properties c-emacs-features) (looking-at "\\s!"))) (looking-at c-comment-start-regexp)))) @@ -4119,10 +4121,10 @@ (c-end-of-current-token last-token-end-pos)) (setq last-token-end-pos (point)))))) ;; Inside a token. - (if lookbehind-submatch - ;; See the NOTE above. - (goto-char state-pos) - (goto-char (min last-token-end-pos bound)))) + (goto-char (if lookbehind-submatch + ;; See the NOTE above. + state-pos + (min last-token-end-pos bound)))) (t ;; A real match. === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2014-08-24 20:50:11 +0000 +++ lisp/progmodes/cc-fonts.el 2014-09-10 16:32:36 +0000 @@ -201,17 +201,18 @@ :version "24.1" :group 'c) +;; This indicates the "font locking context", and is set just before +;; fontification is done. If non-nil, it says, e.g., point starts +;; from within a #if preprocessor construct. +(defvar c-font-lock-context nil) +(make-variable-buffer-local 'c-font-lock-context) +(cc-bytecomp-defvar c-font-lock-context) + (eval-and-compile ;; We need the following definitions during compilation since they're ;; used when the `c-lang-defconst' initializers are evaluated. Define ;; them at runtime too for the sake of derived modes. - ;; This indicates the "font locking context", and is set just before - ;; fontification is done. If non-nil, it says, e.g., point starts - ;; from within a #if preprocessor construct. - (defvar c-font-lock-context nil) - (make-variable-buffer-local 'c-font-lock-context) - (defmacro c-put-font-lock-face (from to face) ;; Put a face on a region (overriding any existing face) in the way ;; font-lock would do it. In XEmacs that means putting an @@ -272,18 +273,29 @@ (c-got-face-at (point) c-literal-faces)))) t)) + (defvar c-font-byte-compile t + "If non-nil, byte-compile the dynamically-generated functions.") + + (defun c--compile (exp) + (cond + ((byte-code-function-p exp) (error "Already byte-compiled: %S" exp)) + ((not (eq (car-safe exp) 'lambda)) + (error "Expected a (lambda ..): %S" exp)) + (c-font-byte-compile (byte-compile exp)) + (t (eval (macroexpand-all exp))))) + (defun c-make-syntactic-matcher (regexp) - ;; Returns a byte compiled function suitable for use in place of a - ;; regexp string in a `font-lock-keywords' matcher, except that - ;; only matches outside comments and string literals count. - ;; - ;; This function does not do any hidden buffer changes, but the - ;; generated functions will. (They are however used in places - ;; covered by the font-lock context.) - (byte-compile + "Return a function suitable for use in place of a +regexp string in a `font-lock-keywords' matcher, except that +only matches outside comments and string literals count. + +This function does not do any hidden buffer changes, but the +generated functions will. (They are however used in places +covered by the font-lock context.)" + (c--compile `(lambda (limit) (let (res) - (while (and (setq res (re-search-forward ,regexp limit t)) + (while (and (setq res (re-search-forward ,regexp limit t)) (progn (goto-char (match-beginning 0)) (or (c-skip-comments-and-strings limit) @@ -332,34 +344,34 @@ highlights)))) (defun c-make-font-lock-search-function (regexp &rest highlights) - ;; This function makes a byte compiled function that works much like - ;; a matcher element in `font-lock-keywords'. It cuts out a little - ;; bit of the overhead compared to a real matcher. The main reason - ;; is however to pass the real search limit to the anchored - ;; matcher(s), since most (if not all) font-lock implementations - ;; arbitrarily limit anchored matchers to the same line, and also - ;; to insulate against various other irritating differences between - ;; the different (X)Emacs font-lock packages. - ;; - ;; REGEXP is the matcher, which must be a regexp. Only matches - ;; where the beginning is outside any comment or string literal are - ;; significant. - ;; - ;; HIGHLIGHTS is a list of highlight specs, just like in - ;; `font-lock-keywords', with these limitations: The face is always - ;; overridden (no big disadvantage, since hits in comments etc are - ;; filtered anyway), there is no "laxmatch", and an anchored matcher - ;; is always a form which must do all the fontification directly. - ;; `limit' is a variable bound to the real limit in the context of - ;; the anchored matcher forms. - ;; - ;; This function does not do any hidden buffer changes, but the - ;; generated functions will. (They are however used in places - ;; covered by the font-lock context.) - - ;; Note: Replace `byte-compile' with `eval' to debug the generated + "This function makes a byte compiled function that works much like +a matcher element in `font-lock-keywords'. It cuts out a little +bit of the overhead compared to a real matcher. The main reason +is however to pass the real search limit to the anchored +matcher(s), since most (if not all) font-lock implementations +arbitrarily limit anchored matchers to the same line, and also +to insulate against various other irritating differences between +the different (X)Emacs font-lock packages. + +REGEXP is the matcher, which must be a regexp. Only matches +where the beginning is outside any comment or string literal are +significant. + +HIGHLIGHTS is a list of highlight specs, just like in +`font-lock-keywords', with these limitations: The face is always +overridden (no big disadvantage, since hits in comments etc are +filtered anyway), there is no \"laxmatch\", and an anchored matcher +is always a form which must do all the fontification directly. +`limit' is a variable bound to the real limit in the context of +the anchored matcher forms. + +This function does not do any hidden buffer changes, but the +generated functions will. (They are however used in places +covered by the font-lock context.)" + + ;; Note: Set c-font-byte-compile to nil to debug the generated ;; lambda more easily. - (byte-compile + (c--compile `(lambda (limit) (let ( ;; The font-lock package in Emacs is known to clobber ;; `parse-sexp-lookup-properties' (when it exists). @@ -402,44 +414,44 @@ nil))) (defun c-make-font-lock-BO-decl-search-function (regexp &rest highlights) - ;; This function makes a byte compiled function that first moves back - ;; to the beginning of the current declaration (if any), then searches - ;; forward for matcher elements (as in `font-lock-keywords') and - ;; fontifies them. - ;; - ;; The motivation for moving back to the declaration start is to - ;; establish a context for the current text when, e.g., a character - ;; is typed on a C++ inheritance continuation line, or a jit-lock - ;; chunk starts there. - ;; - ;; The new function works much like a matcher element in - ;; `font-lock-keywords'. It cuts out a little bit of the overhead - ;; compared to a real matcher. The main reason is however to pass the - ;; real search limit to the anchored matcher(s), since most (if not - ;; all) font-lock implementations arbitrarily limit anchored matchers - ;; to the same line, and also to insulate against various other - ;; irritating differences between the different (X)Emacs font-lock - ;; packages. - ;; - ;; REGEXP is the matcher, which must be a regexp. Only matches - ;; where the beginning is outside any comment or string literal are - ;; significant. - ;; - ;; HIGHLIGHTS is a list of highlight specs, just like in - ;; `font-lock-keywords', with these limitations: The face is always - ;; overridden (no big disadvantage, since hits in comments etc are - ;; filtered anyway), there is no "laxmatch", and an anchored matcher - ;; is always a form which must do all the fontification directly. - ;; `limit' is a variable bound to the real limit in the context of - ;; the anchored matcher forms. - ;; - ;; This function does not do any hidden buffer changes, but the - ;; generated functions will. (They are however used in places - ;; covered by the font-lock context.) - - ;; Note: Replace `byte-compile' with `eval' to debug the generated + "This function makes a byte compiled function that first moves back +to the beginning of the current declaration (if any), then searches +forward for matcher elements (as in `font-lock-keywords') and +fontifies them. + +The motivation for moving back to the declaration start is to +establish a context for the current text when, e.g., a character +is typed on a C++ inheritance continuation line, or a jit-lock +chunk starts there. + +The new function works much like a matcher element in +`font-lock-keywords'. It cuts out a little bit of the overhead +compared to a real matcher. The main reason is however to pass the +real search limit to the anchored matcher(s), since most (if not +all) font-lock implementations arbitrarily limit anchored matchers +to the same line, and also to insulate against various other +irritating differences between the different (X)Emacs font-lock +packages. + +REGEXP is the matcher, which must be a regexp. Only matches +where the beginning is outside any comment or string literal are +significant. + +HIGHLIGHTS is a list of highlight specs, just like in +`font-lock-keywords', with these limitations: The face is always +overridden (no big disadvantage, since hits in comments etc are +filtered anyway), there is no \"laxmatch\", and an anchored matcher +is always a form which must do all the fontification directly. +`limit' is a variable bound to the real limit in the context of +the anchored matcher forms. + +This function does not do any hidden buffer changes, but the +generated functions will. (They are however used in places +covered by the font-lock context.)" + + ;; Note: Set c-font-byte-compile to nil to debug the generated ;; lambda more easily. - (byte-compile + (c--compile `(lambda (limit) (let ( ;; The font-lock package in Emacs is known to clobber ;; `parse-sexp-lookup-properties' (when it exists). @@ -457,40 +469,40 @@ nil))) (defun c-make-font-lock-context-search-function (normal &rest state-stanzas) - ;; This function makes a byte compiled function that works much like - ;; a matcher element in `font-lock-keywords', with the following - ;; enhancement: the generated function will test for particular "font - ;; lock contexts" at the start of the region, i.e. is this point in - ;; the middle of some particular construct? if so the generated - ;; function will first fontify the tail of the construct, before - ;; going into the main loop and fontify full constructs up to limit. - ;; - ;; The generated function takes one parameter called `limit', and - ;; will fontify the region between POINT and LIMIT. - ;; - ;; NORMAL is a list of the form (REGEXP HIGHLIGHTS .....), and is - ;; used to fontify the "regular" bit of the region. - ;; STATE-STANZAS is list of elements of the form (STATE LIM REGEXP - ;; HIGHLIGHTS), each element coding one possible font lock context. - - ;; o - REGEXP is a font-lock regular expression (NOT a function), - ;; o - HIGHLIGHTS is a list of zero or more highlighters as defined - ;; on page "Search-based Fontification" in the elisp manual. As - ;; yet (2009-06), they must have OVERRIDE set, and may not have - ;; LAXMATCH set. - ;; - ;; o - STATE is the "font lock context" (e.g. in-cpp-expr) and is - ;; not quoted. - ;; o - LIM is a lisp form whose evaluation will yield the limit - ;; position in the buffer for fontification by this stanza. - ;; - ;; This function does not do any hidden buffer changes, but the - ;; generated functions will. (They are however used in places - ;; covered by the font-lock context.) - ;; - ;; Note: Replace `byte-compile' with `eval' to debug the generated + "This function makes a byte compiled function that works much like +a matcher element in `font-lock-keywords', with the following +enhancement: the generated function will test for particular \"font +lock contexts\" at the start of the region, i.e. is this point in +the middle of some particular construct? if so the generated +function will first fontify the tail of the construct, before +going into the main loop and fontify full constructs up to limit. + +The generated function takes one parameter called `limit', and +will fontify the region between POINT and LIMIT. + +NORMAL is a list of the form (REGEXP HIGHLIGHTS .....), and is +used to fontify the \"regular\" bit of the region. +STATE-STANZAS is list of elements of the form (STATE LIM REGEXP +HIGHLIGHTS), each element coding one possible font lock context. + +o - REGEXP is a font-lock regular expression (NOT a function), +o - HIGHLIGHTS is a list of zero or more highlighters as defined + on page \"Search-based Fontification\" in the elisp manual. As + yet (2009-06), they must have OVERRIDE set, and may not have + LAXMATCH set. + +o - STATE is the \"font lock context\" (e.g. in-cpp-expr) and is + not quoted. +o - LIM is a lisp form whose evaluation will yield the limit + position in the buffer for fontification by this stanza. + +This function does not do any hidden buffer changes, but the +generated functions will. (They are however used in places +covered by the font-lock context.)" + + ;; Note: Set c-font-byte-compile to nil to debug the generated ;; lambda more easily. - (byte-compile + (c--compile `(lambda (limit) (let ( ;; The font-lock package in Emacs is known to clobber ;; `parse-sexp-lookup-properties' (when it exists). @@ -522,10 +534,10 @@ (form &rest &or ("quote" (&rest form)) ("`" (&rest form)) form)));)) (defun c-fontify-recorded-types-and-refs () - ;; Convert the ranges recorded on `c-record-type-identifiers' and - ;; `c-record-ref-identifiers' to fontification. - ;; - ;; This function does hidden buffer changes. + "Convert the ranges recorded on `c-record-type-identifiers' and +`c-record-ref-identifiers' to fontification. + +This function does hidden buffer changes." (let (elem) (while (consp c-record-type-identifiers) (setq elem (car c-record-type-identifiers) @@ -581,7 +593,7 @@ ;; Use an anchored matcher to put paren syntax ;; on the brackets. - (,(byte-compile + (,(c--compile `(lambda (limit) (let ((beg (match-beginning ,(+ ncle-depth re-depth sws-depth 1))) @@ -683,10 +695,10 @@ "\\)") `(,(1+ ncle-depth) c-preprocessor-face-name t))) - (eval . (list ,(c-make-syntactic-matcher - (concat noncontinued-line-end - (c-lang-const c-opt-cpp-prefix) - "if\\(n\\)def\\>")) + (eval . (list ',(c-make-syntactic-matcher + (concat noncontinued-line-end + (c-lang-const c-opt-cpp-prefix) + "if\\(n\\)def\\>")) ,(+ ncle-depth 1) c-negation-char-face-name 'append)) @@ -745,11 +757,11 @@ ;; this, but it doesn't give the control we want since any ;; fontification done inside the function will be ;; unconditionally overridden. - ,(c-make-font-lock-search-function - ;; Match a char before the string starter to make - ;; `c-skip-comments-and-strings' work correctly. - (concat ".\\(" c-string-limit-regexp "\\)") - '((c-font-lock-invalid-string))) + (,(c-make-font-lock-search-function + ;; Match a char before the string starter to make + ;; `c-skip-comments-and-strings' work correctly. + (concat ".\\(" c-string-limit-regexp "\\)") + '((c-font-lock-invalid-string)))) ;; Fontify keyword constants. ,@(when (c-lang-const c-constant-kwds) @@ -801,7 +813,8 @@ (c-backward-syntactic-ws) (setq id-end (point)) (< (skip-chars-backward - ,(c-lang-const c-symbol-chars)) 0)) + ,(c-lang-const c-symbol-chars)) + 0)) (not (get-text-property (point) 'face))) (c-put-font-lock-face (point) id-end c-reference-face-name) @@ -809,7 +822,7 @@ nil (goto-char (match-end 0))))) - `((,(byte-compile + `((,(c--compile ;; Must use a function here since we match longer than ;; we want to move before doing a new search. This is ;; not necessary for XEmacs since it restarts the @@ -1564,9 +1577,7 @@ ;; Note that this function won't attempt to fontify beyond the end of the ;; current enum block, if any. (let* ((paren-state (c-parse-state)) - (encl-pos (c-most-enclosing-brace paren-state)) - (start (point)) - ) + (encl-pos (c-most-enclosing-brace paren-state))) (when (and encl-pos (eq (char-after encl-pos) ?\{) @@ -1617,17 +1628,16 @@ t `(;; Objective-C methods. ,@(when (c-major-mode-is 'objc-mode) `((,(c-lang-const c-opt-method-key) - (,(byte-compile - (lambda (limit) - (let (;; The font-lock package in Emacs is known to clobber - ;; `parse-sexp-lookup-properties' (when it exists). - (parse-sexp-lookup-properties - (cc-eval-when-compile - (boundp 'parse-sexp-lookup-properties)))) - (save-restriction - (narrow-to-region (point-min) limit) - (c-font-lock-objc-method))) - nil)) + (,(lambda (limit) + (let (;; The font-lock package in Emacs is known to clobber + ;; `parse-sexp-lookup-properties' (when it exists). + (parse-sexp-lookup-properties + (cc-eval-when-compile + (boundp 'parse-sexp-lookup-properties)))) + (save-restriction + (narrow-to-region (point-min) limit) + (c-font-lock-objc-method))) + nil) (goto-char (match-end 1)))))) ;; Fontify all type names and the identifiers in the @@ -1742,7 +1752,7 @@ ;; Fontify types preceded by `c-type-prefix-kwds' (e.g. "struct"). ,@(when (c-lang-const c-type-prefix-kwds) - `((,(byte-compile + `((,(c--compile `(lambda (limit) (c-fontify-types-and-refs ((c-promote-possible-types t) @@ -2295,7 +2305,7 @@ limit "[-+]" nil - (lambda (match-pos inside-macro) + (lambda (_match-pos _inside-macro) (forward-char) (c-font-lock-objc-method)))) nil) === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2014-08-24 20:50:11 +0000 +++ lisp/progmodes/cc-langs.el 2014-09-10 16:32:36 +0000 @@ -153,8 +153,8 @@ c-emacs-variable-inits-tail c-emacs-variable-inits)) (defmacro c-lang-defvar (var val &optional doc) - "Declares the buffer local variable VAR to get the value VAL. VAL is -evaluated and assigned at mode initialization. More precisely, VAL is + "Declare the buffer local variable VAR to get the value VAL. +VAL is evaluated and assigned at mode initialization. More precisely, VAL is evaluated and bound to VAR when the result from the macro `c-init-language-vars' is evaluated. @@ -218,55 +218,54 @@ ;; Some helper functions used when building the language constants. (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate) - ;; Extract a subset of the operators in the list OPS in a DWIM:ey - ;; way. The return value is a plain list of operators: - ;; - ;; OPS either has the structure of `c-operators', is a single - ;; group in `c-operators', or is a plain list of operators. - ;; - ;; OPGROUP-FILTER specifies how to select the operator groups. It - ;; can be t to choose all groups, a list of group type symbols - ;; (such as 'prefix) to accept, or a function which will be called - ;; with the group symbol for each group and should return non-nil - ;; if that group is to be included. - ;; - ;; If XLATE is given, it's a function which is called for each - ;; matching operator and its return value is collected instead. - ;; If it returns a list, the elements are spliced directly into - ;; the final result, which is returned as a list with duplicates - ;; removed using `equal'. - ;; - ;; `c-mode-syntax-table' for the current mode is in effect during - ;; the whole procedure. + "Extract a subset of the operators in the list OPS in a DWIM:ey way. +The return value is a plain list of operators: + +OPS either has the structure of `c-operators', is a single +group in `c-operators', or is a plain list of operators. + +OPGROUP-FILTER specifies how to select the operator groups. It +can be t to choose all groups, a list of group type symbols +\(such as 'prefix) to accept, or a function which will be called +with the group symbol for each group and should return non-nil +if that group is to be included. + +If XLATE is given, it's a function which is called for each +matching operator and its return value is collected instead. +If it returns a list, the elements are spliced directly into +the final result, which is returned as a list with duplicates +removed using `equal'. + +`c-mode-syntax-table' for the current mode is in effect during +the whole procedure." (unless (listp (car-safe ops)) (setq ops (list ops))) - (cond ((eq opgroup-filter t) - (setq opgroup-filter (lambda (opgroup) t))) - ((not (functionp opgroup-filter)) - (setq opgroup-filter `(lambda (opgroup) - (memq opgroup ',opgroup-filter))))) - (cond ((eq op-filter t) - (setq op-filter (lambda (op) t))) - ((stringp op-filter) - (setq op-filter `(lambda (op) - (string-match ,op-filter op))))) - (unless xlate - (setq xlate 'identity)) - (c-with-syntax-table (c-lang-const c-mode-syntax-table) - (cl-delete-duplicates - (cl-mapcan (lambda (opgroup) - (when (if (symbolp (car opgroup)) - (when (funcall opgroup-filter (car opgroup)) - (setq opgroup (cdr opgroup)) - t) - t) - (cl-mapcan (lambda (op) - (when (funcall op-filter op) - (let ((res (funcall xlate op))) - (if (listp res) res (list res))))) - opgroup))) - ops) - :test 'equal)))) + (let ((opgroup-filter + (cond ((eq opgroup-filter t) (lambda (opgroup) t)) + ((not (functionp opgroup-filter)) + `(lambda (opgroup) (memq opgroup ',opgroup-filter))) + (t opgroup-filter))) + (op-filter + (cond ((eq op-filter t) (lambda (op) t)) + ((stringp op-filter) `(lambda (op) (string-match ,op-filter op))) + (t op-filter)))) + (unless xlate + (setq xlate #'identity)) + (c-with-syntax-table (c-lang-const c-mode-syntax-table) + (cl-delete-duplicates + (cl-mapcan (lambda (opgroup) + (when (if (symbolp (car opgroup)) + (when (funcall opgroup-filter (car opgroup)) + (setq opgroup (cdr opgroup)) + t) + t) + (cl-mapcan (lambda (op) + (when (funcall op-filter op) + (let ((res (funcall xlate op))) + (if (listp res) res (list res))))) + opgroup))) + ops) + :test #'equal))))) ;;; Various mode specific values that aren't language related. @@ -350,16 +349,12 @@ ;; all languages now require dual comments, we make this the ;; default. (cond - ;; XEmacs - ((memq '8-bit c-emacs-features) + ((featurep 'xemacs) (modify-syntax-entry ?/ ". 1456" table) (modify-syntax-entry ?* ". 23" table)) - ;; Emacs - ((memq '1-bit c-emacs-features) + (t (modify-syntax-entry ?/ ". 124b" table) - (modify-syntax-entry ?* ". 23" table)) - ;; incompatible - (t (error "CC Mode is incompatible with this version of Emacs"))) + (modify-syntax-entry ?* ". 23" table))) (modify-syntax-entry ?\n "> b" table) ;; Give CR the same syntax as newline, for selective-display @@ -368,19 +363,19 @@ (c-lang-defconst c-make-mode-syntax-table "Functions that generates the mode specific syntax tables. The syntax tables aren't stored directly since they're quite large." - t `(lambda () - (let ((table (make-syntax-table))) - (c-populate-syntax-table table) - ;; Mode specific syntaxes. - ,(cond ((or (c-major-mode-is 'objc-mode) (c-major-mode-is 'java-mode)) - ;; Let '@' be part of symbols in ObjC to cope with - ;; its compiler directives as single keyword tokens. - ;; This is then necessary since it's assumed that - ;; every keyword is a single symbol. - `(modify-syntax-entry ?@ "_" table)) - ((c-major-mode-is 'pike-mode) - `(modify-syntax-entry ?@ "." table))) - table))) + t (lambda () + (let ((table (make-syntax-table))) + (c-populate-syntax-table table) + ;; Mode specific syntaxes. + (cond ((or (c-major-mode-is 'objc-mode) (c-major-mode-is 'java-mode)) + ;; Let '@' be part of symbols in ObjC to cope with + ;; its compiler directives as single keyword tokens. + ;; This is then necessary since it's assumed that + ;; every keyword is a single symbol. + (modify-syntax-entry ?@ "_" table)) + ((c-major-mode-is 'pike-mode) + (modify-syntax-entry ?@ "." table))) + table))) (c-lang-defconst c-mode-syntax-table ;; The syntax tables in evaluated form. Only used temporarily when @@ -398,8 +393,8 @@ ;; CALLED!!! t nil (java c++) `(lambda () - (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) - (modify-syntax-entry ?< "(>" table) + (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) + (modify-syntax-entry ?< "(>" table) (modify-syntax-entry ?> ")<" table) table))) (c-lang-defvar c++-template-syntax-table @@ -419,9 +414,9 @@ (let ((table (funcall ,(c-lang-const c-make-mode-syntax-table)))) (modify-syntax-entry ?\( "." table) (modify-syntax-entry ?\) "." table) - (modify-syntax-entry ?\[ "." table) - (modify-syntax-entry ?\] "." table) - (modify-syntax-entry ?\{ "." table) + (modify-syntax-entry ?\[ "." table) + (modify-syntax-entry ?\] "." table) + (modify-syntax-entry ?\{ "." table) (modify-syntax-entry ?\} "." table) table)))) (c-lang-defvar c-no-parens-syntax-table @@ -1142,7 +1137,8 @@ c++ (append '("&" "<%" "%>" "<:" ":>" "%:" "%:%:") (c-lang-const c-other-op-syntax-tokens)) objc (append '("#" "##" ; Used by cpp. - "+" "-") (c-lang-const c-other-op-syntax-tokens)) + "+" "-") + (c-lang-const c-other-op-syntax-tokens)) idl (append '("#" "##") ; Used by cpp. (c-lang-const c-other-op-syntax-tokens)) pike (append '("..") @@ -2469,27 +2465,24 @@ ;; Note: No `*-kwds' language constants may be defined below this point. -(eval-and-compile - (defconst c-kwds-lang-consts - ;; List of all the language constants that contain keyword lists. - (let (list) - (mapatoms (lambda (sym) - (when (and (boundp sym) - (string-match "-kwds\\'" (symbol-name sym))) - ;; Make the list of globally interned symbols - ;; instead of ones interned in `c-lang-constants'. - (setq list (cons (intern (symbol-name sym)) list)))) - c-lang-constants) - list))) +(defconst c-kwds-lang-consts + ;; List of all the language constants that contain keyword lists. + (let (list) + (mapatoms (lambda (sym) + (when (and ;; (boundp sym) + (string-match "-kwds\\'" (symbol-name sym))) + ;; Make the list of globally interned symbols + ;; instead of ones interned in `c-lang-constants'. + (setq list (cons (intern (symbol-name sym)) list)))) + c-lang-constants) + list)) (c-lang-defconst c-keywords ;; All keywords as a list. t (cl-delete-duplicates - (c-lang-defconst-eval-immediately - `(append ,@(mapcar (lambda (kwds-lang-const) - `(c-lang-const ,kwds-lang-const)) - c-kwds-lang-consts) - nil)) + (apply #'append (mapcar (lambda (kwds-lang-const) + (c-get-lang-constant kwds-lang-const)) + c-kwds-lang-consts)) :test 'string-equal)) (c-lang-defconst c-keywords-regexp @@ -2501,18 +2494,10 @@ ;; An alist with all the keywords in the cars. The cdr for each ;; keyword is a list of the symbols for the `*-kwds' lists that ;; contains it. - t (let ((kwd-list-alist - (c-lang-defconst-eval-immediately - `(list ,@(mapcar (lambda (kwds-lang-const) - `(cons ',kwds-lang-const - (c-lang-const ,kwds-lang-const))) - c-kwds-lang-consts)))) - lang-const kwd-list kwd + t (let (kwd-list kwd result-alist elem) - (while kwd-list-alist - (setq lang-const (caar kwd-list-alist) - kwd-list (cdar kwd-list-alist) - kwd-list-alist (cdr kwd-list-alist)) + (dolist (lang-const c-kwds-lang-consts) + (setq kwd-list (c-get-lang-constant lang-const)) (while kwd-list (setq kwd (car kwd-list) kwd-list (cdr kwd-list)) @@ -2598,12 +2583,13 @@ right-assoc-sequence) t)) - (unambiguous-prefix-ops (set-difference nonkeyword-prefix-ops - in-or-postfix-ops - :test 'string-equal)) - (ambiguous-prefix-ops (intersection nonkeyword-prefix-ops - in-or-postfix-ops - :test 'string-equal))) + ;; (unambiguous-prefix-ops (cl-set-difference nonkeyword-prefix-ops + ;; in-or-postfix-ops + ;; :test 'string-equal)) + ;; (ambiguous-prefix-ops (cl-intersection nonkeyword-prefix-ops + ;; in-or-postfix-ops + ;; :test 'string-equal)) + ) (concat "\\(" === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2014-03-04 04:03:34 +0000 +++ lisp/progmodes/cc-mode.el 2014-09-10 16:32:36 +0000 @@ -95,14 +95,9 @@ (cc-require 'cc-menus) (cc-require 'cc-guess) -;; Silence the compiler. -(cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs -(cc-bytecomp-defun run-mode-hooks) ; Emacs 21.1 - ;; We set these variables during mode init, yet we don't require ;; font-lock. -(cc-bytecomp-defvar font-lock-defaults) -(cc-bytecomp-defvar font-lock-syntactic-keywords) +(defvar font-lock-defaults) ;; Menu support for both XEmacs and Emacs. If you don't have easymenu ;; with your version of Emacs, you are incompatible! @@ -552,11 +547,8 @@ ;; heuristic that open parens in column 0 are defun starters. Since ;; we have c-state-cache, that heuristic isn't useful and only causes ;; trouble, so turn it off. -;; 2006/12/17: This facility is somewhat confused, and doesn't really seem -;; helpful. Comment it out for now. -;; (when (memq 'col-0-paren c-emacs-features) -;; (make-local-variable 'open-paren-in-column-0-is-defun-start) -;; (setq open-paren-in-column-0-is-defun-start nil)) + (when (memq 'col-0-paren c-emacs-features) + (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil)) (c-clear-found-types) @@ -816,7 +808,7 @@ (defmacro c-run-mode-hooks (&rest hooks) ;; Emacs 21.1 has introduced a system with delayed mode hooks that ;; requires the use of the new function `run-mode-hooks'. - (if (cc-bytecomp-fboundp 'run-mode-hooks) + (if (fboundp 'run-mode-hooks) `(run-mode-hooks ,@hooks) `(progn ,@(mapcar (lambda (hook) `(run-hooks ,hook)) hooks)))) @@ -1232,8 +1224,8 @@ (font-lock-mark-block-function . c-mark-function))) - (make-local-variable 'font-lock-fontify-region-function) - (setq font-lock-fontify-region-function 'c-font-lock-fontify-region) + (set (make-local-variable 'font-lock-fontify-region-function) + #'c-font-lock-fontify-region) (if (featurep 'xemacs) (make-local-hook 'font-lock-mode-hook)) ------------------------------------------------------------ revno: 117852 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-10 08:21:46 -0700 message: * src/alloc.c (verify_alloca): Replace a stray occurrence of pointer_valid_for_lisp_object. diff: === modified file 'src/alloc.c' --- src/alloc.c 2014-09-10 06:38:38 +0000 +++ src/alloc.c 2014-09-10 15:21:46 +0000 @@ -7175,8 +7175,8 @@ /* Start from size of the smallest Lisp object. */ for (i = sizeof (struct Lisp_Cons); i <= ALLOCA_CHECK_MAX; i++) { - char *ptr = alloca (i); - eassert (pointer_valid_for_lisp_object (ptr)); + void *ptr = alloca (i); + make_lisp_ptr (ptr, Lisp_Cons); } } ------------------------------------------------------------ revno: 117851 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-09-09 23:38:38 -0700 message: Improve the experimental local and scoped allocation. * configure.ac (HAVE_STRUCT_ATTRIBUTE_ALIGNED) (HAVE_STATEMENT_EXPRESSIONS): New configure-time checks. * src/alloc.c (local_string_init, local_vector_init): New functions, defined if USE_LOCAL_ALLOCATORS. Mostly, these are moved here from lisp.h, as it's not clear it's worth making them inline. * src/lisp.h (USE_STACK_LISP_OBJECTS): Default to false. (GCALIGNED): Depend on HAVE_STRUCT_ATTRIBUTE_ALIGNED and USE_STACK_LISP_OBJECTS, not on a laundry list. (local_string_init, local_vector_init): New decls. (union Aligned_Cons): New type. (scoped_cons): Use it. Give up on the char trick, as it's a too much of a maintenance hassle; if someone wants this speedup they'll just need to convince their compiler to align properly. Conversely, use the speedup if struct Lisp_Cons happens to be aligned even without a directive. Better yet, help it along by using union Aligned_Cons rather than struct Lisp_Cons. (pointer_valid_for_lisp_object): Remove. This check is not necessary, since make_lisp_ptr is already doing it. All uses removed. (local_vector_init, local_string_init): Move to alloc.c. (build_local_vector): Remove this awkward macro, replacing with ... (make_local_vector): New macro, which acts more like a function. Use statement expressions and use __COUNTER__ to avoid macro capture. Fall back on functions if these features are not supported. (build_local_string, make_local_string): Likewise. diff: === modified file 'ChangeLog' --- ChangeLog 2014-09-07 08:46:42 +0000 +++ ChangeLog 2014-09-10 06:38:38 +0000 @@ -1,3 +1,9 @@ +2014-09-10 Paul Eggert + + Improve the experimental local and scoped allocation. + * configure.ac (HAVE_STRUCT_ATTRIBUTE_ALIGNED) + (HAVE_STATEMENT_EXPRESSIONS): New configure-time checks. + 2014-09-07 Paul Eggert Expand @AM_DEFAULT_VERBOSITY@ even if Automake is old (Bug#18415). === modified file 'configure.ac' --- configure.ac 2014-09-07 08:46:42 +0000 +++ configure.ac 2014-09-10 06:38:38 +0000 @@ -4822,6 +4822,33 @@ fi AC_SUBST(LIBXMENU) +AC_CACHE_CHECK([for struct alignment], + [emacs_cv_struct_alignment], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include + struct __attribute__ ((aligned (8))) s { char c; }; + struct t { char c; struct s s; }; + char verify[offsetof (struct t, s) == 8 ? 1 : -1]; + ]])], + [emacs_cv_struct_alignment=yes], + [emacs_cv_struct_alignment=no])]) +if test "$emacs_cv_struct_alignment" = yes; then + AC_DEFINE([HAVE_STRUCT_ATTRIBUTE_ALIGNED], 1, + [Define to 1 if 'struct __attribute__ ((aligned (N)))' aligns the + structure to an N-byte boundary.]) +fi + +AC_CACHE_CHECK([for statement expressions], + [emacs_cv_statement_expressions], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([], [[return ({ int x = 5; x-x; });]])], + [emacs_cv_statement_expressions=yes], + [emacs_cv_statement_expressions=no])]) +if test "$emacs_cv_statement_expressions" = yes; then + AC_DEFINE([HAVE_STATEMENT_EXPRESSIONS], 1, + [Define to 1 if statement expressions work.]) +fi + if test "${GNU_MALLOC}" = "yes" ; then AC_DEFINE(GNU_MALLOC, 1, [Define to 1 if you want to use the GNU memory allocator.]) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-09 11:43:22 +0000 +++ src/ChangeLog 2014-09-10 06:38:38 +0000 @@ -1,3 +1,30 @@ +2014-09-10 Paul Eggert + + Improve the experimental local and scoped allocation. + * alloc.c (local_string_init, local_vector_init): + New functions, defined if USE_LOCAL_ALLOCATORS. + Mostly, these are moved here from lisp.h, as it's not + clear it's worth making them inline. + * lisp.h (USE_STACK_LISP_OBJECTS): Default to false. + (GCALIGNED): Depend on HAVE_STRUCT_ATTRIBUTE_ALIGNED and + USE_STACK_LISP_OBJECTS, not on a laundry list. + (local_string_init, local_vector_init): New decls. + (union Aligned_Cons): New type. + (scoped_cons): Use it. Give up on the char trick, as it's a too + much of a maintenance hassle; if someone wants this speedup + they'll just need to convince their compiler to align properly. + Conversely, use the speedup if struct Lisp_Cons happens to + be aligned even without a directive. Better yet, help it along + by using union Aligned_Cons rather than struct Lisp_Cons. + (pointer_valid_for_lisp_object): Remove. This check is not + necessary, since make_lisp_ptr is already doing it. All uses removed. + (local_vector_init, local_string_init): Move to alloc.c. + (build_local_vector): Remove this awkward macro, replacing with ... + (make_local_vector): New macro, which acts more like a function. + Use statement expressions and use __COUNTER__ to avoid macro + capture. Fall back on functions if these features are not supported. + (build_local_string, make_local_string): Likewise. + 2014-09-09 Dmitry Antipov * xterm.c (x_term_init): Consolidate duplicated code. === modified file 'src/alloc.c' --- src/alloc.c 2014-09-09 11:43:22 +0000 +++ src/alloc.c 2014-09-10 06:38:38 +0000 @@ -2226,6 +2226,32 @@ return val; } +#ifdef USE_LOCAL_ALLOCATORS + +/* Initialize the string S from DATA and SIZE. S must be followed by + SIZE + 1 bytes of memory that can be used. Return S tagged as a + Lisp object. */ + +Lisp_Object +local_string_init (struct Lisp_String *s, char const *data, ptrdiff_t size) +{ + unsigned char *data_copy = (unsigned char *) (s + 1); + parse_str_as_multibyte ((unsigned char const *) data, + size, &s->size, &s->size_byte); + if (size == s->size || size != s->size_byte) + { + s->size = size; + s->size_byte = -1; + } + s->intervals = NULL; + s->data = data_copy; + memcpy (data_copy, data, size); + data_copy[size] = '\0'; + return make_lisp_ptr (s, Lisp_String); +} + +#endif + /* Make an unibyte string from LENGTH bytes at CONTENTS. */ @@ -3288,6 +3314,22 @@ return vector; } +#ifdef USE_LOCAL_ALLOCATORS + +/* Initialize V with LENGTH objects each with value INIT, + and return it tagged as a Lisp Object. */ + +INLINE Lisp_Object +local_vector_init (struct Lisp_Vector *v, ptrdiff_t length, Lisp_Object init) +{ + v->header.size = length; + for (ptrdiff_t i = 0; i < length; i++) + v->contents[i] = init; + return make_lisp_ptr (v, Lisp_Vectorlike); +} + +#endif + DEFUN ("vector", Fvector, Svector, 0, MANY, 0, doc: /* Return a newly created vector with specified arguments as elements. === modified file 'src/lisp.h' --- src/lisp.h 2014-09-09 11:43:22 +0000 +++ src/lisp.h 2014-09-10 06:38:38 +0000 @@ -298,12 +298,14 @@ # endif #endif -/* Stolen from gnulib. */ -#if (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ \ - || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C) -#define GCALIGNED __attribute__ ((aligned (GCALIGNMENT))) +#ifndef USE_STACK_LISP_OBJECTS +# define USE_STACK_LISP_OBJECTS false +#endif + +#if defined HAVE_STRUCT_ATTRIBUTE_ALIGNED && USE_STACK_LISP_OBJECTS +# define GCALIGNED __attribute__ ((aligned (GCALIGNMENT))) #else -#define GCALIGNED /* empty */ +# define GCALIGNED /* empty */ #endif /* Some operations are so commonly executed that they are implemented @@ -3685,6 +3687,8 @@ extern Lisp_Object bool_vector_fill (Lisp_Object, Lisp_Object); extern _Noreturn void string_overflow (void); extern Lisp_Object make_string (const char *, ptrdiff_t); +extern Lisp_Object local_string_init (struct Lisp_String *, char const *, + ptrdiff_t); extern Lisp_Object make_formatted_string (char *, const char *, ...) ATTRIBUTE_FORMAT_PRINTF (2, 3); extern Lisp_Object make_unibyte_string (const char *, ptrdiff_t); @@ -3773,6 +3777,8 @@ extern struct window *allocate_window (void); extern struct frame *allocate_frame (void); extern struct Lisp_Process *allocate_process (void); +extern Lisp_Object local_vector_init (struct Lisp_Vector *, ptrdiff_t, + Lisp_Object); extern struct terminal *allocate_terminal (void); extern bool gc_in_progress; extern bool abort_on_gc; @@ -4546,142 +4552,109 @@ memory_full (SIZE_MAX); \ } while (false) -/* This feature is experimental and requires very careful debugging. - Brave user should compile with CPPFLAGS='-DUSE_STACK_LISP_OBJECTS' + +/* If USE_STACK_LISP_OBJECTS, define macros that and functions that + allocate block-scoped conses and function-scoped vectors and + strings. These objects are not managed by the garbage collector, + so they are dangerous: passing them out of their scope (e.g., to + user code) results in undefined behavior. Conversely, they have + better performance because GC is not involved. + + This feature is experimental and requires careful debugging. + Brave users can compile with CPPFLAGS='-DUSE_STACK_LISP_OBJECTS' to get into the game. */ -#ifdef USE_STACK_LISP_OBJECTS - -/* Use the following functions to allocate temporary (function- - or block-scoped) conses, vectors, and strings. These objects - are not managed by GC, and passing them out of their scope - most likely causes an immediate crash at next GC. */ - -#if (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ \ - || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C) - -/* Allocate temporary block-scoped cons. This version assumes - that stack-allocated Lisp_Cons is always aligned properly. */ - -#define scoped_cons(car, cdr) \ - make_lisp_ptr (&((struct Lisp_Cons) { car, { cdr } }), Lisp_Cons) - -#else /* not __GNUC__ etc... */ - -/* Helper function for an alternate scoped cons, see below. */ - -INLINE Lisp_Object -scoped_cons_init (void *ptr, Lisp_Object x, Lisp_Object y) +/* A struct Lisp_Cons inside a union that is no larger and may be + better-aligned. */ + +union Aligned_Cons { - struct Lisp_Cons *c = (struct Lisp_Cons *) - (((uintptr_t) ptr + (GCALIGNMENT - 1)) & ~(GCALIGNMENT - 1)); - c->car = x; - c->u.cdr = y; - return make_lisp_ptr (c, Lisp_Cons); -} + struct Lisp_Cons s; + double d; intmax_t i; void *p; +}; +verify (sizeof (struct Lisp_Cons) == sizeof (union Aligned_Cons)); -/* This version uses explicit alignment. */ +/* Allocate a block-scoped cons. */ #define scoped_cons(car, cdr) \ - scoped_cons_init ((char[sizeof (struct Lisp_Cons) \ - + (GCALIGNMENT - 1)]) {}, (car), (cdr)) - -#endif /* __GNUC__ etc... */ + ((USE_STACK_LISP_OBJECTS \ + && alignof (union Aligned_Cons) % GCALIGNMENT == 0) \ + ? make_lisp_ptr (&((union Aligned_Cons) {{car, {cdr}}}).s, Lisp_Cons) \ + : Fcons (car, cdr)) /* Convenient utility macros similar to listX functions. */ -#define scoped_list1(x) scoped_cons (x, Qnil) -#define scoped_list2(x, y) scoped_cons (x, scoped_cons (y, Qnil)) -#define scoped_list3(x, y, z) \ - scoped_cons (x, scoped_cons (y, scoped_cons (z, Qnil))) - -/* True if Lisp_Object may be placed at P. Used only - under ENABLE_CHECKING and optimized away otherwise. */ - -INLINE bool -pointer_valid_for_lisp_object (void *p) -{ - uintptr_t v = (uintptr_t) p; - return !(USE_LSB_TAG ? (v & ~VALMASK) : v >> VALBITS); -} - -/* Helper function for build_local_vector, see below. */ - -INLINE Lisp_Object -local_vector_init (uintptr_t addr, ptrdiff_t length, Lisp_Object init) -{ - ptrdiff_t i; - struct Lisp_Vector *v = (struct Lisp_Vector *) addr; - - eassert (pointer_valid_for_lisp_object (v)); - v->header.size = length; - for (i = 0; i < length; i++) - v->contents[i] = init; - return make_lisp_ptr (v, Lisp_Vectorlike); -} - -/* If size permits, create temporary function-scoped vector OBJ of - length SIZE, with each element being INIT. Otherwise create - regular GC-managed vector. */ - -#define build_local_vector(obj, size, init) \ - (MAX_ALLOCA < (size) * word_size + header_size \ - ? obj = Fmake_vector (make_number (size), (init)) \ - : (obj = XIL ((uintptr_t) alloca \ - ((size) * word_size + header_size)), \ - obj = local_vector_init ((uintptr_t) XLI (obj), (size), (init)))) - -/* Helper function for make_local_string, see below. */ - -INLINE Lisp_Object -local_string_init (uintptr_t addr, const char *data, ptrdiff_t size) -{ - ptrdiff_t nchars, nbytes; - struct Lisp_String *s = (struct Lisp_String *) addr; - - eassert (pointer_valid_for_lisp_object (s)); - parse_str_as_multibyte ((const unsigned char *) data, - size, &nchars, &nbytes); - s->data = (unsigned char *) (addr + sizeof *s); - s->intervals = NULL; - memcpy (s->data, data, size); - s->data[size] = '\0'; - if (size == nchars || size != nbytes) - s->size = size, s->size_byte = -1; - else - s->size = nchars, s->size_byte = nbytes; - return make_lisp_ptr (s, Lisp_String); -} - -/* If size permits, create temporary function-scoped string OBJ - with contents DATA of length NBYTES. Otherwise create regular - GC-managed string. */ - -#define make_local_string(obj, data, nbytes) \ - (MAX_ALLOCA < (nbytes) + sizeof (struct Lisp_String) \ - ? obj = make_string ((data), (nbytes)) \ - : (obj = XIL ((uintptr_t) alloca \ - ((nbytes) + sizeof (struct Lisp_String))), \ - obj = local_string_init ((uintptr_t) XLI (obj), data, nbytes))) - -/* We want an interface similar to make_string and build_string, right? */ - -#define build_local_string(obj, data) \ - make_local_string (obj, data, strlen (data)) - -#else /* not USE_STACK_LISP_OBJECTS */ - -#define scoped_cons(x, y) Fcons ((x), (y)) -#define scoped_list1(x) list1 (x) -#define scoped_list2(x, y) list2 ((x), (y)) -#define scoped_list3(x, y, z) list3 ((x), (y), (z)) -#define build_local_vector(obj, size, init) \ - (obj = Fmake_vector (make_number ((size), (init)))) -#define make_local_string(obj, data, nbytes) \ - (obj = make_string ((data), (nbytes))) -#define build_local_string(obj, data) (obj = build_string (data)) - -#endif /* USE_STACK_LISP_OBJECTS */ +#if USE_STACK_LISP_OBJECTS +# define scoped_list1(x) scoped_cons (x, Qnil) +# define scoped_list2(x, y) scoped_cons (x, scoped_list1 (y)) +# define scoped_list3(x, y, z) scoped_cons (x, scoped_list2 (y, z)) +#else +# define scoped_list1(x) list1 (x) +# define scoped_list2(x, y) list2 (x, y) +# define scoped_list3(x, y, z) list3 (x, y, z) +#endif + +#if USE_STACK_LISP_OBJECTS && HAVE_STATEMENT_EXPRESSIONS && defined __COUNTER__ + +# define USE_LOCAL_ALLOCATORS + +/* Return a function-scoped vector of length SIZE, with each element + being INIT. */ + +# define make_local_vector(size, init) \ + make_local_vector_n (size, init, __COUNTER__) +# define make_local_vector_n(size_arg, init_arg, n) \ + ({ \ + ptrdiff_t size##n = size_arg; \ + Lisp_Object init##n = init_arg; \ + Lisp_Object vec##n; \ + if (size##n <= (MAX_ALLOCA - header_size) / word_size) \ + { \ + void *ptr##n = alloca (size##n * word_size + header_size); \ + vec##n = local_vector_init (ptr##n, size##n, init##n); \ + } \ + else \ + vec##n = Fmake_vector (make_number (size##n), init##n); \ + vec##n; \ + }) + +/* Return a function-scoped string with contents DATA and length NBYTES. */ + +# define make_local_string(data, nbytes) \ + make_local_string (data, nbytes, __COUNTER__) +# define make_local_string_n(data_arg, nbytes_arg, n) \ + ({ \ + char const *data##n = data_arg; \ + ptrdiff_t nbytes##n = nbytes_arg; \ + Lisp_Object string##n; \ + if (nbytes##n <= MAX_ALLOCA - sizeof (struct Lisp_String) - 1) \ + { \ + struct Lisp_String *ptr##n \ + = alloca (sizeof (struct Lisp_String) + 1 + nbytes); \ + string##n = local_string_init (ptr##n, data##n, nbytes##n); \ + } \ + else \ + string##n = make_string (data##n, nbytes##n); \ + string##n; \ + }) + +/* Return a function-scoped string with contents DATA. */ + +# define build_local_string(data) build_local_string_n (data, __COUNTER__) +# define build_local_string_n(data_arg, n) \ + ({ \ + char const *data##n = data_arg; \ + make_local_string (data##n, strlen (data##n)); \ + }) + +#else + +/* Safer but slower implementations. */ +# define make_local_vector(size, init) Fmake_vector (make_number (size), init) +# define make_local_string(data, nbytes) make_string (data, nbytes) +# define build_local_string(data) build_string (data) +#endif + /* Loop over all tails of a list, checking for cycles. FIXME: Make tortoise and n internal declarations. ------------------------------------------------------------ revno: 117850 committer: Sam Steingold branch nick: trunk timestamp: Tue 2014-09-09 16:39:31 -0400 message: (sql-default-directory): Fix type annotation. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-09 15:08:08 +0000 +++ lisp/ChangeLog 2014-09-09 20:39:31 +0000 @@ -1,3 +1,7 @@ +2014-09-09 Sam Steingold + + * progmodes/sql.el (sql-default-directory): Fix type annotation. + 2014-09-09 Stefan Monnier * progmodes/cc-awk.el: Remove unneeded cc-bytecomp use. === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2014-09-08 13:57:19 +0000 +++ lisp/progmodes/sql.el 2014-09-09 20:39:31 +0000 @@ -285,7 +285,7 @@ (defcustom sql-default-directory nil "Default directory for SQL processes." :version "24.5" - :type 'string + :type '(choice (const nil) string) :group 'SQL :safe 'stringp) ------------------------------------------------------------ revno: 117849 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2014-09-09 11:08:08 -0400 message: * lisp/progmodes/cc-awk.el: Remove unneeded cc-bytecomp use. Change doc comments into docstrings. * lisp/Makefile.in: Remove cc-awk dependency. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-08 13:57:19 +0000 +++ lisp/ChangeLog 2014-09-09 15:08:08 +0000 @@ -1,3 +1,9 @@ +2014-09-09 Stefan Monnier + + * progmodes/cc-awk.el: Remove unneeded cc-bytecomp use. + Change doc comments into docstrings. + * Makefile.in: Remove cc-awk dependency. + 2014-09-08 Sam Steingold * progmodes/sql.el (sql-send-line-and-next): New command, === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2014-08-16 16:50:32 +0000 +++ lisp/Makefile.in 2014-09-09 15:08:08 +0000 @@ -495,7 +495,7 @@ # CC Mode uses a compile time macro system which causes a compile time # dependency in cc-*.elc files on the macros in other cc-*.el and the # version string in cc-defs.el. -$(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\ +$(lisp)/progmodes/cc-align.elc\ $(lisp)/progmodes/cc-cmds.elc $(lisp)/progmodes/cc-compat.elc\ $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\ $(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\ === modified file 'lisp/progmodes/cc-awk.el' --- lisp/progmodes/cc-awk.el 2014-02-10 01:34:22 +0000 +++ lisp/progmodes/cc-awk.el 2014-09-09 15:08:08 +0000 @@ -40,28 +40,8 @@ ;;; Code: -(eval-when-compile - (let ((load-path - (if (and (boundp 'byte-compile-dest-file) - (stringp byte-compile-dest-file)) - (cons (file-name-directory byte-compile-dest-file) load-path) - load-path))) - (load "cc-bytecomp" nil t))) - -(cc-require 'cc-defs) - -;; Silence the byte compiler. -(cc-bytecomp-defvar font-lock-mode) ; Checked with boundp before use. -(cc-bytecomp-defvar c-new-BEG) -(cc-bytecomp-defvar c-new-END) - -;; Some functions in cc-engine that are used below. There's a cyclic -;; dependency so it can't be required here. (Perhaps some functions -;; could be moved to cc-engine to avoid it.) -(cc-bytecomp-defun c-backward-token-1) -(cc-bytecomp-defun c-beginning-of-statement-1) -(cc-bytecomp-defun c-backward-sws) -(cc-bytecomp-defun c-forward-sws) +(require 'cc-defs) +(require 'cc-engine) (defvar awk-mode-syntax-table (let ((st (make-syntax-table))) @@ -95,111 +75,111 @@ ;; Emacs has in the past used \r to mark hidden lines in some fashion (and ;; maybe still does). -(defconst c-awk-esc-pair-re "\\\\\\(.\\|\n\\|\r\\|\\'\\)") -;; Matches any escaped (with \) character-pair, including an escaped newline. -(defconst c-awk-non-eol-esc-pair-re "\\\\\\(.\\|\\'\\)") -;; Matches any escaped (with \) character-pair, apart from an escaped newline. -(defconst c-awk-comment-without-nl "#.*") -;; Matches an AWK comment, not including the terminating NL (if any). Note -;; that the "enclosing" (elisp) regexp must ensure the # is real. -(defconst c-awk-nl-or-eob "\\(\n\\|\r\\|\\'\\)") -;; Matches a newline, or the end of buffer. +(defconst c-awk-esc-pair-re "\\\\\\(.\\|\n\\|\r\\|\\'\\)" + "Matches any escaped (with \) character-pair, including an escaped newline.") +(defconst c-awk-non-eol-esc-pair-re "\\\\\\(.\\|\\'\\)" + "Matches any escaped (with \) character-pair, apart from an escaped newline.") +(defconst c-awk-comment-without-nl "#.*" +"Matches an AWK comment, not including the terminating NL (if any). +Note that the \"enclosing\" (elisp) regexp must ensure the # is real.") +(defconst c-awk-nl-or-eob "\\(\n\\|\r\\|\\'\\)" + "Matches a newline, or the end of buffer.") ;; "Space" regular expressions. (eval-and-compile - (defconst c-awk-escaped-nl "\\\\[\n\r]")) -;; Matches an escaped newline. + (defconst c-awk-escaped-nl "\\\\[\n\r]" + "Matches an escaped newline.")) (eval-and-compile - (defconst c-awk-escaped-nls* (concat "\\(" c-awk-escaped-nl "\\)*"))) -;; Matches a possibly empty sequence of escaped newlines. Used in -;; awk-font-lock-keywords. + (defconst c-awk-escaped-nls* (concat "\\(" c-awk-escaped-nl "\\)*") + "Matches a possibly empty sequence of escaped newlines. +Used in `awk-font-lock-keywords'.")) ;; (defconst c-awk-escaped-nls*-with-space* ;; (concat "\\(" c-awk-escaped-nls* "\\|" "[ \t]+" "\\)*")) ;; The above RE was very slow. It's runtime was doubling with each additional ;; space :-( Reformulate it as below: (eval-and-compile (defconst c-awk-escaped-nls*-with-space* - (concat "\\(" c-awk-escaped-nl "\\|" "[ \t]" "\\)*"))) -;; Matches a possibly empty sequence of escaped newlines with optional -;; interspersed spaces and tabs. Used in awk-font-lock-keywords. + (concat "\\(" c-awk-escaped-nl "\\|" "[ \t]" "\\)*") + "Matches a possibly empty sequence of escaped newlines with optional +interspersed spaces and tabs. Used in `awk-font-lock-keywords'.")) (defconst c-awk-blank-or-comment-line-re - (concat "[ \t]*\\(#\\|\\\\?$\\)")) -;; Matche (the tail of) a line containing at most either a comment or an -;; escaped EOL. + (concat "[ \t]*\\(#\\|\\\\?$\\)") + "Match (the tail of) a line containing at most either a comment or an +escaped EOL.") ;; REGEXPS FOR "HARMLESS" STRINGS/LINES. -(defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)") -;; Matches an underline NOT followed by ". -(defconst c-awk-harmless-char-re "[^_#/\"{}();\\\\\n\r]") -;; Matches any character not significant in the state machine applying -;; syntax-table properties to "s and /s. +(defconst c-awk-harmless-_ "_\\([^\"]\\|\\'\\)" + "Matches an underline NOT followed by \".") +(defconst c-awk-harmless-char-re "[^_#/\"{}();\\\\\n\r]" + "Matches any character not significant in the state machine applying +syntax-table properties to \"s and /s.") (defconst c-awk-harmless-string*-re - (concat "\\(" c-awk-harmless-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*")) -;; Matches a (possibly empty) sequence of characters insignificant in the -;; state machine applying syntax-table properties to "s and /s. + (concat "\\(" c-awk-harmless-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*") + "Matches a (possibly empty) sequence of characters insignificant in the +state machine applying syntax-table properties to \"s and /s.") (defconst c-awk-harmless-string*-here-re - (concat "\\=" c-awk-harmless-string*-re)) -;; Matches the (possibly empty) sequence of "insignificant" chars at point. + (concat "\\=" c-awk-harmless-string*-re) +"Matches the (possibly empty) sequence of \"insignificant\" chars at point.") -(defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]") -;; Matches any character but a _, #, /, ", \, or newline. N.B. _" starts a -;; localization string in gawk 3.1 +(defconst c-awk-harmless-line-char-re "[^_#/\"\\\\\n\r]" + "Matches any character but a _, #, /, \", \\, or newline. N.B. _\" starts a +localization string in gawk 3.1.") (defconst c-awk-harmless-line-string*-re - (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*")) -;; Matches a (possibly empty) sequence of chars without unescaped /, ", \, -;; #, or newlines. + (concat "\\(" c-awk-harmless-line-char-re "\\|" c-awk-esc-pair-re "\\|" c-awk-harmless-_ "\\)*") + "Matches a (possibly empty) sequence of chars without unescaped /, \", \\, +#, or newlines.") (defconst c-awk-harmless-line-re (concat c-awk-harmless-line-string*-re - "\\(" c-awk-comment-without-nl "\\)?" c-awk-nl-or-eob)) -;; Matches (the tail of) an AWK \"logical\" line not containing an unescaped -;; " or /. "logical" means "possibly containing escaped newlines". A comment -;; is matched as part of the line even if it contains a " or a /. The End of -;; buffer is also an end of line. + "\\(" c-awk-comment-without-nl "\\)?" c-awk-nl-or-eob) + "Matches (the tail of) an AWK \"logical\" line not containing an unescaped +\" or /. \"logical\" means \"possibly containing escaped newlines\". A comment +is matched as part of the line even if it contains a \" or a /. The End of +buffer is also an end of line.") (defconst c-awk-harmless-lines+-here-re - (concat "\\=\\(" c-awk-harmless-line-re "\\)+")) -;; Matches a sequence of (at least one) \"harmless-line\" at point. + (concat "\\=\\(" c-awk-harmless-line-re "\\)+") + "Matches a sequence of (at least one) \"harmless-line\" at point.") ;; REGEXPS FOR AWK STRINGS. -(defconst c-awk-string-ch-re "[^\"\\\n\r]") -;; Matches any character which can appear unescaped in a string. +(defconst c-awk-string-ch-re "[^\"\\\n\r]" + "Matches any character which can appear unescaped in a string.") (defconst c-awk-string-innards-re - (concat "\\(" c-awk-string-ch-re "\\|" c-awk-esc-pair-re "\\)*")) -;; Matches the inside of an AWK string (i.e. without the enclosing quotes). + (concat "\\(" c-awk-string-ch-re "\\|" c-awk-esc-pair-re "\\)*") + "Matches the inside of an AWK string (i.e. without the enclosing quotes).") (defconst c-awk-string-without-end-here-re - (concat "\\=_?\"" c-awk-string-innards-re)) -;; Matches an AWK string at point up to, but not including, any terminator. -;; A gawk 3.1+ string may look like _"localizable string". + (concat "\\=_?\"" c-awk-string-innards-re) + "Matches an AWK string at point up to, but not including, any terminator. +A gawk 3.1+ string may look like _\"localizable string\".") (defconst c-awk-possibly-open-string-re (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-esc-pair-re "\\)*" "\\(\"\\|$\\|\\'\\)")) ;; REGEXPS FOR AWK REGEXPS. -(defconst c-awk-regexp-normal-re "[^[/\\\n\r]") -;; Matches any AWK regexp character which doesn't require special analysis. -(defconst c-awk-escaped-newlines*-re "\\(\\\\[\n\r]\\)*") -;; Matches a (possibly empty) sequence of escaped newlines. +(defconst c-awk-regexp-normal-re "[^[/\\\n\r]" + "Matches any AWK regexp character which doesn't require special analysis.") +(defconst c-awk-escaped-newlines*-re "\\(\\\\[\n\r]\\)*" + "Matches a (possibly empty) sequence of escaped newlines.") ;; NOTE: In what follows, "[asdf]" in a regexp will be called a "character ;; list", and "[:alpha:]" inside a character list will be known as a ;; "character class". These terms for these things vary between regexp ;; descriptions . (defconst c-awk-regexp-char-class-re - "\\[:[a-z]+:\\]") - ;; Matches a character class spec (e.g. [:alpha:]). + "\\[:[a-z]+:\\]" + "Matches a character class spec (e.g. [:alpha:]).") (defconst c-awk-regexp-char-list-re (concat "\\[" c-awk-escaped-newlines*-re "^?" c-awk-escaped-newlines*-re "]?" "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-class-re - "\\|" "[^]\n\r]" "\\)*" "\\(]\\|$\\)")) -;; Matches a regexp char list, up to (but not including) EOL if the ] is -;; missing. + "\\|" "[^]\n\r]" "\\)*" "\\(]\\|$\\)") + "Matches a regexp char list, up to (but not including) EOL if the ] is +missing.") (defconst c-awk-regexp-innards-re (concat "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-list-re - "\\|" c-awk-regexp-normal-re "\\)*")) -;; Matches the inside of an AWK regexp (i.e. without the enclosing /s) + "\\|" c-awk-regexp-normal-re "\\)*") + "Matches the inside of an AWK regexp (i.e. without the enclosing /s)") (defconst c-awk-regexp-without-end-re - (concat "/" c-awk-regexp-innards-re)) -;; Matches an AWK regexp up to, but not including, any terminating /. + (concat "/" c-awk-regexp-innards-re) + "Matches an AWK regexp up to, but not including, any terminating /.") ;; REGEXPS used for scanning an AWK buffer in order to decide IF A '/' IS A ;; REGEXP OPENER OR A DIVISION SIGN. By "state" in the following is meant @@ -207,47 +187,47 @@ ;; division sign. (defconst c-awk-neutral-re ; "\\([{}@` \t]\\|\\+\\+\\|--\\|\\\\.\\)+") ; changed, 2003/6/7 - "\\([}@` \t]\\|\\+\\+\\|--\\|\\\\\\(.\\|[\n\r]\\)\\)") -;; A "neutral" char(pair). Doesn't change the "state" of a subsequent /. -;; This is space/tab, close brace, an auto-increment/decrement operator or an -;; escaped character. Or one of the (invalid) characters @ or `. But NOT an -;; end of line (unless escaped). + "\\([}@` \t]\\|\\+\\+\\|--\\|\\\\\\(.\\|[\n\r]\\)\\)" + "A \"neutral\" char(pair). Doesn't change the \"state\" of a subsequent /. +This is space/tab, close brace, an auto-increment/decrement operator or an +escaped character. Or one of the (invalid) characters @ or `. But NOT an +end of line (unless escaped).") (defconst c-awk-neutrals*-re - (concat "\\(" c-awk-neutral-re "\\)*")) -;; A (possibly empty) string of neutral characters (or character pairs). -(defconst c-awk-var-num-ket-re "[]\)0-9a-zA-Z_$.\x80-\xff]+") -;; Matches a char which is a constituent of a variable or number, or a ket -;; (i.e. closing bracKET), round or square. Assume that all characters \x80 to -;; \xff are "letters". + (concat "\\(" c-awk-neutral-re "\\)*") + "A (possibly empty) string of neutral characters (or character pairs).") +(defconst c-awk-var-num-ket-re "[]\)0-9a-zA-Z_$.\x80-\xff]+" + "Matches a char which is a constituent of a variable or number, or a ket +\(i.e. closing bracKET), round or square. Assume that all characters \\x80 to +\\xff are \"letters\".") (defconst c-awk-div-sign-re - (concat c-awk-var-num-ket-re c-awk-neutrals*-re "/")) -;; Will match a piece of AWK buffer ending in / which is a division sign, in -;; a context where an immediate / would be a regexp bracket. It follows a -;; variable or number (with optional intervening "neutral" characters). This -;; will only work when there won't be a preceding " or / before the sought / -;; to foul things up. + (concat c-awk-var-num-ket-re c-awk-neutrals*-re "/") + "Will match a piece of AWK buffer ending in / which is a division sign, in +a context where an immediate / would be a regexp bracket. It follows a +variable or number (with optional intervening \"neutral\" characters). This +will only work when there won't be a preceding \" or / before the sought / +to foul things up.") (defconst c-awk-non-arith-op-bra-re - "[[\({&=:!><,?;'~|]") -;; Matches an opening BRAcket (of any sort), or any operator character -;; apart from +,-,/,*,%. For the purpose at hand (detecting a / which is a -;; regexp bracket) these arith ops are unnecessary and a pain, because of "++" -;; and "--". + "[[\({&=:!><,?;'~|]" + "Matches an opening BRAcket (of any sort), or any operator character +apart from +,-,/,*,%. For the purpose at hand (detecting a / which is a +regexp bracket) these arith ops are unnecessary and a pain, because of \"++\" +and \"--\".") (defconst c-awk-regexp-sign-re - (concat c-awk-non-arith-op-bra-re c-awk-neutrals*-re "/")) -;; Will match a piece of AWK buffer ending in / which is an opening regexp -;; bracket, in a context where an immediate / would be a division sign. This -;; will only work when there won't be a preceding " or / before the sought / -;; to foul things up. + (concat c-awk-non-arith-op-bra-re c-awk-neutrals*-re "/") + "Will match a piece of AWK buffer ending in / which is an opening regexp +bracket, in a context where an immediate / would be a division sign. This +will only work when there won't be a preceding \" or / before the sought / +to foul things up.") (defconst c-awk-pre-exp-alphanum-kwd-re (concat "\\(^\\|\\=\\|[^_\n\r]\\)\\<" (regexp-opt '("print" "return" "case") t) - "\\>\\([^_\n\r]\\|$\\)")) -;; Matches all AWK keywords which can precede expressions (including -;; /regexp/). + "\\>\\([^_\n\r]\\|$\\)") + "Matches all AWK keywords which can precede expressions (including +/regexp/).") (defconst c-awk-kwd-regexp-sign-re - (concat c-awk-pre-exp-alphanum-kwd-re c-awk-escaped-nls*-with-space* "/")) -;; Matches a piece of AWK buffer ending in /, where is a keyword -;; which can precede an expression. + (concat c-awk-pre-exp-alphanum-kwd-re c-awk-escaped-nls*-with-space* "/") + "Matches a piece of AWK buffer ending in /, where is a keyword +which can precede an expression.") ;; REGEXPS USED FOR FINDING THE POSITION OF A "virtual semicolon" (defconst c-awk-_-harmless-nonws-char-re "[^#/\"\\\\\n\r \t]") @@ -259,16 +239,16 @@ c-awk-possibly-open-string-re "\\)" "\\)*")) -(defconst c-awk-space*-/-re (concat c-awk-escaped-nls*-with-space* "/")) -;; Matches optional whitespace followed by "/". +(defconst c-awk-space*-/-re (concat c-awk-escaped-nls*-with-space* "/") + "Matches optional whitespace followed by \"/\".") (defconst c-awk-space*-regexp-/-re - (concat c-awk-escaped-nls*-with-space* "\\s\"")) -;; Matches optional whitespace followed by a "/" with string syntax (a matched -;; regexp delimiter). + (concat c-awk-escaped-nls*-with-space* "\\s\"") + "Matches optional whitespace followed by a \"/\" with string syntax (a matched +regexp delimiter).") (defconst c-awk-space*-unclosed-regexp-/-re - (concat c-awk-escaped-nls*-with-space* "\\s\|")) -;; Matches optional whitespace followed by a "/" with string fence syntax (an -;; unmatched regexp delimiter). + (concat c-awk-escaped-nls*-with-space* "\\s\|") + "Matches optional whitespace followed by a \"/\" with string fence syntax (an +unmatched regexp delimiter).") ;; ACM, 2002/5/29: @@ -323,16 +303,16 @@ ;; statement of a do-while. (defun c-awk-after-if-for-while-condition-p (&optional do-lim) - ;; Are we just after the ) in "if/for/while ()"? - ;; - ;; Note that the end of the ) in a do .... while () doesn't - ;; count, since the purpose of this routine is essentially to decide - ;; whether to indent the next line. - ;; - ;; DO-LIM sets a limit on how far back we search for the "do" of a possible - ;; do-while. - ;; - ;; This function might do hidden buffer changes. + "Are we just after the ) in \"if/for/while ()\"? + +Note that the end of the ) in a do .... while () doesn't +count, since the purpose of this routine is essentially to decide +whether to indent the next line. + +DO-LIM sets a limit on how far back we search for the \"do\" of a possible +do-while. + +This function might do hidden buffer changes." (and (eq (char-before) ?\)) (save-excursion @@ -346,9 +326,9 @@ 'beginning))))))))) (defun c-awk-after-function-decl-param-list () - ;; Are we just after the ) in "function foo (bar)" ? - ;; - ;; This function might do hidden buffer changes. + "Are we just after the ) in \"function foo (bar)\" ? + +This function might do hidden buffer changes." (and (eq (char-before) ?\)) (save-excursion (let ((par-pos (c-safe (scan-lists (point) -1 0)))) @@ -361,10 +341,10 @@ ;; 2002/11/8: FIXME! Check c-backward-token-1/2 for success (0 return code). (defun c-awk-after-continue-token () -;; Are we just after a token which can be continued onto the next line without -;; a backslash? -;; -;; This function might do hidden buffer changes. + "Are we just after a token which can be continued onto the next line without +a backslash? + +This function might do hidden buffer changes." (save-excursion (c-backward-token-1) ; FIXME 2002/10/27. What if this fails? (if (and (looking-at "[&|]") (not (bobp))) @@ -372,10 +352,10 @@ (looking-at "[,{?:]\\|&&\\|||\\|do\\>\\|else\\>"))) (defun c-awk-after-rbrace-or-statement-semicolon () - ;; Are we just after a } or a ; which closes a statement? - ;; Be careful about ;s in for loop control bits. They don't count! - ;; - ;; This function might do hidden buffer changes. + "Are we just after a } or a ; which closes a statement? +Be careful about ;s in for loop control bits. They don't count! + +This function might do hidden buffer changes." (or (eq (char-before) ?\}) (and (eq (char-before) ?\;) @@ -388,22 +368,22 @@ (looking-at "for\\>"))))))))) (defun c-awk-back-to-contentful-text-or-NL-prop () - ;; Move back to just after the first found of either (i) an EOL which has - ;; the c-awk-NL-prop text-property set; or (ii) non-ws text; or (iii) BOB. - ;; We return either the value of c-awk-NL-prop (in case (i)) or nil. - ;; Calling functions can best distinguish cases (ii) and (iii) with (bolp). - ;; - ;; Note that an escaped eol counts as whitespace here. - ;; - ;; Kludge: If c-backward-syntactic-ws gets stuck at a BOL, it is likely - ;; that the previous line contains an unterminated string (without \). In - ;; this case, assume that the previous line's c-awk-NL-prop is a $. - ;; - ;; POINT MUST BE AT THE START OF A LINE when calling this function. This - ;; is to ensure that the various backward-comment functions will work - ;; properly. - ;; - ;; This function might do hidden buffer changes. + "Move back to just after the first found of either (i) an EOL which has +the `c-awk-NL-prop' text-property set; or (ii) non-ws text; or (iii) BOB. +We return either the value of `c-awk-NL-prop' (in case (i)) or nil. +Calling functions can best distinguish cases (ii) and (iii) with `bolp'. + +Note that an escaped eol counts as whitespace here. + +Kludge: If `c-backward-syntactic-ws' gets stuck at a BOL, it is likely +that the previous line contains an unterminated string (without \\). In +this case, assume that the previous line's `c-awk-NL-prop' is a $. + +POINT MUST BE AT THE START OF A LINE when calling this function. This +is to ensure that the various backward-comment functions will work +properly. + +This function might do hidden buffer changes." (let ((nl-prop nil) bol-pos bsws-pos) ; starting pos for a backward-syntactic-ws call. (while ;; We are at a BOL here. Go back one line each iteration. @@ -438,19 +418,19 @@ nl-prop)) (defun c-awk-calculate-NL-prop-prev-line (&optional do-lim) - ;; Calculate and set the value of the c-awk-NL-prop on the immediately - ;; preceding EOL. This may also involve doing the same for several - ;; preceding EOLs. - ;; - ;; NOTE that if the property was already set, we return it without - ;; recalculation. (This is by accident rather than design.) - ;; - ;; Return the property which got set (or was already set) on the previous - ;; line. Return nil if we hit BOB. - ;; - ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. - ;; - ;; This function might do hidden buffer changes. + "Calculate and set the value of the `c-awk-NL-prop' on the immediately +preceding EOL. This may also involve doing the same for several +preceding EOLs. + +NOTE that if the property was already set, we return it without +recalculation. (This is by accident rather than design.) + +Return the property which got set (or was already set) on the previous +line. Return nil if we hit BOB. + +See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. + +This function might do hidden buffer changes." (save-excursion (save-match-data (beginning-of-line) @@ -493,25 +473,25 @@ nl-prop)))) (defun c-awk-get-NL-prop-prev-line (&optional do-lim) - ;; Get the c-awk-NL-prop text-property from the previous line, calculating - ;; it if necessary. Return nil if we're already at BOB. - ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. - ;; - ;; This function might do hidden buffer changes. + "Get the `c-awk-NL-prop' text-property from the previous line, calculating +it if necessary. Return nil if we're already at BOB. +See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. + +This function might do hidden buffer changes." (if (bobp) nil (or (c-get-char-property (c-point 'eopl) 'c-awk-NL-prop) (c-awk-calculate-NL-prop-prev-line do-lim)))) (defun c-awk-get-NL-prop-cur-line (&optional do-lim) - ;; Get the c-awk-NL-prop text-property from the current line, calculating it - ;; if necessary. (As a special case, the property doesn't get set on an - ;; empty line at EOB (there's no position to set the property on), but the - ;; function returns the property value an EOL would have got.) - ;; - ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. - ;; - ;; This function might do hidden buffer changes. + "Get the `c-awk-NL-prop' text-property from the current line, calculating it +if necessary. (As a special case, the property doesn't get set on an +empty line at EOB (there's no position to set the property on), but the +function returns the property value an EOL would have got.) + +See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. + +This function might do hidden buffer changes." (save-excursion (let ((extra-nl nil)) (end-of-line) ; Necessary for the following test to work. @@ -522,17 +502,17 @@ (if extra-nl (delete-char -1)))))) (defsubst c-awk-prev-line-incomplete-p (&optional do-lim) - ;; Is there an incomplete statement at the end of the previous line? - ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. - ;; - ;; This function might do hidden buffer changes. + "Is there an incomplete statement at the end of the previous line? +See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. + +This function might do hidden buffer changes." (memq (c-awk-get-NL-prop-prev-line do-lim) '(?\\ ?\{))) (defsubst c-awk-cur-line-incomplete-p (&optional do-lim) - ;; Is there an incomplete statement at the end of the current line? - ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. - ;; - ;; This function might do hidden buffer changes. + "Is there an incomplete statement at the end of the current line? +See `c-awk-after-if-for-while-condition-p' for a description of DO-LIM. + +This function might do hidden buffer changes." (memq (c-awk-get-NL-prop-cur-line do-lim) '(?\\ ?\{))) ;; NOTES ON "VIRTUAL SEMICOLONS" @@ -545,7 +525,7 @@ ;; never counts as a virtual one. (defun c-awk-at-vsemi-p (&optional pos) - ;; Is there a virtual semicolon at POS (or POINT)? + "Is there a virtual semicolon at POS (or POINT)?" (save-excursion (let* (nl-prop (pos-or-point (progn (if pos (goto-char pos)) (point))) @@ -585,29 +565,29 @@ (eq nl-prop ?\$)))))) (defun c-awk-vsemi-status-unknown-p () - ;; Are we unsure whether there is a virtual semicolon on the current line? - ;; DO NOT under any circumstances attempt to calculate this; that would - ;; defeat the (admittedly kludgy) purpose of this function, which is to - ;; prevent an infinite recursion in c-beginning-of-statement-1 when point - ;; starts at a `while' token. + "Are we unsure whether there is a virtual semicolon on the current line? +DO NOT under any circumstances attempt to calculate this; that would +defeat the (admittedly kludgy) purpose of this function, which is to +prevent an infinite recursion in `c-beginning-of-statement-1' when point +starts at a `while' token." (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) (defun c-awk-clear-NL-props (beg end) - ;; This function is run from before-change-hooks. It clears the - ;; c-awk-NL-prop text property from beg to the end of the buffer (The END - ;; parameter is ignored). This ensures that the indentation engine will - ;; never use stale values for this property. - ;; - ;; This function might do hidden buffer changes. + "This function is run from `before-change-hooks.' It clears the +`c-awk-NL-prop' text property from beg to the end of the buffer (The END +parameter is ignored). This ensures that the indentation engine will +never use stale values for this property. + +This function might do hidden buffer changes." (save-restriction (widen) (c-clear-char-properties beg (point-max) 'c-awk-NL-prop))) (defun c-awk-unstick-NL-prop () - ;; Ensure that the text property c-awk-NL-prop is "non-sticky". Without - ;; this, a new newline inserted after an old newline (e.g. by C-j) would - ;; inherit any c-awk-NL-prop from the old newline. This would be a Bad - ;; Thing. This function's action is required by c-put-char-property. + "Ensure that the text property `c-awk-NL-prop' is \"non-sticky\". +Without this, a new newline inserted after an old newline (e.g. by C-j) would +inherit any `c-awk-NL-prop' from the old newline. This would be a Bad +Thing. This function's action is required by `c-put-char-property'." (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in XEmacs (not (assoc 'c-awk-NL-prop text-property-default-nonsticky))) (setq text-property-default-nonsticky @@ -650,15 +630,15 @@ ;; to allow this. (defun c-awk-beginning-of-logical-line (&optional pos) -;; Go back to the start of the (apparent) current line (or the start of the -;; line containing POS), returning the buffer position of that point. I.e., -;; go back to the last line which doesn't have an escaped EOL before it. -;; -;; This is guaranteed to be "safe" for syntactic analysis, i.e. outwith any -;; comment, string or regexp. IT MAY WELL BE that this function should not be -;; executed on a narrowed buffer. -;; -;; This function might do hidden buffer changes. + "Go back to the start of the (apparent) current line (or the start of the +line containing POS), returning the buffer position of that point. I.e., +go back to the last line which doesn't have an escaped EOL before it. + +This is guaranteed to be \"safe\" for syntactic analysis, i.e. outwith any +comment, string or regexp. IT MAY WELL BE that this function should not be +executed on a narrowed buffer. + +This function might do hidden buffer changes." (if pos (goto-char pos)) (forward-line 0) (while (and (> (point) (point-min)) @@ -667,15 +647,15 @@ (point)) (defun c-awk-beyond-logical-line (&optional pos) -;; Return the position just beyond the (apparent) current logical line, or the -;; one containing POS. This is usually the beginning of the next line which -;; doesn't follow an escaped EOL. At EOB, this will be EOB. -;; -;; Point is unchanged. -;; -;; This is guaranteed to be "safe" for syntactic analysis, i.e. outwith any -;; comment, string or regexp. IT MAY WELL BE that this function should not be -;; executed on a narrowed buffer. + "Return the position just beyond the (apparent) current logical line, or the +one containing POS. This is usually the beginning of the next line which +doesn't follow an escaped EOL. At EOB, this will be EOB. + +Point is unchanged. + +This is guaranteed to be \"safe\" for syntactic analysis, i.e. outwith any +comment, string or regexp. IT MAY WELL BE that this function should not be +executed on a narrowed buffer." (save-excursion (if pos (goto-char pos)) (end-of-line) @@ -693,19 +673,19 @@ ;; or comment. (defun c-awk-set-string-regexp-syntax-table-properties (beg end) -;; BEG and END bracket a (possibly unterminated) string or regexp. The -;; opening delimiter is after BEG, and the closing delimiter, IF ANY, is AFTER -;; END. Set the appropriate syntax-table properties on the delimiters and -;; contents of this string/regex. -;; -;; "String" here can also mean a gawk 3.1 "localizable" string which starts -;; with _". In this case, we step over the _ and ignore it; It will get it's -;; font from an entry in awk-font-lock-keywords. -;; -;; If the closing delimiter is missing (i.e., there is an EOL there) set the -;; STRING-FENCE property on the opening " or / and closing EOL. -;; -;; This function does hidden buffer changes. + "BEG and END bracket a (possibly unterminated) string or regexp. The +opening delimiter is after BEG, and the closing delimiter, IF ANY, is AFTER +END. Set the appropriate syntax-table properties on the delimiters and +contents of this string/regex. + +\"String\" here can also mean a gawk 3.1 \"localizable\" string which starts +with _\". In this case, we step over the _ and ignore it; It will get it's +font from an entry in `awk-font-lock-keywords'. + +If the closing delimiter is missing (i.e., there is an EOL there) set the +STRING-FENCE property on the opening \" or / and closing EOL. + +This function does hidden buffer changes." (if (eq (char-after beg) ?_) (setq beg (1+ beg))) ;; First put the properties on the delimiters. @@ -726,13 +706,13 @@ (c-put-char-property (1- (point)) 'syntax-table '(1)))))) (defun c-awk-syntax-tablify-string () - ;; Point is at the opening " or _" of a string. Set the syntax-table - ;; properties on this string, leaving point just after the string. - ;; - ;; The result is nil if a / immediately after the string would be a regexp - ;; opener, t if it would be a division sign. - ;; - ;; This function does hidden buffer changes. + "Point is at the opening \" or _\" of a string. Set the syntax-table +properties on this string, leaving point just after the string. + +The result is nil if a / immediately after the string would be a regexp +opener, t if it would be a division sign. + +This function does hidden buffer changes." (search-forward-regexp c-awk-string-without-end-here-re nil t) ; a (possibly unterminated) string (c-awk-set-string-regexp-syntax-table-properties (match-beginning 0) (match-end 0)) @@ -745,19 +725,19 @@ (t nil))) ; Unterminated string at EOB (defun c-awk-syntax-tablify-/ (anchor anchor-state-/div) - ;; Point is at a /. Determine whether this is a division sign or a regexp - ;; opener, and if the latter, apply syntax-table properties to the entire - ;; regexp. Point is left immediately after the division sign or regexp, as - ;; the case may be. - ;; - ;; ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a - ;; division sign (value t) or a regexp opener (value nil). The idea is that - ;; we analyze the line from ANCHOR up till point to determine what the / at - ;; point is. - ;; - ;; The result is what ANCHOR-STATE-/DIV (see above) is where point is left. - ;; - ;; This function does hidden buffer changes. + "Point is at a /. Determine whether this is a division sign or a regexp +opener, and if the latter, apply syntax-table properties to the entire +regexp. Point is left immediately after the division sign or regexp, as +the case may be. + +ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a +division sign (value t) or a regexp opener (value nil). The idea is that +we analyze the line from ANCHOR up till point to determine what the / at +point is. + +The result is what ANCHOR-STATE-/DIV (see above) is where point is left. + +This function does hidden buffer changes." (let ((/point (point))) (goto-char anchor) ;; Analyze the line to find out what the / is. @@ -782,30 +762,30 @@ (t nil))))) ; Unterminated regexp at EOB (defun c-awk-set-syntax-table-properties (lim) -;; Scan the buffer text between point and LIM, setting (and clearing) the -;; syntax-table property where necessary. -;; -;; This function is designed to be called as the FUNCTION in a MATCHER in -;; font-lock-syntactic-keywords, and it always returns NIL (to inhibit -;; repeated calls from font-lock: See elisp info page "Search-based -;; Fontification"). It also gets called, with a bit of glue, from -;; after-change-functions when font-lock isn't active. Point is left -;; "undefined" after this function exits. THE BUFFER SHOULD HAVE BEEN -;; WIDENED, AND ANY PRECIOUS MATCH-DATA SAVED BEFORE CALLING THIS ROUTINE. -;; -;; We need to set/clear the syntax-table property on: -;; (i) / - It is set to "string" on a / which is the opening or closing -;; delimiter of the properly terminated regexp (and left unset on a -;; division sign). -;; (ii) the opener of an unterminated string/regexp, we set the property -;; "generic string delimiter" on both the opening " or / and the end of the -;; line where the closing delimiter is missing. -;; (iii) "s inside strings/regexps (these will all be escaped "s). They are -;; given the property "punctuation". This will later allow other routines -;; to use the regexp "\\S\"*" to skip over the string innards. -;; (iv) Inside a comment, all syntax-table properties are cleared. -;; -;; This function does hidden buffer changes. + "Scan the buffer text between point and LIM, setting (and clearing) the +syntax-table property where necessary. + +This function is designed to be called as the FUNCTION in a MATCHER in +font-lock-syntactic-keywords, and it always returns NIL (to inhibit +repeated calls from font-lock: See elisp info page \"Search-based +Fontification\"). It also gets called, with a bit of glue, from +after-change-functions when font-lock isn't active. Point is left +\"undefined\" after this function exits. THE BUFFER SHOULD HAVE BEEN +WIDENED, AND ANY PRECIOUS MATCH-DATA SAVED BEFORE CALLING THIS ROUTINE. + +We need to set/clear the syntax-table property on: +\(i) / - It is set to \"string\" on a / which is the opening or closing + delimiter of the properly terminated regexp (and left unset on a + division sign). +\(ii) the opener of an unterminated string/regexp, we set the property + \"generic string delimiter\" on both the opening \" or / and the end of the + line where the closing delimiter is missing. +\(iii) \"s inside strings/regexps (these will all be escaped \"s). They are + given the property \"punctuation\". This will later allow other routines + to use the regexp \"\\\\S\\\"*\" to skip over the string innards. +\(iv) Inside a comment, all syntax-table properties are cleared. + +This function does hidden buffer changes." (let (anchor (anchor-state-/div nil)) ; t means a following / would be a div sign. (c-awk-beginning-of-logical-line) ; ACM 2002/7/21. This is probably redundant. @@ -845,26 +825,26 @@ ;; Set in c-awk-record-region-clear-NL and used in c-awk-after-change. (defun c-awk-record-region-clear-NL (beg end) -;; This function is called exclusively from the before-change-functions hook. -;; It does two things: Finds the end of the (logical) line on which END lies, -;; and clears c-awk-NL-prop text properties from this point onwards. BEG is -;; ignored. -;; -;; On entry, the buffer will have been widened and match-data will have been -;; saved; point is undefined on both entry and exit; the return value is -;; ignored. -;; -;; This function does hidden buffer changes. + "This function is called exclusively from the `before-change-functions' hook. +It does two things: Finds the end of the (logical) line on which END lies, +and clears `c-awk-NL-prop' text properties from this point onwards. BEG is +ignored. + +On entry, the buffer will have been widened and match-data will have been +saved; point is undefined on both entry and exit; the return value is +ignored. + +This function does hidden buffer changes." (c-save-buffer-state () (setq c-awk-old-ByLL (c-awk-beyond-logical-line end)) (c-save-buffer-state nil (c-awk-clear-NL-props end (point-max))))) (defun c-awk-end-of-change-region (beg end old-len) - ;; Find the end of the region which needs to be font-locked after a change. - ;; This is the end of the logical line on which the change happened, either - ;; as it was before the change, or as it is now, whichever is later. - ;; N.B. point is left undefined. + "Find the end of the region which needs to be font-locked after a change. +This is the end of the logical line on which the change happened, either +as it was before the change, or as it is now, whichever is later. +N.B. point is left undefined." (max (+ (- c-awk-old-ByLL old-len) (- end beg)) (c-awk-beyond-logical-line end))) @@ -875,22 +855,25 @@ ;; Don't overlook the possibility of the buffer change being the "recapturing" ;; of a previously escaped newline. +(defvar c-new-BEG) +(defvar c-new-END) + ;; ACM 2008-02-05: (defun c-awk-extend-and-syntax-tablify-region (beg end old-len) - ;; Expand the region (BEG END) as needed to (c-new-BEG c-new-END) then put - ;; `syntax-table' properties on this region. - ;; - ;; This function is called from an after-change function, BEG END and - ;; OLD-LEN being the standard parameters. - ;; - ;; Point is undefined both before and after this function call, the buffer - ;; has been widened, and match-data saved. The return value is ignored. - ;; - ;; It prepares the buffer for font - ;; locking, hence must get called before `font-lock-after-change-function'. - ;; - ;; This function is the AWK value of `c-before-font-lock-function'. - ;; It does hidden buffer changes. + "Expand the region (BEG END) as needed to (c-new-BEG c-new-END) then put +`syntax-table' properties on this region. + +This function is called from an after-change function, BEG END and +OLD-LEN being the standard parameters. + +Point is undefined both before and after this function call, the buffer +has been widened, and match-data saved. The return value is ignored. + +It prepares the buffer for font +locking, hence must get called before `font-lock-after-change-function'. + +This function is the AWK value of `c-before-font-lock-function'. +It does hidden buffer changes." (c-save-buffer-state () (setq c-new-END (c-awk-end-of-change-region beg end old-len)) (setq c-new-BEG (c-awk-beginning-of-logical-line beg)) @@ -962,7 +945,8 @@ "match" "mktime" "or" "print" "printf" "rand" "rshift" "sin" "split" "sprintf" "sqrt" "srand" "stopme" "strftime" "strtonum" "sub" "substr" "system" - "systime" "tolower" "toupper" "xor") t) + "systime" "tolower" "toupper" "xor") + t) "\\>") 0 c-preprocessor-face-name)) @@ -993,21 +977,21 @@ ;; The following three regexps differ from those earlier on in cc-awk.el in ;; that they assume the syntax-table properties have been set. They are thus ;; not useful for code which sets these properties. -(defconst c-awk-terminated-regexp-or-string-here-re "\\=\\s\"\\S\"*\\s\"") -;; Matches a terminated string/regexp. +(defconst c-awk-terminated-regexp-or-string-here-re "\\=\\s\"\\S\"*\\s\"" + "Matches a terminated string/regexp.") -(defconst c-awk-unterminated-regexp-or-string-here-re "\\=\\s|\\S|*$") -;; Matches an unterminated string/regexp, NOT including the eol at the end. +(defconst c-awk-unterminated-regexp-or-string-here-re "\\=\\s|\\S|*$" + "Matches an unterminated string/regexp, NOT including the eol at the end.") (defconst c-awk-harmless-pattern-characters* - (concat "\\([^{;#/\"\\\\\n\r]\\|" c-awk-esc-pair-re "\\)*")) -;; Matches any "harmless" character in a pattern or an escaped character pair. + (concat "\\([^{;#/\"\\\\\n\r]\\|" c-awk-esc-pair-re "\\)*") + "Matches any \"harmless\" character in a pattern or an escaped character pair.") (defun c-awk-at-statement-end-p () - ;; Point is not inside a comment or string. Is it AT the end of a - ;; statement? This means immediately after the last non-ws character of the - ;; statement. The caller is responsible for widening the buffer, if - ;; appropriate. + "Point is not inside a comment or string. Is it AT the end of a +statement? This means immediately after the last non-ws character of the +statement. The caller is responsible for widening the buffer, if +appropriate." (and (not (bobp)) (save-excursion (backward-char) @@ -1057,13 +1041,13 @@ (eq arg 0))))) (defun c-awk-forward-awk-pattern () - ;; Point is at the start of an AWK pattern (which may be null) or function - ;; declaration. Move to the pattern's end, and past any trailing space or - ;; comment. Typically, we stop at the { which denotes the corresponding AWK - ;; action/function body. Otherwise we stop at the EOL (or ;) marking the - ;; absence of an explicit action. - ;; - ;; This function might do hidden buffer changes. + "Point is at the start of an AWK pattern (which may be null) or function +declaration. Move to the pattern's end, and past any trailing space or +comment. Typically, we stop at the { which denotes the corresponding AWK +action/function body. Otherwise we stop at the EOL (or ;) marking the +absence of an explicit action. + +This function might do hidden buffer changes." (while (progn (search-forward-regexp c-awk-harmless-pattern-characters*) @@ -1080,9 +1064,9 @@ ((looking-at "/") (forward-char) t))))) ; division sign. (defun c-awk-end-of-defun1 () - ;; point is at the start of a "defun". Move to its end. Return end position. - ;; - ;; This function might do hidden buffer changes. + "Point is at the start of a \"defun\". Move to its end. Return end position. + +This function might do hidden buffer changes." (c-awk-forward-awk-pattern) (cond ((looking-at "{") (goto-char (scan-sexps (point) 1))) @@ -1092,10 +1076,10 @@ (point)) (defun c-awk-beginning-of-defun-p () - ;; Are we already at the beginning of a defun? (i.e. at code in column 0 - ;; which isn't a }, and isn't a continuation line of any sort. - ;; - ;; This function might do hidden buffer changes. + "Are we already at the beginning of a defun? (i.e. at code in column 0 +which isn't a }, and isn't a continuation line of any sort. + +This function might do hidden buffer changes." (and (looking-at "^[^#} \t\n\r]") (not (c-awk-prev-line-incomplete-p)))) @@ -1145,6 +1129,5 @@ (goto-char (min start-point end-point))))))) -(cc-provide 'cc-awk) ; Changed from 'awk-mode, ACM 2002/5/21 - -;;; awk-mode.el ends here +(provide 'cc-awk) +;;; cc-awk.el ends here ------------------------------------------------------------ revno: 117848 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2014-09-09 17:50:32 +0300 message: Fix the string-collation tests on MS-Windows. tests/automated/fns-tests.el (fns-tests-collate-sort): Bind w32-collate-ignore-punctuation to t when sorting according to UTS#10 rules. Reported by Fabrice Popineau . diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-09-07 08:24:44 +0000 +++ test/ChangeLog 2014-09-09 14:50:32 +0000 @@ -1,3 +1,9 @@ +2014-09-09 Eli Zaretskii + + * automated/fns-tests.el (fns-tests-collate-sort): Bind + w32-collate-ignore-punctuation to t when sorting according to + UTS#10 rules. + 2014-09-07 Michael Albinus * automated/fns-tests.el (fns-tests--collate-enabled-p): New function. === modified file 'test/automated/fns-tests.el' --- test/automated/fns-tests.el 2014-09-07 08:24:44 +0000 +++ test/automated/fns-tests.el 2014-09-09 14:50:32 +0000 @@ -169,8 +169,9 @@ (equal (sort '("11" "12" "1 1" "1 2" "1.1" "1.2") (lambda (a b) - (string-collate-lessp - a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))) + (let ((w32-collate-ignore-punctuation t)) + (string-collate-lessp + a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8"))))) '("11" "1 1" "1.1" "12" "1 2" "1.2"))) ;; Diacritics are different letters for POSIX, they sort lexicographical. @@ -184,6 +185,7 @@ (equal (sort '("Ævar" "Agustín" "Adrian" "Eli") (lambda (a b) - (string-collate-lessp - a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))) + (let ((w32-collate-ignore-punctuation t)) + (string-collate-lessp + a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8"))))) '("Adrian" "Ævar" "Agustín" "Eli")))) ------------------------------------------------------------ revno: 117847 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-09-09 15:43:22 +0400 message: Cleanup last change and make all new stuff conditional. * lisp.h (build_local_string): Rename to ... (make_local_string): ... this macro. (build_local_string, scoped_list1, scoped_list3): New macros. (toplevel) [USE_STACK_LISP_OBJECTS]: Define all new macros and functions as such, use regular fallbacks otherwise. * alloc.c (verify_alloca) [USE_STACK_LISP_OBJECTS]: Define conditionally. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-09 03:44:06 +0000 +++ src/ChangeLog 2014-09-09 11:43:22 +0000 @@ -17,6 +17,15 @@ * alloc.c (verify_alloca) [ENABLE_CHECKING]: New function. (init_alloc_once): Call it. + Cleanup last change and make all new stuff conditional. + * lisp.h (build_local_string): Rename to ... + (make_local_string): ... this macro. + (build_local_string, scoped_list1, scoped_list3): New macros. + (toplevel) [USE_STACK_LISP_OBJECTS]: Define all new macros + and functions as such, use regular fallbacks otherwise. + * alloc.c (verify_alloca) [USE_STACK_LISP_OBJECTS]: Define + conditionally. + 2014-09-08 Eli Zaretskii * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero, === modified file 'src/alloc.c' --- src/alloc.c 2014-09-09 03:44:06 +0000 +++ src/alloc.c 2014-09-09 11:43:22 +0000 @@ -7118,6 +7118,10 @@ terminate_due_to_signal (SIGABRT, INT_MAX); } +#endif /* ENABLE_CHECKING */ + +#if defined (ENABLE_CHECKING) && defined (USE_STACK_LISP_OBJECTS) + /* Stress alloca with inconveniently sized requests and check whether all allocated areas may be used for Lisp_Object. */ @@ -7134,11 +7138,11 @@ } } -#else /* not ENABLE_CHECKING */ +#else /* not (ENABLE_CHECKING && USE_STACK_LISP_OBJECTS) */ #define verify_alloca() ((void) 0) -#endif /* ENABLE_CHECKING */ +#endif /* ENABLE_CHECKING && USE_STACK_LISP_OBJECTS */ /* Initialization. */ === modified file 'src/lisp.h' --- src/lisp.h 2014-09-09 03:44:06 +0000 +++ src/lisp.h 2014-09-09 11:43:22 +0000 @@ -4546,6 +4546,12 @@ memory_full (SIZE_MAX); \ } while (false) +/* This feature is experimental and requires very careful debugging. + Brave user should compile with CPPFLAGS='-DUSE_STACK_LISP_OBJECTS' + to get into the game. */ + +#ifdef USE_STACK_LISP_OBJECTS + /* Use the following functions to allocate temporary (function- or block-scoped) conses, vectors, and strings. These objects are not managed by GC, and passing them out of their scope @@ -4582,9 +4588,12 @@ #endif /* __GNUC__ etc... */ -/* Convenient utility macro similar to list2. */ +/* Convenient utility macros similar to listX functions. */ +#define scoped_list1(x) scoped_cons (x, Qnil) #define scoped_list2(x, y) scoped_cons (x, scoped_cons (y, Qnil)) +#define scoped_list3(x, y, z) \ + scoped_cons (x, scoped_cons (y, scoped_cons (z, Qnil))) /* True if Lisp_Object may be placed at P. Used only under ENABLE_CHECKING and optimized away otherwise. */ @@ -4622,7 +4631,7 @@ ((size) * word_size + header_size)), \ obj = local_vector_init ((uintptr_t) XLI (obj), (size), (init)))) -/* Helper function for build_local_string, see below. */ +/* Helper function for make_local_string, see below. */ INLINE Lisp_Object local_string_init (uintptr_t addr, const char *data, ptrdiff_t size) @@ -4648,13 +4657,32 @@ with contents DATA of length NBYTES. Otherwise create regular GC-managed string. */ -#define build_local_string(obj, data, nbytes) \ +#define make_local_string(obj, data, nbytes) \ (MAX_ALLOCA < (nbytes) + sizeof (struct Lisp_String) \ ? obj = make_string ((data), (nbytes)) \ : (obj = XIL ((uintptr_t) alloca \ ((nbytes) + sizeof (struct Lisp_String))), \ obj = local_string_init ((uintptr_t) XLI (obj), data, nbytes))) +/* We want an interface similar to make_string and build_string, right? */ + +#define build_local_string(obj, data) \ + make_local_string (obj, data, strlen (data)) + +#else /* not USE_STACK_LISP_OBJECTS */ + +#define scoped_cons(x, y) Fcons ((x), (y)) +#define scoped_list1(x) list1 (x) +#define scoped_list2(x, y) list2 ((x), (y)) +#define scoped_list3(x, y, z) list3 ((x), (y), (z)) +#define build_local_vector(obj, size, init) \ + (obj = Fmake_vector (make_number ((size), (init)))) +#define make_local_string(obj, data, nbytes) \ + (obj = make_string ((data), (nbytes))) +#define build_local_string(obj, data) (obj = build_string (data)) + +#endif /* USE_STACK_LISP_OBJECTS */ + /* Loop over all tails of a list, checking for cycles. FIXME: Make tortoise and n internal declarations. FIXME: Unroll the loop body so we don't need `n'. */ ------------------------------------------------------------ revno: 117846 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-09-09 07:44:06 +0400 message: Add macros to allocate temporary Lisp objects with alloca. Respect MAX_ALLOCA and fall back to regular GC for large objects. * character.h (parse_str_as_multibyte): Move prototype to ... * lisp.h (parse_str_as_multibyte): ... here. (struct Lisp_Cons): Add GCALIGNED attribute if supported. (scoped_cons, scoped_list2, build_local_vector, build_local_string): New macros. (scoped_cons_init, pointer_valid_for_lisp_object, local_vector_init) (local_string_init): New functions. * alloc.c (verify_alloca) [ENABLE_CHECKING]: New function. (init_alloc_once): Call it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-09 03:22:36 +0000 +++ src/ChangeLog 2014-09-09 03:44:06 +0000 @@ -5,6 +5,18 @@ (x_delete_terminal): Do not close X connection fd (Bug#18403). Add eassert and mark dpyinfo as dead only if it was alive. + Add macros to allocate temporary Lisp objects with alloca. + Respect MAX_ALLOCA and fall back to regular GC for large objects. + * character.h (parse_str_as_multibyte): Move prototype to ... + * lisp.h (parse_str_as_multibyte): ... here. + (struct Lisp_Cons): Add GCALIGNED attribute if supported. + (scoped_cons, scoped_list2, build_local_vector, build_local_string): + New macros. + (scoped_cons_init, pointer_valid_for_lisp_object, local_vector_init) + (local_string_init): New functions. + * alloc.c (verify_alloca) [ENABLE_CHECKING]: New function. + (init_alloc_once): Call it. + 2014-09-08 Eli Zaretskii * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero, === modified file 'src/alloc.c' --- src/alloc.c 2014-09-07 07:04:01 +0000 +++ src/alloc.c 2014-09-09 03:44:06 +0000 @@ -7117,8 +7117,29 @@ file, line, msg); terminate_due_to_signal (SIGABRT, INT_MAX); } -#endif - + +/* Stress alloca with inconveniently sized requests and check + whether all allocated areas may be used for Lisp_Object. */ + +NO_INLINE static void +verify_alloca (void) +{ + int i; + enum { ALLOCA_CHECK_MAX = 256 }; + /* Start from size of the smallest Lisp object. */ + for (i = sizeof (struct Lisp_Cons); i <= ALLOCA_CHECK_MAX; i++) + { + char *ptr = alloca (i); + eassert (pointer_valid_for_lisp_object (ptr)); + } +} + +#else /* not ENABLE_CHECKING */ + +#define verify_alloca() ((void) 0) + +#endif /* ENABLE_CHECKING */ + /* Initialization. */ void @@ -7128,6 +7149,8 @@ purebeg = PUREBEG; pure_size = PURESIZE; + verify_alloca (); + #if GC_MARK_STACK || defined GC_MALLOC_CHECK mem_init (); Vdead = make_pure_string ("DEAD", 4, 4, 0); === modified file 'src/character.h' --- src/character.h 2014-07-08 07:17:04 +0000 +++ src/character.h 2014-09-09 03:44:06 +0000 @@ -644,8 +644,6 @@ const unsigned char **, int *); extern int translate_char (Lisp_Object, int c); -extern void parse_str_as_multibyte (const unsigned char *, - ptrdiff_t, ptrdiff_t *, ptrdiff_t *); extern ptrdiff_t count_size_as_multibyte (const unsigned char *, ptrdiff_t); extern ptrdiff_t str_as_multibyte (unsigned char *, ptrdiff_t, ptrdiff_t, ptrdiff_t *); === modified file 'src/lisp.h' --- src/lisp.h 2014-09-07 07:04:01 +0000 +++ src/lisp.h 2014-09-09 03:44:06 +0000 @@ -298,6 +298,13 @@ # endif #endif +/* Stolen from gnulib. */ +#if (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ \ + || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C) +#define GCALIGNED __attribute__ ((aligned (GCALIGNMENT))) +#else +#define GCALIGNED /* empty */ +#endif /* Some operations are so commonly executed that they are implemented as macros, not functions, because otherwise runtime performance would @@ -1016,7 +1023,7 @@ typedef struct interval *INTERVAL; -struct Lisp_Cons +struct GCALIGNED Lisp_Cons { /* Car of this cons cell. */ Lisp_Object car; @@ -3622,6 +3629,10 @@ /* Defined in vm-limit.c. */ extern void memory_warnings (void *, void (*warnfun) (const char *)); +/* Defined in character.c. */ +extern void parse_str_as_multibyte (const unsigned char *, ptrdiff_t, + ptrdiff_t *, ptrdiff_t *); + /* Defined in alloc.c. */ extern void check_pure_size (void); extern void free_misc (Lisp_Object); @@ -4535,6 +4546,115 @@ memory_full (SIZE_MAX); \ } while (false) +/* Use the following functions to allocate temporary (function- + or block-scoped) conses, vectors, and strings. These objects + are not managed by GC, and passing them out of their scope + most likely causes an immediate crash at next GC. */ + +#if (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ \ + || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C) + +/* Allocate temporary block-scoped cons. This version assumes + that stack-allocated Lisp_Cons is always aligned properly. */ + +#define scoped_cons(car, cdr) \ + make_lisp_ptr (&((struct Lisp_Cons) { car, { cdr } }), Lisp_Cons) + +#else /* not __GNUC__ etc... */ + +/* Helper function for an alternate scoped cons, see below. */ + +INLINE Lisp_Object +scoped_cons_init (void *ptr, Lisp_Object x, Lisp_Object y) +{ + struct Lisp_Cons *c = (struct Lisp_Cons *) + (((uintptr_t) ptr + (GCALIGNMENT - 1)) & ~(GCALIGNMENT - 1)); + c->car = x; + c->u.cdr = y; + return make_lisp_ptr (c, Lisp_Cons); +} + +/* This version uses explicit alignment. */ + +#define scoped_cons(car, cdr) \ + scoped_cons_init ((char[sizeof (struct Lisp_Cons) \ + + (GCALIGNMENT - 1)]) {}, (car), (cdr)) + +#endif /* __GNUC__ etc... */ + +/* Convenient utility macro similar to list2. */ + +#define scoped_list2(x, y) scoped_cons (x, scoped_cons (y, Qnil)) + +/* True if Lisp_Object may be placed at P. Used only + under ENABLE_CHECKING and optimized away otherwise. */ + +INLINE bool +pointer_valid_for_lisp_object (void *p) +{ + uintptr_t v = (uintptr_t) p; + return !(USE_LSB_TAG ? (v & ~VALMASK) : v >> VALBITS); +} + +/* Helper function for build_local_vector, see below. */ + +INLINE Lisp_Object +local_vector_init (uintptr_t addr, ptrdiff_t length, Lisp_Object init) +{ + ptrdiff_t i; + struct Lisp_Vector *v = (struct Lisp_Vector *) addr; + + eassert (pointer_valid_for_lisp_object (v)); + v->header.size = length; + for (i = 0; i < length; i++) + v->contents[i] = init; + return make_lisp_ptr (v, Lisp_Vectorlike); +} + +/* If size permits, create temporary function-scoped vector OBJ of + length SIZE, with each element being INIT. Otherwise create + regular GC-managed vector. */ + +#define build_local_vector(obj, size, init) \ + (MAX_ALLOCA < (size) * word_size + header_size \ + ? obj = Fmake_vector (make_number (size), (init)) \ + : (obj = XIL ((uintptr_t) alloca \ + ((size) * word_size + header_size)), \ + obj = local_vector_init ((uintptr_t) XLI (obj), (size), (init)))) + +/* Helper function for build_local_string, see below. */ + +INLINE Lisp_Object +local_string_init (uintptr_t addr, const char *data, ptrdiff_t size) +{ + ptrdiff_t nchars, nbytes; + struct Lisp_String *s = (struct Lisp_String *) addr; + + eassert (pointer_valid_for_lisp_object (s)); + parse_str_as_multibyte ((const unsigned char *) data, + size, &nchars, &nbytes); + s->data = (unsigned char *) (addr + sizeof *s); + s->intervals = NULL; + memcpy (s->data, data, size); + s->data[size] = '\0'; + if (size == nchars || size != nbytes) + s->size = size, s->size_byte = -1; + else + s->size = nchars, s->size_byte = nbytes; + return make_lisp_ptr (s, Lisp_String); +} + +/* If size permits, create temporary function-scoped string OBJ + with contents DATA of length NBYTES. Otherwise create regular + GC-managed string. */ + +#define build_local_string(obj, data, nbytes) \ + (MAX_ALLOCA < (nbytes) + sizeof (struct Lisp_String) \ + ? obj = make_string ((data), (nbytes)) \ + : (obj = XIL ((uintptr_t) alloca \ + ((nbytes) + sizeof (struct Lisp_String))), \ + obj = local_string_init ((uintptr_t) XLI (obj), data, nbytes))) + /* Loop over all tails of a list, checking for cycles. FIXME: Make tortoise and n internal declarations. FIXME: Unroll the loop body so we don't need `n'. */ ------------------------------------------------------------ revno: 117845 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-09-09 07:22:36 +0400 message: * xterm.c (x_term_init): Consolidate duplicated code. [USE_LUCID]: Revert 2014-04-02 change (Bug#18403). Add comment. (x_delete_terminal): Do not close X connection fd (Bug#18403). Add eassert and mark dpyinfo as dead only if it was alive. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-08 06:00:58 +0000 +++ src/ChangeLog 2014-09-09 03:22:36 +0000 @@ -1,3 +1,10 @@ +2014-09-09 Dmitry Antipov + + * xterm.c (x_term_init): Consolidate duplicated code. + [USE_LUCID]: Revert 2014-04-02 change (Bug#18403). Add comment. + (x_delete_terminal): Do not close X connection fd (Bug#18403). + Add eassert and mark dpyinfo as dead only if it was alive. + 2014-09-08 Eli Zaretskii * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero, === modified file 'src/xterm.c' --- src/xterm.c 2014-09-04 05:38:37 +0000 +++ src/xterm.c 2014-09-09 03:22:36 +0000 @@ -10667,7 +10667,6 @@ struct x_display_info * x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) { - int connection; Display *dpy; struct terminal *terminal; struct x_display_info *dpyinfo; @@ -11110,22 +11109,19 @@ xsettings_initialize (dpyinfo); - connection = ConnectionNumber (dpyinfo->display); - /* This is only needed for distinguishing keyboard and process input. */ - if (connection != 0) - add_keyboard_wait_descriptor (connection); + if (dpyinfo->connection != 0) + add_keyboard_wait_descriptor (dpyinfo->connection); #ifdef F_SETOWN - fcntl (connection, F_SETOWN, getpid ()); + fcntl (dpyinfo->connection, F_SETOWN, getpid ()); #endif /* ! defined (F_SETOWN) */ if (interrupt_input) - init_sigio (connection); + init_sigio (dpyinfo->connection); #ifdef USE_LUCID { - XFontStruct *xfont = NULL; XrmValue d, fr, to; Font font; @@ -11139,10 +11135,10 @@ x_catch_errors (dpy); if (!XtCallConverter (dpy, XtCvtStringToFont, &d, 1, &fr, &to, NULL)) emacs_abort (); - if (x_had_errors_p (dpy) || !((xfont = XQueryFont (dpy, font)))) + if (x_had_errors_p (dpy) || !XQueryFont (dpy, font)) XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15"); - if (xfont) - XFreeFont (dpy, xfont); + /* Do not free XFontStruct returned by the above call to XQueryFont. + This leads to X protocol errors at XtCloseDisplay (Bug#18403). */ x_uncatch_errors (); } #endif @@ -11375,18 +11371,17 @@ XCloseDisplay (dpyinfo->display); #endif #endif /* ! USE_GTK */ - } - /* No more input on this descriptor. */ - if (0 <= dpyinfo->connection) - { + /* No more input on this descriptor. Do not close it because + it's already closed by X(t)CloseDisplay (Bug#18403). */ + eassert (0 <= dpyinfo->connection); delete_keyboard_wait_descriptor (dpyinfo->connection); - emacs_close (dpyinfo->connection); + + /* Mark as dead. */ + dpyinfo->display = NULL; + dpyinfo->connection = -1; } - /* Mark as dead. */ - dpyinfo->display = NULL; - dpyinfo->connection = -1; x_delete_display (dpyinfo); unblock_input (); } ------------------------------------------------------------ revno: 117844 committer: Sam Steingold branch nick: trunk timestamp: Mon 2014-09-08 09:57:19 -0400 message: (sql-set-sqli-buffer): Call `sql-product-interactive' when no suitable buffer is available. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-08 12:38:53 +0000 +++ lisp/ChangeLog 2014-09-08 13:57:19 +0000 @@ -7,6 +7,8 @@ (sql-default-directory): New user option. (sql-product-interactive): Bind `default-directory' to it to enable remote connections using Tramp. + (sql-set-sqli-buffer): Call `sql-product-interactive' when no + suitable buffer is available. 2014-09-08 Glenn Morris === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2014-09-08 12:38:53 +0000 +++ lisp/progmodes/sql.el 2014-09-08 13:57:19 +0000 @@ -3059,7 +3059,7 @@ (interactive) (let ((default-buffer (sql-find-sqli-buffer))) (if (null default-buffer) - (user-error "There is no suitable SQLi buffer") + (sql-product-interactive) (let ((new-buffer (read-buffer "New SQLi buffer: " default-buffer t))) (if (null (sql-buffer-live-p new-buffer)) (user-error "Buffer %s is not a working SQLi buffer" new-buffer) @@ -3075,10 +3075,9 @@ I See also `sql-help' on how to create such a buffer." (interactive) - (unless (and sql-buffer (buffer-live-p (get-buffer sql-buffer))) + (unless (and sql-buffer (buffer-live-p (get-buffer sql-buffer)) + (get-buffer-process sql-buffer)) (sql-set-sqli-buffer)) - (unless (get-buffer-process sql-buffer) - (user-error "Buffer %s has no process" sql-buffer)) (display-buffer sql-buffer)) (defun sql-make-alternate-buffer-name () ------------------------------------------------------------ revno: 117843 committer: Sam Steingold branch nick: trunk timestamp: Mon 2014-09-08 08:38:53 -0400 message: (sql-default-directory): New user option. * lisp/progmodes/sql.el (sql-default-directory): New user option. (sql-product-interactive): Bind `default-directory' to it to enable remote connections using Tramp. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-09-06 00:59:00 +0000 +++ etc/NEWS 2014-09-08 12:38:53 +0000 @@ -146,6 +146,15 @@ *** New connection method "nc", which allows to access dumb busyboxes. +** SQL mode + +*** New user variable `sql-default-directory' enables remote +connections using Tramp. + +*** New command `sql-send-line-and-next' sends the current line to the +interactive buffer and advances to the next line, skipping whitespace +and comments. + ** VC and related modes *** New option `vc-annotate-background-mode' controls whether @@ -209,7 +218,7 @@ * Lisp Changes in Emacs 24.5 *** call-process-shell-command and process-file-shell-command -don't take "&rest args" an more. +don't take "&rest args" any more. ** New function `funcall-interactively', which works like `funcall' but makes `called-interactively-p' treat the function as (you guessed it) === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-08 12:31:54 +0000 +++ lisp/ChangeLog 2014-09-08 12:38:53 +0000 @@ -4,6 +4,9 @@ bound to C-c C-n. (sql-show-sqli-buffer): Display the buffer instead of its name and bind the command to C-c C-z. + (sql-default-directory): New user option. + (sql-product-interactive): Bind `default-directory' to it to + enable remote connections using Tramp. 2014-09-08 Glenn Morris === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2014-09-08 12:31:54 +0000 +++ lisp/progmodes/sql.el 2014-09-08 12:38:53 +0000 @@ -282,6 +282,13 @@ :group 'SQL :safe 'numberp) +(defcustom sql-default-directory nil + "Default directory for SQL processes." + :version "24.5" + :type 'string + :group 'SQL + :safe 'stringp) + ;; Login parameter type (define-widget 'sql-login-params 'lazy @@ -4173,7 +4180,9 @@ (sql-password (default-value 'sql-password)) (sql-server (default-value 'sql-server)) (sql-database (default-value 'sql-database)) - (sql-port (default-value 'sql-port))) + (sql-port (default-value 'sql-port)) + (default-directory (or sql-default-directory + default-directory))) (funcall (sql-get-product-feature product :sqli-comint-func) product (sql-get-product-feature product :sqli-options))) ------------------------------------------------------------ revno: 117842 committer: Sam Steingold branch nick: trunk timestamp: Mon 2014-09-08 08:31:54 -0400 message: (sql-show-sqli-buffer): Display the buffer instead of its name and bind the command to C-c C-z. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-08 12:27:19 +0000 +++ lisp/ChangeLog 2014-09-08 12:31:54 +0000 @@ -2,6 +2,8 @@ * progmodes/sql.el (sql-send-line-and-next): New command, bound to C-c C-n. + (sql-show-sqli-buffer): Display the buffer instead of its name and + bind the command to C-c C-z. 2014-09-08 Glenn Morris === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2014-09-08 12:27:19 +0000 +++ lisp/progmodes/sql.el 2014-09-08 12:31:54 +0000 @@ -1223,6 +1223,7 @@ (define-key map (kbd "C-c C-b") 'sql-send-buffer) (define-key map (kbd "C-c C-n") 'sql-send-line-and-next) (define-key map (kbd "C-c C-i") 'sql-product-interactive) + (define-key map (kbd "C-c C-z") 'sql-show-sqli-buffer) (define-key map (kbd "C-c C-l a") 'sql-list-all) (define-key map (kbd "C-c C-l t") 'sql-list-table) (define-key map [remap beginning-of-defun] 'sql-beginning-of-statement) @@ -3060,17 +3061,18 @@ (run-hooks 'sql-set-sqli-hook))))))) (defun sql-show-sqli-buffer () - "Show the name of current SQLi buffer. + "Display the current SQLi buffer. -This is the buffer SQL strings are sent to. It is stored in the -variable `sql-buffer'. See `sql-help' on how to create such a buffer." +This is the buffer SQL strings are sent to. +It is stored in the variable `sql-buffer'. +I +See also `sql-help' on how to create such a buffer." (interactive) - (if (or (null sql-buffer) - (null (buffer-live-p (get-buffer sql-buffer)))) - (user-error "%s has no SQLi buffer set" (buffer-name (current-buffer))) - (if (null (get-buffer-process sql-buffer)) - (user-error "Buffer %s has no process" sql-buffer) - (user-error "Current SQLi buffer is %s" sql-buffer)))) + (unless (and sql-buffer (buffer-live-p (get-buffer sql-buffer))) + (sql-set-sqli-buffer)) + (unless (get-buffer-process sql-buffer) + (user-error "Buffer %s has no process" sql-buffer)) + (display-buffer sql-buffer)) (defun sql-make-alternate-buffer-name () "Return a string that can be used to rename a SQLi buffer. ------------------------------------------------------------ revno: 117841 committer: Sam Steingold branch nick: trunk timestamp: Mon 2014-09-08 08:27:19 -0400 message: (sql-send-line-and-next): New command, bound to C-c C-n. * lisp/progmodes/sql.el (sql-send-line-and-next): New command, bound to C-c C-n. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-08 06:03:19 +0000 +++ lisp/ChangeLog 2014-09-08 12:27:19 +0000 @@ -1,3 +1,8 @@ +2014-09-08 Sam Steingold + + * progmodes/sql.el (sql-send-line-and-next): New command, + bound to C-c C-n. + 2014-09-08 Glenn Morris * calendar/calendar.el (calendar-basic-setup): === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2014-02-28 01:55:12 +0000 +++ lisp/progmodes/sql.el 2014-09-08 12:27:19 +0000 @@ -212,11 +212,11 @@ ;; Michael Mauger -- improved product support ;; Drew Adams -- Emacs 20 support ;; Harald Maier -- sql-send-string -;; Stefan Monnier -- font-lock corrections; +;; Stefan Monnier -- font-lock corrections; ;; code polish ;; Paul Sleigh -- MySQL keyword enhancement ;; Andrew Schein -- sql-port bug -;; Ian Bjorhovde -- db2 escape newlines +;; Ian Bjorhovde -- db2 escape newlines ;; incorrectly enabled by default ;; Roman Scherer -- Connection documentation ;; Mark Wilkinson -- file-local variables ignored @@ -1221,6 +1221,7 @@ (define-key map (kbd "C-c C-r") 'sql-send-region) (define-key map (kbd "C-c C-s") 'sql-send-string) (define-key map (kbd "C-c C-b") 'sql-send-buffer) + (define-key map (kbd "C-c C-n") 'sql-send-line-and-next) (define-key map (kbd "C-c C-i") 'sql-product-interactive) (define-key map (kbd "C-c C-l a") 'sql-list-all) (define-key map (kbd "C-c C-l t") 'sql-list-table) @@ -3073,7 +3074,6 @@ (defun sql-make-alternate-buffer-name () "Return a string that can be used to rename a SQLi buffer. - This is used to set `sql-alternate-buffer-name' within `sql-interactive-mode'. @@ -3323,7 +3323,7 @@ (setq oline (replace-match "" nil nil oline) sql-output-newline-count (1- sql-output-newline-count) prompt-found t))) - + ;; If we've found all the expected prompts, stop looking (if (= sql-output-newline-count 0) (setq sql-output-newline-count nil @@ -3403,6 +3403,13 @@ (interactive) (sql-send-region (point-min) (point-max))) +(defun sql-send-line-and-next () + "Send the current line to the SQL process and go to the next line." + (interactive) + (sql-send-region (line-beginning-position 1) (line-beginning-position 2)) + (beginning-of-line 2) + (while (forward-comment 1))) ; skip all comments and whitespace + (defun sql-send-magic-terminator (buf str terminator) "Send TERMINATOR to buffer BUF if its not present in STR." (let (comint-input-sender-no-newline pat term) @@ -3589,7 +3596,7 @@ (apply c sqlbuf outbuf enhanced arg nil)) (t (error "Unknown sql-execute item %s" c)))) (if (consp command) command (cons command nil))) - + (setq outbuf (get-buffer outbuf)) (if (zerop (buffer-size outbuf)) (kill-buffer outbuf) ------------------------------------------------------------ revno: 117840 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-09-07 23:03:19 -0700 message: * calendar.el (calendar-basic-setup): Fix calendar-view-holidays-initially-flag and fancy display. * diary-lib.el (diary-live-p): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-08 06:00:58 +0000 +++ lisp/ChangeLog 2014-09-08 06:03:19 +0000 @@ -1,6 +1,10 @@ 2014-09-08 Glenn Morris * calendar/calendar.el (calendar-basic-setup): + Fix calendar-view-holidays-initially-flag and fancy display. + * calendar/diary-lib.el (diary-live-p): Doc fix. + + * calendar/calendar.el (calendar-basic-setup): Avoid clobbering calendar with diary. (Bug#18381) 2014-09-08 Stefan Monnier === modified file 'lisp/calendar/calendar.el' --- lisp/calendar/calendar.el 2014-09-08 06:00:58 +0000 +++ lisp/calendar/calendar.el 2014-09-08 06:03:19 +0000 @@ -1450,7 +1450,7 @@ '(nil . ((inhibit-same-window . t))))) (diary-view-entries))))) (if calendar-view-holidays-initially-flag - (let* ((diary-buffer (get-file-buffer diary-file)) + (let* ((diary-buffer (diary-live-p)) (diary-window (if diary-buffer (get-buffer-window diary-buffer))) (split-height-threshold (if diary-window 2 1000))) ;; FIXME display buffer? === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2014-05-04 23:49:33 +0000 +++ lisp/calendar/diary-lib.el 2014-09-08 06:03:19 +0000 @@ -1,7 +1,6 @@ ;;; diary-lib.el --- diary functions -;; Copyright (C) 1989-1990, 1992-1995, 2001-2014 Free Software -;; Foundation, Inc. +;; Copyright (C) 1989-1990, 1992-1995, 2001-2014 Free Software Foundation, Inc. ;; Author: Edward M. Reingold ;; Maintainer: Glenn Morris @@ -468,7 +467,8 @@ ;; just visiting the diary-file. This is i) unlikely, and ii) no great loss. ;;;###cal-autoload (defun diary-live-p () - "Return non-nil if the diary is being displayed." + "Return non-nil if the diary is being displayed. +The actual return value is a diary buffer." (or (get-buffer diary-fancy-buffer) (and diary-file (find-buffer-visiting diary-file)))) ------------------------------------------------------------ revno: 117839 [merge] committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-09-07 23:00:58 -0700 message: Merge from emacs-24; up to r117485 diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-08-30 22:59:39 +0000 +++ admin/ChangeLog 2014-09-08 06:00:58 +0000 @@ -1,3 +1,11 @@ +2014-09-08 Eli Zaretskii + + * unidata/unidata-gen.el (unidata-check): Bring this function up + to date with the currently supported methods of generating Unicode + property tables. Add a comment with a description how to invoke + the check. Update the copyright years in the reference to the + Unicode data files we use. + 2014-08-30 Paul Eggert Vector-sorting fixes (Bug#18361). === modified file 'admin/unidata/unidata-gen.el' --- admin/unidata/unidata-gen.el 2014-01-01 08:31:29 +0000 +++ admin/unidata/unidata-gen.el 2014-09-03 16:03:34 +0000 @@ -854,7 +854,7 @@ ;; The following command yields a file of about 96K bytes. ;; % gawk -F ';' '{print $1,$2;}' < UnicodeData.txt | gzip > temp.gz ;; With the following function, we can get a file of almost the same -;; the size. +;; size. ;; Generate a char-table for character names. @@ -1174,25 +1174,42 @@ ;; Verify if we can retrieve correct values from the generated ;; char-tables. +;; +;; Use like this: +;; +;; (let ((unidata-dir "/path/to/admin/unidata")) +;; (unidata-setup-list "unidata.txt") +;; (unidata-check)) (defun unidata-check () (dolist (elt unidata-prop-alist) (let* ((prop (car elt)) (index (unidata-prop-index prop)) (generator (unidata-prop-generator prop)) + (default-value (unidata-prop-default prop)) + (val-list (unidata-prop-val-list prop)) (table (progn (message "Generating %S table..." prop) - (funcall generator prop))) + (funcall generator prop default-value val-list))) (decoder (char-table-extra-slot table 1)) + (alist (and (functionp index) + (funcall index))) (check #x400)) (dolist (e unidata-list) - (let ((char (car e)) - (val1 (nth index e)) - val2) + (let* ((char (car e)) + (val1 + (if alist (nth 1 (assoc char alist)) + (nth index e))) + val2) (if (and (stringp val1) (= (length val1) 0)) (setq val1 nil)) - (unless (consp char) - (setq val2 (funcall decoder char (aref table char) table)) + (unless (or (consp char) + (integerp decoder)) + (setq val2 + (cond ((functionp decoder) + (funcall decoder char (aref table char) table)) + (t ; must be nil + (aref table char)))) (if val1 (cond ((eq generator 'unidata-gen-table-symbol) (setq val1 (intern val1))) @@ -1201,11 +1218,15 @@ ((eq generator 'unidata-gen-table-character) (setq val1 (string-to-number val1 16))) ((eq generator 'unidata-gen-table-decomposition) - (setq val1 (unidata-split-decomposition val1))))) + (setq val1 (unidata-split-decomposition val1)))) + (cond ((eq prop 'decomposition) + (setq val1 (list char))))) (when (>= char check) (message "%S %04X" prop check) (setq check (+ check #x400))) (or (equal val1 val2) + ;; characters get a 'name' property of nil + (and (eq prop 'name) (string= val1 "") (null val2)) (insert (format "> %04X %S\n< %04X %S\n" char val1 char val2))) (sit-for 0))))))) @@ -1261,7 +1282,7 @@ (setq describer (symbol-function describer))) (set-char-table-extra-slot table 3 describer)) (if (bobp) - (insert ";; Copyright (C) 1991-2013 Unicode, Inc. + (insert ";; Copyright (C) 1991-2014 Unicode, Inc. ;; This file was generated from the Unicode data files at ;; http://www.unicode.org/Public/UNIDATA/. ;; See lisp/international/README for the copyright and permission notice.\n")) === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-09-07 11:02:33 +0000 +++ doc/lispref/ChangeLog 2014-09-08 06:00:58 +0000 @@ -1,3 +1,8 @@ +2014-09-08 Stefan Monnier + + * functions.texi (Core Advising Primitives): Add a note about the + confusing treatment of `interactive' for :filter-args (bug#18399). + 2014-09-07 Michael Albinus * strings.texi (Text Comparison): Describe `string-collate-equalp' === modified file 'doc/lispref/functions.texi' --- doc/lispref/functions.texi 2014-06-02 00:18:22 +0000 +++ doc/lispref/functions.texi 2014-09-08 06:00:58 +0000 @@ -1220,15 +1220,6 @@ This macro is the handy way to add the advice @var{function} to the function stored in @var{place} (@pxref{Generalized Variables}). -If @var{function} is not interactive, then the combined function will inherit -the interactive spec, if any, of the original function. Else, the combined -function will be interactive and will use the interactive spec of -@var{function}. One exception: if the interactive spec of @var{function} -is a function (rather than an expression or a string), then the interactive -spec of the combined function will be a call to that function with as sole -argument the interactive spec of the original function. To interpret the spec -received as argument, use @code{advice-eval-interactive-spec}. - @var{where} determines how @var{function} is composed with the existing function, e.g. whether @var{function} should be called before, or after the original function. @xref{Advice combinators}, for the list of @@ -1271,6 +1262,21 @@ @code{:override} advice will override not only the original function but all other advices applied to it as well. @end table + +If @var{function} is not interactive, then the combined function will inherit +the interactive spec, if any, of the original function. Else, the combined +function will be interactive and will use the interactive spec of +@var{function}. One exception: if the interactive spec of @var{function} +is a function (rather than an expression or a string), then the interactive +spec of the combined function will be a call to that function with as sole +argument the interactive spec of the original function. To interpret the spec +received as argument, use @code{advice-eval-interactive-spec}. + +Note: The interactive spec of @var{function} will apply to the combined +function and should hence obey the calling convention of the combined function +rather than that of @var{function}. In many cases, it makes no difference +since they are identical, but it does matter for @code{:around}, +@code{:filter-args}, and @code{filter-return}, where @var{function}. @end defmac @defmac remove-function place function === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-06 00:59:00 +0000 +++ lisp/ChangeLog 2014-09-08 06:00:58 +0000 @@ -1,3 +1,21 @@ +2014-09-08 Glenn Morris + + * calendar/calendar.el (calendar-basic-setup): + Avoid clobbering calendar with diary. (Bug#18381) + +2014-09-08 Stefan Monnier + + * vc/vc-dir.el (vc-dir-update): Don't burp in corner case. + +2014-09-08 Lars Ljung (tiny change) + + * isearch.el (isearch-yank-word-or-char): Obey superword-mode + as well (bug#18400). + +2014-09-08 Eli Zaretskii + + * subr.el (posn-actual-col-row): Doc fix. (Bug#18385) + 2014-09-06 Leo Liu * emacs-lisp/pcase.el (pcase): Doc fix. === modified file 'lisp/calendar/calendar.el' --- lisp/calendar/calendar.el 2014-08-21 08:40:29 +0000 +++ lisp/calendar/calendar.el 2014-09-08 06:00:58 +0000 @@ -1443,7 +1443,12 @@ (calendar-generate-window month year) (if (and calendar-view-diary-initially-flag (calendar-date-is-visible-p date)) - (diary-view-entries)))) + ;; Do not clobber the calendar with the diary, if the diary + ;; has previously been shown in the window that now shows the + ;; calendar (bug#18381). + (let ((display-buffer-overriding-action + '(nil . ((inhibit-same-window . t))))) + (diary-view-entries))))) (if calendar-view-holidays-initially-flag (let* ((diary-buffer (get-file-buffer diary-file)) (diary-window (if diary-buffer (get-buffer-window diary-buffer))) === modified file 'lisp/isearch.el' --- lisp/isearch.el 2014-03-01 02:48:54 +0000 +++ lisp/isearch.el 2014-09-04 16:14:26 +0000 @@ -1968,10 +1968,12 @@ (lambda () (if (or (= (char-syntax (or (char-after) 0)) ?w) (= (char-syntax (or (char-after (1+ (point))) 0)) ?w)) - (if (and (boundp 'subword-mode) subword-mode) + (if (or (and (boundp 'subword-mode) subword-mode) + (and (boundp 'superword-mode) superword-mode)) (subword-forward 1) (forward-word 1)) - (forward-char 1)) (point)))) + (forward-char 1)) + (point)))) (defun isearch-yank-word (&optional arg) "Pull next word from buffer into search string. === modified file 'lisp/subr.el' --- lisp/subr.el 2014-09-05 01:20:51 +0000 +++ lisp/subr.el 2014-09-08 06:00:58 +0000 @@ -1159,12 +1159,17 @@ (/ (cdr pair) (+ (frame-char-height frame) spacing)))))))) (defun posn-actual-col-row (position) - "Return the actual column and row in POSITION, measured in characters. -These are the actual row number in the window and character number in that row. + "Return the window row number in POSITION and character number in that row. + Return nil if POSITION does not contain the actual position; in that case -`posn-col-row' can be used to get approximate values. +\`posn-col-row' can be used to get approximate values. POSITION should be a list of the form returned by the `event-start' -and `event-end' functions." +and `event-end' functions. + +This function does not account for the width on display, like the +number of visual columns taken by a TAB or image. If you need +the coordinates of POSITION in character units, you should use +\`posn-col-row', not this function." (nth 6 position)) (defsubst posn-timestamp (position) === modified file 'lisp/vc/vc-dir.el' --- lisp/vc/vc-dir.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/vc-dir.el 2014-09-05 17:37:12 +0000 @@ -433,7 +433,8 @@ ;; previous node was in a different directory. (let* ((rd (file-relative-name entrydir)) (prev-node (ewoc-prev vc-ewoc node)) - (prev-dir (vc-dir-node-directory prev-node))) + (prev-dir (if prev-node + (vc-dir-node-directory prev-node)))) (unless (string-equal entrydir prev-dir) (ewoc-enter-before vc-ewoc node (vc-dir-create-fileinfo rd nil nil nil entrydir)))) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-07 22:27:59 +0000 +++ src/ChangeLog 2014-09-08 06:00:58 +0000 @@ -1,3 +1,13 @@ +2014-09-08 Eli Zaretskii + + * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero, + always make sure the marginal areas of the row are in sync with + what the window wants. (Bug#18419) + + * data.c (set_internal): Use assq_no_quit, not Fassq, to find an + existing binding of a variable, to avoid silently aborting + commands that use specbind. (Bug#18331) + 2014-09-07 Paul Eggert Fix bug uncovered by changing alloca to auto buffer (Bug#18410). === modified file 'src/data.c' --- src/data.c 2014-09-02 18:05:00 +0000 +++ src/data.c 2014-09-08 06:00:58 +0000 @@ -1311,10 +1311,10 @@ /* Find the new binding. */ XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ - tem1 = Fassq (symbol, - (blv->frame_local - ? XFRAME (where)->param_alist - : BVAR (XBUFFER (where), local_var_alist))); + tem1 = assq_no_quit (symbol, + (blv->frame_local + ? XFRAME (where)->param_alist + : BVAR (XBUFFER (where), local_var_alist))); set_blv_where (blv, where); blv->found = 1; === modified file 'src/dispnew.c' --- src/dispnew.c 2014-09-03 04:21:40 +0000 +++ src/dispnew.c 2014-09-08 06:00:58 +0000 @@ -1082,8 +1082,7 @@ if (w->right_margin_cols > 0) row->glyphs[RIGHT_MARGIN_AREA] = row->glyphs[LAST_AREA]; } - else if (row == MATRIX_MODE_LINE_ROW (w->desired_matrix) - || row == MATRIX_HEADER_LINE_ROW (w->desired_matrix)) + else { /* The real number of glyphs reserved for the margins is recorded in the glyph matrix, and can be different from @@ -1093,8 +1092,8 @@ int right = w->desired_matrix->right_margin_glyphs; /* Make sure the marginal areas of this row are in sync with - what the window wants, when the 1st/last row of the matrix - actually displays text and not header/mode line. */ + what the window wants, when the row actually displays text + and not header/mode line. */ if (w->left_margin_cols > 0 && (left != row->glyphs[TEXT_AREA] - row->glyphs[LEFT_MARGIN_AREA])) row->glyphs[TEXT_AREA] = row->glyphs[LEFT_MARGIN_AREA] + left; === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-30 16:47:19 +0000 +++ src/sysdep.c 2014-09-08 06:00:58 +0000 @@ -2457,7 +2457,7 @@ { if (errno == EINTR) { - /* I originally used `QUIT' but that might causes files to + /* I originally used `QUIT' but that might cause files to be truncated if you hit C-g in the middle of it. --Stef */ if (process_signals && pending_signals) process_pending_signals (); ------------------------------------------------------------ revno: 117838 fixes bug: http://debbugs.gnu.org/18410 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-09-07 15:27:59 -0700 message: Fix bug uncovered by changing alloca to auto buffer. * coding.c (growable_destination): New function. (produce_chars): Use it for sanity checks. Do not fiddle with dst_end if the source and destination are both nil, as it's the caller's responsibility to avoid overlap. * keyboard.c (read_decoded_event_from_main_queue): The destination must be MAX_MULTIBYTE_LENGTH times the max source length, not 4 times, to prevent decode_coding_c_string from trying to reallocate a destination. This removes the need for the FIXME. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-07 20:31:18 +0000 +++ src/ChangeLog 2014-09-07 22:27:59 +0000 @@ -1,5 +1,15 @@ 2014-09-07 Paul Eggert + Fix bug uncovered by changing alloca to auto buffer (Bug#18410). + * coding.c (growable_destination): New function. + (produce_chars): Use it for sanity checks. Do not fiddle with + dst_end if the source and destination are both nil, as it's + the caller's responsibility to avoid overlap. + * keyboard.c (read_decoded_event_from_main_queue): + The destination must be MAX_MULTIBYTE_LENGTH times the max source + length, not 4 times, to prevent decode_coding_c_string from trying + to reallocate a destination. This removes the need for the FIXME. + * callproc.c (exec_failed) [DOS_NT]: Define a dummy. All callers simplified. Add a comment about exec_failed, vfork, and alloca. === modified file 'src/coding.c' --- src/coding.c 2014-09-07 07:04:01 +0000 +++ src/coding.c 2014-09-07 22:27:59 +0000 @@ -690,6 +690,14 @@ XSETCDR (x, tmp); } +/* True if CODING's destination can be grown. */ + +static bool +growable_destination (struct coding_system *coding) +{ + return STRINGP (coding->dst_object) || BUFFERP (coding->dst_object); +} + /* Safely get one byte from the source text pointed by SRC which ends at SRC_END, and set C to that byte. If there are not enough bytes @@ -7019,8 +7027,10 @@ int *buf = coding->charbuf; int *buf_end = buf + coding->charbuf_used; - if (EQ (coding->src_object, coding->dst_object)) + if (EQ (coding->src_object, coding->dst_object) + && ! NILP (coding->dst_object)) { + eassert (growable_destination (coding)); coding_set_source (coding); dst_end = ((unsigned char *) coding->source) + coding->consumed; } @@ -7059,6 +7069,7 @@ if ((dst_end - dst) / MAX_MULTIBYTE_LENGTH < to_nchars) { + eassert (growable_destination (coding)); if (((min (PTRDIFF_MAX, SIZE_MAX) - (buf_end - buf)) / MAX_MULTIBYTE_LENGTH) < to_nchars) @@ -7103,7 +7114,10 @@ const unsigned char *src_end = src + coding->consumed; if (EQ (coding->dst_object, coding->src_object)) - dst_end = (unsigned char *) src; + { + eassert (growable_destination (coding)); + dst_end = (unsigned char *) src; + } if (coding->src_multibyte != coding->dst_multibyte) { if (coding->src_multibyte) @@ -7119,6 +7133,7 @@ ONE_MORE_BYTE (c); if (dst == dst_end) { + eassert (growable_destination (coding)); if (EQ (coding->src_object, coding->dst_object)) dst_end = (unsigned char *) src; if (dst == dst_end) @@ -7149,6 +7164,7 @@ if (dst >= dst_end - 1) { + eassert (growable_destination (coding)); if (EQ (coding->src_object, coding->dst_object)) dst_end = (unsigned char *) src; if (dst >= dst_end - 1) === modified file 'src/keyboard.c' --- src/keyboard.c 2014-09-07 13:27:33 +0000 +++ src/keyboard.c 2014-09-07 22:27:59 +0000 @@ -2355,22 +2355,15 @@ struct coding_system *coding = TERMINAL_KEYBOARD_CODING (terminal); unsigned char src[MAX_ENCODED_BYTES]; - unsigned char dest[4 * sizeof src]; + unsigned char dest[MAX_ENCODED_BYTES * MAX_MULTIBYTE_LENGTH]; int i; for (i = 0; i < n; i++) src[i] = XINT (events[i]); if (meta_key != 2) for (i = 0; i < n; i++) src[i] &= ~0x80; - - /* FIXME: For some reason decode_coding_c_string requires a - fresh output buffer each time, and reusing the old buffer can - make Emacs dump core. Avoid triggering the problem for now - by allocating a new buffer each time through the loop. */ - bool please_fixme = true; - coding->destination = please_fixme ? alloca (n * 4) : dest; - - coding->dst_bytes = n * 4; + coding->destination = dest; + coding->dst_bytes = sizeof dest; decode_coding_c_string (coding, src, n, Qnil); eassert (coding->produced_char <= n); if (coding->produced_char == 0) ------------------------------------------------------------ revno: 117837 author: Paul Eggert committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-09-07 13:31:18 -0700 message: * callproc.c (exec_failed) [DOS_NT]: Define a dummy. All callers simplified. Add a comment about exec_failed, vfork, and alloca. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-07 19:47:28 +0000 +++ src/ChangeLog 2014-09-07 20:31:18 +0000 @@ -1,5 +1,9 @@ 2014-09-07 Paul Eggert + * callproc.c (exec_failed) [DOS_NT]: Define a dummy. + All callers simplified. Add a comment about exec_failed, vfork, + and alloca. + Adjust drag-and-drop fix when window is above top (Bug#18303). * xselect.c (x_fill_property_data): Don't let sign bit of negative XCDR bleed into XCAR's encoded value. Improve checks for === modified file 'src/callproc.c' --- src/callproc.c 2014-09-07 17:04:19 +0000 +++ src/callproc.c 2014-09-07 20:31:18 +0000 @@ -1154,6 +1154,9 @@ #ifndef DOS_NT /* 'exec' failed inside a child running NAME, with error number ERR. + Possibly a vforked child needed to allocate a large vector on the + stack; such a child cannot fall back on malloc because that might + mess up the allocator's data structures in the parent. Report the error and exit the child. */ static _Noreturn void @@ -1168,6 +1171,17 @@ emacs_perror (name); _exit (err == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); } + +#else + +/* Do nothing. There is no need to fail, as DOS_NT platforms do not + fork and exec, and handle alloca exhaustion in a different way. */ + +static void +exec_failed (char const *name, int err) +{ +} + #endif /* This is the last thing run in a newly forked inferior @@ -1213,13 +1227,8 @@ on that. */ pwd_var = xmalloc (i + 5); #else - /* WINDOWSNT doesn't define exec_failed, and doesn't need this - test, since a directory name cannot be longer than 260 - characters, i.e. 260 * 4 = 1040 UTF-8 bytes. */ -#ifndef WINDOWSNT if (MAX_ALLOCA - 5 < i) exec_failed (new_argv[0], ENOMEM); -#endif pwd_var = alloca (i + 5); #endif temp = pwd_var + 4; @@ -1286,10 +1295,8 @@ } /* new_length + 2 to include PWD and terminating 0. */ -#ifndef WINDOWSNT if (MAX_ALLOCA / sizeof *env - 2 < new_length) exec_failed (new_argv[0], ENOMEM); -#endif env = new_env = alloca ((new_length + 2) * sizeof *env); /* If we have a PWD envvar, pass one down, but with corrected value. */ @@ -1300,11 +1307,8 @@ { char *vdata; - /* WINDOWSNT doesn't have $DISPLAY. */ -#ifndef WINDOWSNT if (MAX_ALLOCA - sizeof "DISPLAY=" < SBYTES (display)) exec_failed (new_argv[0], ENOMEM); -#endif vdata = alloca (sizeof "DISPLAY=" + SBYTES (display)); strcpy (vdata, "DISPLAY="); strcat (vdata, SSDATA (display)); ------------------------------------------------------------ revno: 117836 fixes bug: http://debbugs.gnu.org/18383 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-09-07 12:47:28 -0700 message: Adjust drag-and-drop fix when window is above top. * xselect.c (x_fill_property_data): Don't let sign bit of negative XCDR bleed into XCAR's encoded value. Improve checks for out-of-range data while we're at it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-07 17:31:39 +0000 +++ src/ChangeLog 2014-09-07 19:47:28 +0000 @@ -1,3 +1,10 @@ +2014-09-07 Paul Eggert + + Adjust drag-and-drop fix when window is above top (Bug#18303). + * xselect.c (x_fill_property_data): Don't let sign bit of negative + XCDR bleed into XCAR's encoded value. Improve checks for + out-of-range data while we're at it. + 2014-09-07 Jan Djärv * xselect.c (x_fill_property_data): Handle negative XCDR when data === modified file 'src/xselect.c' --- src/xselect.c 2014-09-07 17:31:39 +0000 +++ src/xselect.c 2014-09-07 19:47:28 +0000 @@ -2300,22 +2300,20 @@ if (INTEGERP (o) || FLOATP (o) || CONSP (o)) { - if (CONSP (o) && INTEGERP (XCAR (o)) && INTEGERP (XCDR (o))) + if (CONSP (o) + && RANGED_INTEGERP (X_LONG_MIN >> 16, XCAR (o), X_LONG_MAX >> 16) + && RANGED_INTEGERP (- (1 << 15), XCDR (o), -1)) { - intmax_t v1 = XINT (XCAR (o)); - intmax_t v2 = XINT (XCDR (o)); + long v1 = XINT (XCAR (o)); + long v2 = XINT (XCDR (o)); /* cons_to_signed does not handle negative values for v2. For XDnd, v2 might be y of a window, and can be negative. The XDnd spec. is not explicit about negative values, - but lets do what it says. - */ - if (v1 < 0 || v2 < 0) - val = (v1 << 16) | v2; - else - val = cons_to_signed (o, LONG_MIN, LONG_MAX); + but let's assume negative v2 is sent modulo 2**16. */ + val = (v1 << 16) | (v2 & 0xffff); } else - val = cons_to_signed (o, LONG_MIN, LONG_MAX); + val = cons_to_signed (o, X_LONG_MIN, X_LONG_MAX); } else if (STRINGP (o)) { @@ -2335,7 +2333,7 @@ } else if (format == 16) { - if (SHRT_MIN <= val && val <= SHRT_MAX) + if (X_SHRT_MIN <= val && val <= X_SHRT_MAX) *d16++ = val; else error ("Out of 'short' range"); ------------------------------------------------------------ revno: 117835 fixes bug: http://debbugs.gnu.org/18303 committer: Jan D. branch nick: trunk timestamp: Sun 2014-09-07 19:31:39 +0200 message: * xselect.c (x_fill_property_data): Handle negative XCDR when data is CONSP. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-07 17:04:19 +0000 +++ src/ChangeLog 2014-09-07 17:31:39 +0000 @@ -1,3 +1,8 @@ +2014-09-07 Jan Djärv + + * xselect.c (x_fill_property_data): Handle negative XCDR when data + is CONSP (Bug#18303). + 2014-09-07 Eli Zaretskii * callproc.c (child_setup) [WINDOWSNT]: Don't call exec_failed if === modified file 'src/xselect.c' --- src/xselect.c 2014-07-18 11:04:37 +0000 +++ src/xselect.c 2014-09-07 17:31:39 +0000 @@ -2299,7 +2299,24 @@ Lisp_Object o = XCAR (iter); if (INTEGERP (o) || FLOATP (o) || CONSP (o)) - val = cons_to_signed (o, LONG_MIN, LONG_MAX); + { + if (CONSP (o) && INTEGERP (XCAR (o)) && INTEGERP (XCDR (o))) + { + intmax_t v1 = XINT (XCAR (o)); + intmax_t v2 = XINT (XCDR (o)); + /* cons_to_signed does not handle negative values for v2. + For XDnd, v2 might be y of a window, and can be negative. + The XDnd spec. is not explicit about negative values, + but lets do what it says. + */ + if (v1 < 0 || v2 < 0) + val = (v1 << 16) | v2; + else + val = cons_to_signed (o, LONG_MIN, LONG_MAX); + } + else + val = cons_to_signed (o, LONG_MIN, LONG_MAX); + } else if (STRINGP (o)) { block_input (); ------------------------------------------------------------ revno: 117834 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2014-09-07 20:04:19 +0300 message: Fix the MS-Windows build broken by SAFE_ALLOCA changes. src/callproc.c (child_setup) [WINDOWSNT]: Don't call exec_failed if 'alloca' gets passed arguments larger than MAX_ALLOCA. src/font.c (MAX): Define if not defined elsewhere. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-07 13:27:33 +0000 +++ src/ChangeLog 2014-09-07 17:04:19 +0000 @@ -1,3 +1,10 @@ +2014-09-07 Eli Zaretskii + + * callproc.c (child_setup) [WINDOWSNT]: Don't call exec_failed if + 'alloca' gets passed arguments larger than MAX_ALLOCA. + + * font.c (MAX): Define if not defined elsewhere. + 2014-09-07 Paul Eggert * keyboard.c (read_decoded_event_from_main_queue): Reinstitute alloca === modified file 'src/callproc.c' --- src/callproc.c 2014-09-07 07:04:01 +0000 +++ src/callproc.c 2014-09-07 17:04:19 +0000 @@ -1213,8 +1213,13 @@ on that. */ pwd_var = xmalloc (i + 5); #else + /* WINDOWSNT doesn't define exec_failed, and doesn't need this + test, since a directory name cannot be longer than 260 + characters, i.e. 260 * 4 = 1040 UTF-8 bytes. */ +#ifndef WINDOWSNT if (MAX_ALLOCA - 5 < i) exec_failed (new_argv[0], ENOMEM); +#endif pwd_var = alloca (i + 5); #endif temp = pwd_var + 4; @@ -1281,8 +1286,10 @@ } /* new_length + 2 to include PWD and terminating 0. */ +#ifndef WINDOWSNT if (MAX_ALLOCA / sizeof *env - 2 < new_length) exec_failed (new_argv[0], ENOMEM); +#endif env = new_env = alloca ((new_length + 2) * sizeof *env); /* If we have a PWD envvar, pass one down, but with corrected value. */ @@ -1291,9 +1298,14 @@ if (STRINGP (display)) { + char *vdata; + + /* WINDOWSNT doesn't have $DISPLAY. */ +#ifndef WINDOWSNT if (MAX_ALLOCA - sizeof "DISPLAY=" < SBYTES (display)) exec_failed (new_argv[0], ENOMEM); - char *vdata = alloca (sizeof "DISPLAY=" + SBYTES (display)); +#endif + vdata = alloca (sizeof "DISPLAY=" + SBYTES (display)); strcpy (vdata, "DISPLAY="); strcat (vdata, SSDATA (display)); new_env = add_env (env, new_env, vdata); === modified file 'src/font.c' --- src/font.c 2014-09-07 07:04:01 +0000 +++ src/font.c 2014-09-07 17:04:19 +0000 @@ -41,6 +41,10 @@ #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ +#ifndef MAX +# define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif + Lisp_Object Qopentype; /* Important character set strings. */ ------------------------------------------------------------ revno: 117833 author: Paul Eggert committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-09-07 06:27:33 -0700 message: * keyboard.c (read_decoded_event_from_main_queue): Reinstitute alloca here for destination buffer, to work around what appears to be a bug in decode_coding_c_string when the source and destination are both C strings. * keyboard.c (echo_add_key, menu_bar_items, tool_bar_items) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-07 07:04:01 +0000 +++ src/ChangeLog 2014-09-07 13:27:33 +0000 @@ -1,5 +1,10 @@ 2014-09-07 Paul Eggert + * keyboard.c (read_decoded_event_from_main_queue): Reinstitute alloca + here for destination buffer, to work around what appears to be a + bug in decode_coding_c_string when the source and destination are + both C strings. + Use SAFE_ALLOCA etc. to avoid unbounded stack allocation (Bug#18410). This follows up on the recent thread in emacs-devel on alloca; see: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00042.html @@ -24,7 +29,8 @@ * ftfont.c (ftfont_get_charset, ftfont_check_otf, ftfont_drive_otf): * ftxfont.c (ftxfont_draw): * image.c (xbm_load, xpm_load, jpeg_load_body): - * keyboard.c (echo_add_key, menu_bar_items, tool_bar_items): + * keyboard.c (echo_add_key, menu_bar_items, tool_bar_items) + * keymap.c (Fdescribe_buffer_bindings, describe_map): * lread.c (openp): * menu.c (digest_single_submenu, find_and_call_menu_selection) === modified file 'src/keyboard.c' --- src/keyboard.c 2014-09-07 07:04:01 +0000 +++ src/keyboard.c 2014-09-07 13:27:33 +0000 @@ -2362,7 +2362,14 @@ if (meta_key != 2) for (i = 0; i < n; i++) src[i] &= ~0x80; - coding->destination = dest; + + /* FIXME: For some reason decode_coding_c_string requires a + fresh output buffer each time, and reusing the old buffer can + make Emacs dump core. Avoid triggering the problem for now + by allocating a new buffer each time through the loop. */ + bool please_fixme = true; + coding->destination = please_fixme ? alloca (n * 4) : dest; + coding->dst_bytes = n * 4; decode_coding_c_string (coding, src, n, Qnil); eassert (coding->produced_char <= n); ------------------------------------------------------------ revno: 117832 committer: Michael Albinus branch nick: trunk timestamp: Sun 2014-09-07 13:02:33 +0200 message: * strings.texi (Text Comparison): Describe `string-collate-equalp' and `string-collate-lessp'. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-09-06 00:59:00 +0000 +++ doc/lispref/ChangeLog 2014-09-07 11:02:33 +0000 @@ -1,3 +1,8 @@ +2014-09-07 Michael Albinus + + * strings.texi (Text Comparison): Describe `string-collate-equalp' + and `string-collate-lessp'. + 2014-09-06 Leo Liu * control.texi (Pattern matching case statement): Document vector === modified file 'doc/lispref/strings.texi' --- doc/lispref/strings.texi 2014-04-24 15:11:04 +0000 +++ doc/lispref/strings.texi 2014-09-07 11:02:33 +0000 @@ -458,6 +458,59 @@ @code{string-equal} is another name for @code{string=}. @end defun +@defun string-collate-equalp string1 string2 &optional locale ignore-case +This function returns @code{t} if @var{string1} and @var{string2} are +equal with respect to collation rules. A collation rule is not only +determined by the lexicographic order of the characters contained in +@var{string1} and @var{string2}, but also further rules about +relations between these characters. Usually, it is defined by the +@var{locale} environment Emacs is running with. + +For example, characters with different coding points but +the same meaning might be considered as equal, like different grave +accent Unicode characters: + +@example +@group +(string-collate-equalp (string ?\uFF40) (string ?\u1FEF)) + @result{} t +@end group +@end example + +The optional argument @var{locale}, a string, overrides the setting of +your current locale identifier for collation. The value is system +dependent; a @var{locale} "en_US.UTF-8" is applicable on POSIX +systems, while it would be, e.g., "enu_USA.1252" on MS-Windows +systems. + +If @var{IGNORE-CASE} is non-nil, characters are converted to lower-case +before comparing them. + +To emulate Unicode-compliant collation on MS-Windows systems, +bind @code{w32-collate-ignore-punctuation} to a non-nil value, since +the codeset part of the locale cannot be "UTF-8" on MS-Windows. + +If your system does not support a locale environment, this function +behaves like @code{string-equal}. + +Do NOT use this function to compare file names for equality, only +for sorting them. +@end defun + +@defun string-prefix-p string1 string2 &optional ignore-case +This function returns non-@code{nil} if @var{string1} is a prefix of +@var{string2}; i.e., if @var{string2} starts with @var{string1}. If +the optional argument @var{ignore-case} is non-@code{nil}, the +comparison ignores case differences. +@end defun + +@defun string-suffix-p suffix string &optional ignore-case +This function returns non-@code{nil} if @var{suffix} is a suffix of +@var{string}; i.e., if @var{string} ends with @var{suffix}. If the +optional argument @var{ignore-case} is non-@code{nil}, the comparison +ignores case differences. +@end defun + @cindex lexical comparison @defun string< string1 string2 @c (findex string< causes problems for permuted index!!) @@ -516,6 +569,50 @@ @code{string-lessp} is another name for @code{string<}. @end defun +@defun string-collate-lessp string1 string2 &optional locale ignore-case +This function returns @code{t} if @var{string1} is less than +@var{string2} in collation order. A collation order is not only +determined by the lexicographic order of the characters contained in +@var{string1} and @var{string2}, but also further rules about +relations between these characters. Usually, it is defined by the +@var{locale} environment Emacs is running with. + +For example, punctuation and whitespace characters might be considered +less significant for @ref{Sorting,,sorting}. + +@example +@group +(sort '("11" "12" "1 1" "1 2" "1.1" "1.2") 'string-collate-lessp) + @result{} ("11" "1 1" "1.1" "12" "1 2" "1.2") +@end group +@end example + +The optional argument @var{locale}, a string, overrides the setting of +your current locale identifier for collation. The value is system +dependent; a @var{locale} "en_US.UTF-8" is applicable on POSIX +systems, while it would be, e.g., "enu_USA.1252" on MS-Windows +systems. The @var{locale} "POSIX" lets @code{string-collate-lessp} +behave like @code{string-lessp}: + +@example +@group +(sort '("11" "12" "1 1" "1 2" "1.1" "1.2") + (lambda (s1 s2) (string-collate-lessp s1 s2 "POSIX"))) + @result{} ("1 1" "1 2" "1.1" "1.2" "11" "12") +@end group +@end example + +If @var{IGNORE-CASE} is non-nil, characters are converted to lower-case +before comparing them. + +To emulate Unicode-compliant collation on MS-Windows systems, +bind @code{w32-collate-ignore-punctuation} to a non-nil value, since +the codeset part of the locale cannot be "UTF-8" on MS-Windows. + +If your system does not support a locale environment, this function +behaves like @code{string-lessp}. +@end defun + @defun string-prefix-p string1 string2 &optional ignore-case This function returns non-@code{nil} if @var{string1} is a prefix of @var{string2}; i.e., if @var{string2} starts with @var{string1}. If ------------------------------------------------------------ revno: 117831 fixes bug: http://debbugs.gnu.org/18415 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-09-07 01:46:42 -0700 message: Expand @AM_DEFAULT_VERBOSITY@ even if Automake is old. * configure.ac: Assume verbose output for older Automake. diff: === modified file 'ChangeLog' --- ChangeLog 2014-09-06 07:40:43 +0000 +++ ChangeLog 2014-09-07 08:46:42 +0000 @@ -1,3 +1,8 @@ +2014-09-07 Paul Eggert + + Expand @AM_DEFAULT_VERBOSITY@ even if Automake is old (Bug#18415). + * configure.ac: Assume verbose output for older Automake. + 2014-09-04 Paul Eggert * configure.ac (MAKEINFO): Clean up some configuration bitrot. === modified file 'configure.ac' --- configure.ac 2014-09-04 02:02:46 +0000 +++ configure.ac 2014-09-07 08:46:42 +0000 @@ -980,6 +980,17 @@ fi fi) +dnl Port to Automake 1.11. +dnl This section can be removed once we assume Automake 1.14 or later. +: ${AM_DEFAULT_VERBOSITY=1} +: ${AM_V=$AM_DEFAULT_VERBOSITY} +: ${AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY} +AC_SUBST([AM_V]) +AM_SUBST_NOTMAKE([AM_V]) +AC_SUBST([AM_DEFAULT_V]) +AM_SUBST_NOTMAKE([AM_DEFAULT_V]) +AC_SUBST([AM_DEFAULT_VERBOSITY]) + dnl Some other nice autoconf tests. dnl These are commented out, since gl_EARLY and/or Autoconf already does them. dnl AC_PROG_INSTALL ------------------------------------------------------------ revno: 117830 committer: Michael Albinus branch nick: trunk timestamp: Sun 2014-09-07 10:24:44 +0200 message: * automated/fns-tests.el (fns-tests--collate-enabled-p): New function. (fns-tests-collate-strings, fns-tests-collate-sort): Use it. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-09-05 13:32:55 +0000 +++ test/ChangeLog 2014-09-07 08:24:44 +0000 @@ -1,3 +1,8 @@ +2014-09-07 Michael Albinus + + * automated/fns-tests.el (fns-tests--collate-enabled-p): New function. + (fns-tests-collate-strings, fns-tests-collate-sort): Use it. + 2014-09-05 Michael Albinus * automated/fns-tests.el (fns-tests-compare-strings): In case === modified file 'test/automated/fns-tests.el' --- test/automated/fns-tests.el 2014-09-05 13:32:55 +0000 +++ test/automated/fns-tests.el 2014-09-07 08:24:44 +0000 @@ -101,10 +101,19 @@ (should (= (compare-strings "んにちはｺﾝﾆﾁﾊこ" nil nil "こんにちはｺﾝﾆﾁﾊ" nil nil) 1)) (should (= (compare-strings "こんにちはｺﾝﾆﾁﾊ" nil nil "んにちはｺﾝﾆﾁﾊこ" nil nil) -1))) +(defun fns-tests--collate-enabled-p () + "Check whether collation functions are enabled." + (and + ;; When there is no collation library, collation functions fall back + ;; to their lexicographic counterparts. We don't need to test then. + (not (ignore-errors (string-collate-equalp "" "" t))) + ;; We use a locale, which might not be installed. Check it. + (ignore-errors + (string-collate-equalp + "" "" (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8"))))) + (ert-deftest fns-tests-collate-strings () - ;; When there is no collation library, collation functions fall back - ;; to their lexicographic counterparts. We don't need to test then. - (skip-unless (not (ignore-errors (string-collate-equalp "" "" t)))) + (skip-unless (fns-tests--collate-enabled-p)) (should (string-collate-equalp "xyzzy" "xyzzy")) (should-not (string-collate-equalp "xyzzy" "XYZZY")) @@ -146,6 +155,8 @@ (9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")]))) (ert-deftest fns-tests-collate-sort () + (skip-unless (fns-tests--collate-enabled-p)) + ;; Punctuation and whitespace characters are relevant for POSIX. (should (equal ------------------------------------------------------------ revno: 117829 fixes bug: http://debbugs.gnu.org/18410 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-09-07 00:04:01 -0700 message: Use SAFE_ALLOCA etc. to avoid unbounded stack allocation. This follows up on the recent thread in emacs-devel on alloca; see: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00042.html This patch also cleans up alloca-related glitches noted while examining the code looking for unbounded alloca. * alloc.c (listn): * callproc.c (init_callproc): Rewrite to avoid need for alloca. * buffer.c (mouse_face_overlay_overlaps) (report_overlay_modification): * buffer.h (GET_OVERLAYS_AT): * coding.c (make_subsidiaries): * doc.c (Fsnarf_documentation): * editfns.c (Fuser_full_name): * fileio.c (Ffile_name_directory, Fexpand_file_name) (search_embedded_absfilename, Fsubstitute_in_file_name): * fns.c (Fmake_hash_table): * font.c (font_vconcat_entity_vectors, font_update_drivers): * fontset.c (fontset_pattern_regexp, Ffontset_info): * frame.c (Fmake_terminal_frame, x_set_frame_parameters) (xrdb_get_resource, x_get_resource_string): * ftfont.c (ftfont_get_charset, ftfont_check_otf, ftfont_drive_otf): * ftxfont.c (ftxfont_draw): * image.c (xbm_load, xpm_load, jpeg_load_body): * keyboard.c (echo_add_key, menu_bar_items, tool_bar_items): * keymap.c (Fdescribe_buffer_bindings, describe_map): * lread.c (openp): * menu.c (digest_single_submenu, find_and_call_menu_selection) (find_and_return_menu_selection): * print.c (PRINTFINISH): * process.c (Fformat_network_address): * scroll.c (do_scrolling, do_direct_scrolling, scrolling_1): * search.c (search_buffer, Fmatch_data, Fregexp_quote): * sound.c (wav_play, au_play): * syntax.c (skip_chars): * term.c (tty_menu_activate, tty_menu_show): * textprop.c (get_char_property_and_overlay): * window.c (Fset_window_configuration): * xdisp.c (safe__call, next_overlay_change, vmessage) (compute_overhangs_and_x, draw_glyphs, note_mouse_highlight): * xfaces.c (face_at_buffer_position): * xmenu.c (x_menu_show): Use SAFE_ALLOCA etc. instead of plain alloca, since the allocation size isn't bounded. * callint.c (Fcall_interactively): Redo memory_full check so that it can be done at compile-time on some platforms. * coding.c (MAX_LOOKUP_MAX): New constant. (get_translation_table): Use it. * callproc.c (call_process): Use SAFE_NALLOCA instead of SAFE_ALLOCA, to catch integer overflows on size calculation. (exec_failed) [!DOS_NT]: New function. (child_setup) [!DOS_NT]: Use it. * editfns.c (Ftranspose_regions): Hoist USE_SAFE_ALLOC + SAFE_FREE out of 'if'. * editfns.c (check_translation): Allocate larger buffers on the heap. * eval.c (internal_lisp_condition_case): Check for MAX_ALLOCA overflow. * fns.c (sort_vector): Use SAFE_ALLOCA_LISP rather than Fmake_vector. (Fbase64_encode_region, Fbase64_decode_region): Avoid unnecessary calls to SAFE_FREE before 'error'. * buffer.c (mouse_face_overlay_overlaps): * editfns.c (Fget_pos_property, check_translation): * eval.c (Ffuncall): * font.c (font_unparse_xlfd, font_find_for_lface): * ftfont.c (ftfont_drive_otf): * keyboard.c (echo_add_key, read_decoded_event_from_main_queue) (menu_bar_items, tool_bar_items): * sound.c (Fplay_sound_internal): * xdisp.c (load_overlay_strings, dump_glyph_row): Use an ordinary auto buffer rather than alloca, since the allocation size is fixed and small. * ftfont.c: Include . (matching_prefix): New function. (get_adstyle_property): Use it, to avoid need for alloca. * keyboard.c (echo_add_key): * keymap.c (describe_map): Use ptrdiff_t, not int. * keyboard.c (echo_add_key): Prefer sizeof to strlen. * keymap.c (Fdescribe_buffer_bindings): Use SBYTES, not SCHARS, when counting bytes. * lisp.h (xlispstrdupa): Remove, replacing with ... (SAFE_ALLOCA_STRING): ... new macro with different API. This fixes a portability problem, namely, alloca result passed to another function. All uses changed. (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Check for MAX_ALLOCA, not MAX_ALLOCA - 1. * regex.c (REGEX_USE_SAFE_ALLOCA, REGEX_SAFE_FREE) (REGEX_ALLOCATE): New macros. (REGEX_REALLOCATE, REGEX_ALLOCATE_STACK, REGEX_REALLOCATE_STACK) (REGEX_FREE_STACK, FREE_VARIABLES, re_match_2_internal): Use them. * xdisp.c (message3): Use SAFE_ALLOCA_STRING rather than doing it by hand. (decode_mode_spec_coding): Store directly into buf rather than into an alloca temporary and copying the temporary to the buf. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-06 07:40:43 +0000 +++ src/ChangeLog 2014-09-07 07:04:01 +0000 @@ -1,3 +1,101 @@ +2014-09-07 Paul Eggert + + Use SAFE_ALLOCA etc. to avoid unbounded stack allocation (Bug#18410). + This follows up on the recent thread in emacs-devel on alloca; see: + http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00042.html + This patch also cleans up alloca-related glitches noted while + examining the code looking for unbounded alloca. + * alloc.c (listn): + * callproc.c (init_callproc): + Rewrite to avoid need for alloca. + * buffer.c (mouse_face_overlay_overlaps) + (report_overlay_modification): + * buffer.h (GET_OVERLAYS_AT): + * coding.c (make_subsidiaries): + * doc.c (Fsnarf_documentation): + * editfns.c (Fuser_full_name): + * fileio.c (Ffile_name_directory, Fexpand_file_name) + (search_embedded_absfilename, Fsubstitute_in_file_name): + * fns.c (Fmake_hash_table): + * font.c (font_vconcat_entity_vectors, font_update_drivers): + * fontset.c (fontset_pattern_regexp, Ffontset_info): + * frame.c (Fmake_terminal_frame, x_set_frame_parameters) + (xrdb_get_resource, x_get_resource_string): + * ftfont.c (ftfont_get_charset, ftfont_check_otf, ftfont_drive_otf): + * ftxfont.c (ftxfont_draw): + * image.c (xbm_load, xpm_load, jpeg_load_body): + * keyboard.c (echo_add_key, menu_bar_items, tool_bar_items): + * keymap.c (Fdescribe_buffer_bindings, describe_map): + * lread.c (openp): + * menu.c (digest_single_submenu, find_and_call_menu_selection) + (find_and_return_menu_selection): + * print.c (PRINTFINISH): + * process.c (Fformat_network_address): + * scroll.c (do_scrolling, do_direct_scrolling, scrolling_1): + * search.c (search_buffer, Fmatch_data, Fregexp_quote): + * sound.c (wav_play, au_play): + * syntax.c (skip_chars): + * term.c (tty_menu_activate, tty_menu_show): + * textprop.c (get_char_property_and_overlay): + * window.c (Fset_window_configuration): + * xdisp.c (safe__call, next_overlay_change, vmessage) + (compute_overhangs_and_x, draw_glyphs, note_mouse_highlight): + * xfaces.c (face_at_buffer_position): + * xmenu.c (x_menu_show): + Use SAFE_ALLOCA etc. instead of plain alloca, since the + allocation size isn't bounded. + * callint.c (Fcall_interactively): Redo memory_full check + so that it can be done at compile-time on some platforms. + * coding.c (MAX_LOOKUP_MAX): New constant. + (get_translation_table): Use it. + * callproc.c (call_process): Use SAFE_NALLOCA instead of + SAFE_ALLOCA, to catch integer overflows on size calculation. + (exec_failed) [!DOS_NT]: New function. + (child_setup) [!DOS_NT]: Use it. + * editfns.c (Ftranspose_regions): + Hoist USE_SAFE_ALLOC + SAFE_FREE out of 'if'. + * editfns.c (check_translation): + Allocate larger buffers on the heap. + * eval.c (internal_lisp_condition_case): + Check for MAX_ALLOCA overflow. + * fns.c (sort_vector): Use SAFE_ALLOCA_LISP rather than Fmake_vector. + (Fbase64_encode_region, Fbase64_decode_region): + Avoid unnecessary calls to SAFE_FREE before 'error'. + * buffer.c (mouse_face_overlay_overlaps): + * editfns.c (Fget_pos_property, check_translation): + * eval.c (Ffuncall): + * font.c (font_unparse_xlfd, font_find_for_lface): + * ftfont.c (ftfont_drive_otf): + * keyboard.c (echo_add_key, read_decoded_event_from_main_queue) + (menu_bar_items, tool_bar_items): + * sound.c (Fplay_sound_internal): + * xdisp.c (load_overlay_strings, dump_glyph_row): + Use an ordinary auto buffer rather than alloca, since the + allocation size is fixed and small. + * ftfont.c: Include . + (matching_prefix): New function. + (get_adstyle_property): Use it, to avoid need for alloca. + * keyboard.c (echo_add_key): + * keymap.c (describe_map): Use ptrdiff_t, not int. + * keyboard.c (echo_add_key): Prefer sizeof to strlen. + * keymap.c (Fdescribe_buffer_bindings): Use SBYTES, not SCHARS, + when counting bytes. + * lisp.h (xlispstrdupa): Remove, replacing with ... + (SAFE_ALLOCA_STRING): ... new macro with different API. + This fixes a portability problem, namely, alloca result + passed to another function. All uses changed. + (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Check for MAX_ALLOCA, + not MAX_ALLOCA - 1. + * regex.c (REGEX_USE_SAFE_ALLOCA, REGEX_SAFE_FREE) + (REGEX_ALLOCATE): New macros. + (REGEX_REALLOCATE, REGEX_ALLOCATE_STACK, REGEX_REALLOCATE_STACK) + (REGEX_FREE_STACK, FREE_VARIABLES, re_match_2_internal): + Use them. + * xdisp.c (message3): Use SAFE_ALLOCA_STRING rather than doing it + by hand. + (decode_mode_spec_coding): Store directly into buf rather than + into an alloca temporary and copying the temporary to the buf. + 2014-09-06 Eli Zaretskii * Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416) === modified file 'src/alloc.c' --- src/alloc.c 2014-08-29 07:29:47 +0000 +++ src/alloc.c 2014-09-07 07:04:01 +0000 @@ -2618,29 +2618,28 @@ Lisp_Object listn (enum constype type, ptrdiff_t count, Lisp_Object arg, ...) { + Lisp_Object (*cons) (Lisp_Object, Lisp_Object); + switch (type) + { + case CONSTYPE_PURE: cons = pure_cons; break; + case CONSTYPE_HEAP: cons = Fcons; break; + default: emacs_abort (); + } + + eassume (0 < count); + Lisp_Object val = cons (arg, Qnil); + Lisp_Object tail = val; + va_list ap; - ptrdiff_t i; - Lisp_Object val, *objp; - - /* Change to SAFE_ALLOCA if you hit this eassert. */ - eassert (count <= MAX_ALLOCA / word_size); - - objp = alloca (count * word_size); - objp[0] = arg; va_start (ap, arg); - for (i = 1; i < count; i++) - objp[i] = va_arg (ap, Lisp_Object); - va_end (ap); - - for (val = Qnil, i = count - 1; i >= 0; i--) + for (ptrdiff_t i = 1; i < count; i++) { - if (type == CONSTYPE_PURE) - val = pure_cons (objp[i], val); - else if (type == CONSTYPE_HEAP) - val = Fcons (objp[i], val); - else - emacs_abort (); + Lisp_Object elem = cons (va_arg (ap, Lisp_Object), Qnil); + XSETCDR (tail, elem); + tail = elem; } + va_end (ap); + return val; } @@ -3620,7 +3619,7 @@ p->data[1].object = b; return val; } - + #if ! (defined USE_X_TOOLKIT || defined USE_GTK) Lisp_Object make_save_ptr_ptr (void *a, void *b) === modified file 'src/buffer.c' --- src/buffer.c 2014-09-03 15:10:29 +0000 +++ src/buffer.c 2014-09-07 07:04:01 +0000 @@ -3053,13 +3053,15 @@ ptrdiff_t end = OVERLAY_POSITION (OVERLAY_END (overlay)); ptrdiff_t n, i, size; Lisp_Object *v, tem; + Lisp_Object vbuf[10]; + USE_SAFE_ALLOCA; - size = 10; - v = alloca (size * sizeof *v); + size = ARRAYELTS (vbuf); + v = vbuf; n = overlays_in (start, end, 0, &v, &size, NULL, NULL); if (n > size) { - v = alloca (n * sizeof *v); + SAFE_NALLOCA (v, 1, n); overlays_in (start, end, 0, &v, &n, NULL, NULL); } @@ -3069,6 +3071,7 @@ !NILP (tem))) break; + SAFE_FREE (); return i < n; } @@ -4517,13 +4520,13 @@ First copy the vector contents, in case some of these hooks do subsequent modification of the buffer. */ ptrdiff_t size = last_overlay_modification_hooks_used; - Lisp_Object *copy = alloca (size * sizeof *copy); + Lisp_Object *copy; ptrdiff_t i; + USE_SAFE_ALLOCA; + SAFE_ALLOCA_LISP (copy, size); memcpy (copy, XVECTOR (last_overlay_modification_hooks)->contents, size * word_size); - gcpro1.var = copy; - gcpro1.nvars = size; for (i = 0; i < size;) { @@ -4532,6 +4535,8 @@ overlay_i = copy[i++]; call_overlay_mod_hooks (prop_i, overlay_i, after, arg1, arg2, arg3); } + + SAFE_FREE (); } UNGCPRO; } === modified file 'src/buffer.h' --- src/buffer.h 2014-09-02 11:41:22 +0000 +++ src/buffer.h 2014-09-07 07:04:01 +0000 @@ -1127,15 +1127,15 @@ #define GET_OVERLAYS_AT(posn, overlays, noverlays, nextp, chrq) \ do { \ ptrdiff_t maxlen = 40; \ - overlays = alloca (maxlen * sizeof *overlays); \ - noverlays = overlays_at (posn, false, &overlays, &maxlen, \ - nextp, NULL, chrq); \ - if (noverlays > maxlen) \ + SAFE_NALLOCA (overlays, 1, maxlen); \ + (noverlays) = overlays_at (posn, false, &(overlays), &maxlen, \ + nextp, NULL, chrq); \ + if ((noverlays) > maxlen) \ { \ maxlen = noverlays; \ - overlays = alloca (maxlen * sizeof *overlays); \ - noverlays = overlays_at (posn, false, &overlays, &maxlen, \ - nextp, NULL, chrq); \ + SAFE_NALLOCA (overlays, 1, maxlen); \ + (noverlays) = overlays_at (posn, false, &(overlays), &maxlen, \ + nextp, NULL, chrq); \ } \ } while (false) === modified file 'src/callint.c' --- src/callint.c 2014-06-17 13:50:22 +0000 +++ src/callint.c 2014-09-07 07:04:01 +0000 @@ -297,6 +297,7 @@ Lisp_Object teml; Lisp_Object up_event; Lisp_Object enable; + USE_SAFE_ALLOCA; ptrdiff_t speccount = SPECPDL_INDEX (); /* The index of the next element of this_command_keys to examine for @@ -366,12 +367,8 @@ wrong_type_argument (Qcommandp, function); } - /* If SPECS is set to a string, use it as an interactive prompt. */ - if (STRINGP (specs)) - /* Make a copy of string so that if a GC relocates specs, - `string' will still be valid. */ - string = xlispstrdupa (specs); - else + /* If SPECS is not a string, invent one. */ + if (! STRINGP (specs)) { Lisp_Object input; Lisp_Object funval = Findirect_function (function, Qt); @@ -416,10 +413,16 @@ args[0] = Qfuncall_interactively; args[1] = function; args[2] = specs; - return unbind_to (speccount, Fapply (3, args)); + Lisp_Object result = unbind_to (speccount, Fapply (3, args)); + SAFE_FREE (); + return result; } } + /* SPECS is set to a string; use it as an interactive prompt. + Copy it so that STRING will be valid even if a GC relocates SPECS. */ + SAFE_ALLOCA_STRING (string, specs); + /* Here if function specifies a string to control parsing the defaults. */ /* Set next_event to point to the first event with parameters. */ @@ -507,14 +510,15 @@ break; } - if (min (MOST_POSITIVE_FIXNUM, - min (PTRDIFF_MAX, SIZE_MAX) / word_size) - < nargs) + if (MOST_POSITIVE_FIXNUM < min (PTRDIFF_MAX, SIZE_MAX) / word_size + && MOST_POSITIVE_FIXNUM < nargs) memory_full (SIZE_MAX); - args = alloca (nargs * sizeof *args); - visargs = alloca (nargs * sizeof *visargs); - varies = alloca (nargs * sizeof *varies); + /* Allocate them all at one go. This wastes a bit of memory, but + it's OK to trade space for speed. */ + SAFE_NALLOCA (args, 3, nargs); + visargs = args + nargs; + varies = (signed char *) (visargs + nargs); for (i = 0; i < nargs; i++) { @@ -871,7 +875,9 @@ { Lisp_Object val = Ffuncall (nargs, args); UNGCPRO; - return unbind_to (speccount, val); + val = unbind_to (speccount, val); + SAFE_FREE (); + return val; } } === modified file 'src/callproc.c' --- src/callproc.c 2014-09-02 06:49:40 +0000 +++ src/callproc.c 2014-09-07 07:04:01 +0000 @@ -466,7 +466,7 @@ && SREF (path, 1) == ':') path = Fsubstring (path, make_number (2), Qnil); - new_argv = SAFE_ALLOCA ((nargs > 4 ? nargs - 2 : 2) * sizeof *new_argv); + SAFE_NALLOCA (new_argv, 1, nargs < 4 ? 2 : nargs - 2); { struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; @@ -1151,6 +1151,25 @@ return new_env; } +#ifndef DOS_NT + +/* 'exec' failed inside a child running NAME, with error number ERR. + Report the error and exit the child. */ + +static _Noreturn void +exec_failed (char const *name, int err) +{ + /* Avoid deadlock if the child's perror writes to a full pipe; the + pipe's reader is the parent, but with vfork the parent can't + run until the child exits. Truncate the diagnostic instead. */ + fcntl (STDERR_FILENO, F_SETFL, O_NONBLOCK); + + errno = err; + emacs_perror (name); + _exit (err == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); +} +#endif + /* This is the last thing run in a newly forked inferior either synchronous or asynchronous. Copy descriptors IN, OUT and ERR as descriptors 0, 1 and 2. @@ -1174,8 +1193,6 @@ int cpid; HANDLE handles[3]; #else - int exec_errno; - pid_t pid = getpid (); #endif /* WINDOWSNT */ @@ -1196,6 +1213,8 @@ on that. */ pwd_var = xmalloc (i + 5); #else + if (MAX_ALLOCA - 5 < i) + exec_failed (new_argv[0], ENOMEM); pwd_var = alloca (i + 5); #endif temp = pwd_var + 4; @@ -1262,6 +1281,8 @@ } /* new_length + 2 to include PWD and terminating 0. */ + if (MAX_ALLOCA / sizeof *env - 2 < new_length) + exec_failed (new_argv[0], ENOMEM); env = new_env = alloca ((new_length + 2) * sizeof *env); /* If we have a PWD envvar, pass one down, but with corrected value. */ @@ -1270,6 +1291,8 @@ if (STRINGP (display)) { + if (MAX_ALLOCA - sizeof "DISPLAY=" < SBYTES (display)) + exec_failed (new_argv[0], ENOMEM); char *vdata = alloca (sizeof "DISPLAY=" + SBYTES (display)); strcpy (vdata, "DISPLAY="); strcat (vdata, SSDATA (display)); @@ -1345,16 +1368,7 @@ tcsetpgrp (0, pid); execve (new_argv[0], new_argv, env); - exec_errno = errno; - - /* Avoid deadlock if the child's perror writes to a full pipe; the - pipe's reader is the parent, but with vfork the parent can't - run until the child exits. Truncate the diagnostic instead. */ - fcntl (STDERR_FILENO, F_SETFL, O_NONBLOCK); - - errno = exec_errno; - emacs_perror (new_argv[0]); - _exit (exec_errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); + exec_failed (new_argv[0], errno); #else /* MSDOS */ pid = run_msdos_command (new_argv, pwd_var + 4, in, out, err, env); @@ -1543,20 +1557,13 @@ void init_callproc (void) { - char *data_dir = egetenv ("EMACSDATA"); + bool data_dir = egetenv ("EMACSDATA") != 0; - register char * sh; + char *sh; Lisp_Object tempdir; #ifdef HAVE_NS if (data_dir == 0) - { - const char *etc_dir = ns_etc_directory (); - if (etc_dir) - { - data_dir = alloca (strlen (etc_dir) + 1); - strcpy (data_dir, etc_dir); - } - } + data_dir == ns_etc_directory () != 0; #endif if (!NILP (Vinstallation_directory)) === modified file 'src/coding.c' --- src/coding.c 2014-08-11 00:59:34 +0000 +++ src/coding.c 2014-09-07 07:04:01 +0000 @@ -6867,6 +6867,11 @@ } +/* MAX_LOOKUP's maximum value. MAX_LOOKUP is an int and so cannot + exceed INT_MAX. Also, MAX_LOOKUP is multiplied by sizeof (int) for + alloca, so it cannot exceed MAX_ALLOCA / sizeof (int). */ +enum { MAX_LOOKUP_MAX = min (INT_MAX, MAX_ALLOCA / sizeof (int)) }; + /* Return a translation table (or list of them) from coding system attribute vector ATTRS for encoding (if ENCODEP) or decoding (if not ENCODEP). */ @@ -6919,7 +6924,7 @@ { val = XCHAR_TABLE (translation_table)->extras[1]; if (NATNUMP (val) && *max_lookup < XFASTINT (val)) - *max_lookup = XFASTINT (val); + *max_lookup = min (XFASTINT (val), MAX_LOOKUP_MAX); } else if (CONSP (translation_table)) { @@ -6931,7 +6936,7 @@ { Lisp_Object tailval = XCHAR_TABLE (XCAR (tail))->extras[1]; if (NATNUMP (tailval) && *max_lookup < XFASTINT (tailval)) - *max_lookup = XFASTINT (tailval); + *max_lookup = min (XFASTINT (tailval), MAX_LOOKUP_MAX); } } } @@ -10011,7 +10016,8 @@ { Lisp_Object subsidiaries; ptrdiff_t base_name_len = SBYTES (SYMBOL_NAME (base)); - char *buf = alloca (base_name_len + 6); + USE_SAFE_ALLOCA; + char *buf = SAFE_ALLOCA (base_name_len + 6); int i; memcpy (buf, SDATA (SYMBOL_NAME (base)), base_name_len); @@ -10021,6 +10027,7 @@ strcpy (buf + base_name_len, suffixes[i]); ASET (subsidiaries, i, intern (buf)); } + SAFE_FREE (); return subsidiaries; } === modified file 'src/doc.c' --- src/doc.c 2014-04-05 19:30:36 +0000 +++ src/doc.c 2014-09-07 07:04:01 +0000 @@ -561,6 +561,8 @@ char *p, *name; bool skip_file = 0; ptrdiff_t count; + char const *dirname; + ptrdiff_t dirlen; /* Preloaded defcustoms using custom-initialize-delay are added to this list, but kept unbound. See http://debbugs.gnu.org/11565 */ Lisp_Object delayed_init = @@ -577,15 +579,21 @@ (0) #endif /* CANNOT_DUMP */ { - name = alloca (SCHARS (filename) + 14); - strcpy (name, "../etc/"); + static char const sibling_etc[] = "../etc/"; + dirname = sibling_etc; + dirlen = sizeof sibling_etc - 1; } else { CHECK_STRING (Vdoc_directory); - name = alloca (SCHARS (filename) + SCHARS (Vdoc_directory) + 1); - strcpy (name, SSDATA (Vdoc_directory)); + dirname = SSDATA (Vdoc_directory); + dirlen = SBYTES (Vdoc_directory); } + + count = SPECPDL_INDEX (); + USE_SAFE_ALLOCA; + name = SAFE_ALLOCA (dirlen + SBYTES (filename) + 1); + strcpy (name, dirname); strcat (name, SSDATA (filename)); /*** Add this line ***/ /* Vbuild_files is nil when temacs is run, and non-nil after that. */ @@ -608,7 +616,6 @@ report_file_errno ("Opening doc string file", build_string (name), open_errno); } - count = SPECPDL_INDEX (); record_unwind_protect_int (close_file_unwind, fd); Vdoc_file_name = filename; filled = 0; @@ -637,7 +644,7 @@ && (end[-1] == 'o' || end[-1] == 'c')) { ptrdiff_t len = end - p - 2; - char *fromfile = alloca (len + 1); + char *fromfile = SAFE_ALLOCA (len + 1); memcpy (fromfile, &p[2], len); fromfile[len] = 0; if (fromfile[len-1] == 'c') @@ -688,6 +695,8 @@ filled -= end - buf; memmove (buf, end, filled); } + + SAFE_FREE (); return unbind_to (count, Qnil); } === modified file 'src/editfns.c' --- src/editfns.c 2014-08-07 10:15:52 +0000 +++ src/editfns.c 2014-09-07 07:04:01 +0000 @@ -376,13 +376,14 @@ set_buffer_temp (XBUFFER (object)); /* First try with room for 40 overlays. */ - noverlays = 40; - overlay_vec = alloca (noverlays * sizeof *overlay_vec); + Lisp_Object overlay_vecbuf[40]; + noverlays = ARRAYELTS (overlay_vecbuf); + overlay_vec = overlay_vecbuf; noverlays = overlays_around (posn, overlay_vec, noverlays); /* If there are more than 40, make enough space for all, and try again. */ - if (noverlays > 40) + if (ARRAYELTS (overlay_vecbuf) < noverlays) { SAFE_ALLOCA_LISP (overlay_vec, noverlays); noverlays = overlays_around (posn, overlay_vec, noverlays); @@ -1325,17 +1326,16 @@ /* Substitute the login name for the &, upcasing the first character. */ if (q) { - register char *r; - Lisp_Object login; - - login = Fuser_login_name (make_number (pw->pw_uid)); - r = alloca (strlen (p) + SCHARS (login) + 1); + Lisp_Object login = Fuser_login_name (make_number (pw->pw_uid)); + USE_SAFE_ALLOCA; + char *r = SAFE_ALLOCA (strlen (p) + SBYTES (login) + 1); memcpy (r, p, q - p); r[q - p] = 0; strcat (r, SSDATA (login)); r[q - p] = upcase ((unsigned char) r[q - p]); strcat (r, q + 1); full = build_string (r); + SAFE_FREE (); } #endif /* AMPERSAND_FULL_NAME */ @@ -3012,8 +3012,12 @@ check_translation (ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t end, Lisp_Object val) { - int buf_size = 16, buf_used = 0; - int *buf = alloca (sizeof (int) * buf_size); + int initial_buf[16]; + int *buf = initial_buf; + ptrdiff_t buf_size = ARRAYELTS (initial_buf); + int *bufalloc = 0; + ptrdiff_t buf_used = 0; + Lisp_Object result = Qnil; for (; CONSP (val); val = XCDR (val)) { @@ -3038,12 +3042,11 @@ if (buf_used == buf_size) { - int *newbuf; - - buf_size += 16; - newbuf = alloca (sizeof (int) * buf_size); - memcpy (newbuf, buf, sizeof (int) * buf_used); - buf = newbuf; + bufalloc = xpalloc (bufalloc, &buf_size, 1, -1, + sizeof *bufalloc); + if (buf == initial_buf) + memcpy (bufalloc, buf, sizeof initial_buf); + buf = bufalloc; } buf[buf_used++] = STRING_CHAR_AND_LENGTH (p, len1); pos_byte += len1; @@ -3052,10 +3055,15 @@ break; } if (i == len) - return XCAR (val); + { + result = XCAR (val); + break; + } } } - return Qnil; + + xfree (bufalloc); + return result; } @@ -4617,11 +4625,11 @@ if (tmp_interval3) set_text_properties_1 (startr1, endr2, Qnil, buf, tmp_interval3); + USE_SAFE_ALLOCA; + /* First region smaller than second. */ if (len1_byte < len2_byte) { - USE_SAFE_ALLOCA; - temp = SAFE_ALLOCA (len2_byte); /* Don't precompute these addresses. We have to compute them @@ -4633,21 +4641,19 @@ memcpy (temp, start2_addr, len2_byte); memcpy (start1_addr + len2_byte, start1_addr, len1_byte); memcpy (start1_addr, temp, len2_byte); - SAFE_FREE (); } else /* First region not smaller than second. */ { - USE_SAFE_ALLOCA; - temp = SAFE_ALLOCA (len1_byte); start1_addr = BYTE_POS_ADDR (start1_byte); start2_addr = BYTE_POS_ADDR (start2_byte); memcpy (temp, start1_addr, len1_byte); memcpy (start1_addr, start2_addr, len2_byte); memcpy (start1_addr + len2_byte, temp, len1_byte); - SAFE_FREE (); } + + SAFE_FREE (); graft_intervals_into_buffer (tmp_interval1, start1 + len2, len1, current_buffer, 0); graft_intervals_into_buffer (tmp_interval2, start1, === modified file 'src/eval.c' --- src/eval.c 2014-09-03 04:21:40 +0000 +++ src/eval.c 2014-09-07 07:04:01 +0000 @@ -1272,7 +1272,10 @@ { /* The first clause is the one that should be checked first, so it should be added to handlerlist last. So we build in `clauses' a table that - contains `handlers' but in reverse order. */ + contains `handlers' but in reverse order. SAFE_ALLOCA won't work + here due to the setjmp, so impose a MAX_ALLOCA limit. */ + if (MAX_ALLOCA / word_size < clausenb) + memory_full (SIZE_MAX); Lisp_Object *clauses = alloca (clausenb * sizeof *clauses); Lisp_Object *volatile clauses_volatile = clauses; int i = clausenb; @@ -1311,7 +1314,7 @@ return val; } } - } + } val = eval_sub (bodyform); handlerlist = oldhandlerlist; @@ -2789,10 +2792,11 @@ val = (XSUBR (fun)->function.aMANY) (numargs, args + 1); else { + Lisp_Object internal_argbuf[8]; if (XSUBR (fun)->max_args > numargs) { - internal_args = alloca (XSUBR (fun)->max_args - * sizeof *internal_args); + eassert (XSUBR (fun)->max_args <= ARRAYELTS (internal_argbuf)); + internal_args = internal_argbuf; memcpy (internal_args, args + 1, numargs * word_size); for (i = numargs; i < XSUBR (fun)->max_args; i++) internal_args[i] = Qnil; === modified file 'src/fileio.c' --- src/fileio.c 2014-09-02 18:05:00 +0000 +++ src/fileio.c 2014-09-07 07:04:01 +0000 @@ -396,13 +396,6 @@ Given a Unix syntax file name, returns a string ending in slash. */) (Lisp_Object filename) { -#ifndef DOS_NT - register const char *beg; -#else - register char *beg; - Lisp_Object tem_fn; -#endif - register const char *p; Lisp_Object handler; CHECK_STRING (filename); @@ -417,12 +410,8 @@ return STRINGP (handled_name) ? handled_name : Qnil; } -#ifdef DOS_NT - beg = xlispstrdupa (filename); -#else - beg = SSDATA (filename); -#endif - p = beg + SBYTES (filename); + char *beg = SSDATA (filename); + char const *p = beg + SBYTES (filename); while (p != beg && !IS_DIRECTORY_SEP (p[-1]) #ifdef DOS_NT @@ -438,6 +427,11 @@ return Qnil; #ifdef DOS_NT /* Expansion of "c:" to drive and default directory. */ + Lisp_Object tem_fn; + USE_SAFE_ALLOCA; + SAFE_ALLOCA_STRING (beg, filename); + p = beg + (p - SSDATA (filename)); + if (p[-1] == ':') { /* MAXPATHLEN+1 is guaranteed to be enough space for getdefdir. */ @@ -481,6 +475,7 @@ dostounix_filename (beg); tem_fn = make_specified_string (beg, -1, p - beg, 0); } + SAFE_FREE (); return tem_fn; #else /* DOS_NT */ return make_specified_string (beg, -1, p - beg, STRING_MULTIBYTE (filename)); @@ -1019,7 +1014,7 @@ #endif /* Make a local copy of NAME to protect it from GC in DECODE_FILE below. */ - nm = xlispstrdupa (name); + SAFE_ALLOCA_STRING (nm, name); nmlim = nm + SBYTES (name); #ifdef DOS_NT @@ -1122,12 +1117,12 @@ if (!NILP (Vw32_downcase_file_names)) name = Fdowncase (name); #endif +#else /* not DOS_NT */ + if (strcmp (nm, SSDATA (name)) != 0) + name = make_specified_string (nm, -1, nmlim - nm, multibyte); +#endif /* not DOS_NT */ + SAFE_FREE (); return name; -#else /* not DOS_NT */ - if (strcmp (nm, SSDATA (name)) == 0) - return name; - return make_specified_string (nm, -1, nmlim - nm, multibyte); -#endif /* not DOS_NT */ } } @@ -1729,7 +1724,8 @@ for (s = p; *s && !IS_DIRECTORY_SEP (*s); s++); if (p[0] == '~' && s > p + 1) /* We've got "/~something/". */ { - char *o = alloca (s - p + 1); + USE_SAFE_ALLOCA; + char *o = SAFE_ALLOCA (s - p + 1); struct passwd *pw; memcpy (o, p, s - p); o [s - p] = 0; @@ -1740,6 +1736,7 @@ block_input (); pw = getpwnam (o + 1); unblock_input (); + SAFE_FREE (); if (pw) return p; } @@ -1788,7 +1785,8 @@ /* Always work on a copy of the string, in case GC happens during decode of environment variables, causing the original Lisp_String data to be relocated. */ - nm = xlispstrdupa (filename); + USE_SAFE_ALLOCA; + SAFE_ALLOCA_STRING (nm, filename); #ifdef DOS_NT dostounix_filename (nm); @@ -1802,8 +1800,13 @@ /* Start over with the new string, so we check the file-name-handler again. Important with filenames like "/home/foo//:/hello///there" which would substitute to "/:/hello///there" rather than "/there". */ - return Fsubstitute_in_file_name - (make_specified_string (p, -1, endp - p, multibyte)); + { + Lisp_Object result + = (Fsubstitute_in_file_name + (make_specified_string (p, -1, endp - p, multibyte))); + SAFE_FREE (); + return result; + } /* See if any variables are substituted into the string. */ @@ -1825,6 +1828,7 @@ if (!NILP (Vw32_downcase_file_names)) filename = Fdowncase (filename); #endif + SAFE_FREE (); return filename; } @@ -1843,14 +1847,14 @@ { Lisp_Object xname = make_specified_string (xnm, -1, x - xnm, multibyte); - xname = Fdowncase (xname); - return xname; + filename = Fdowncase (xname); } else #endif - return (xnm == SSDATA (filename) - ? filename - : make_specified_string (xnm, -1, x - xnm, multibyte)); + if (xnm != SSDATA (filename)) + filename = make_specified_string (xnm, -1, x - xnm, multibyte); + SAFE_FREE (); + return filename; } /* A slightly faster and more convenient way to get === modified file 'src/fns.c' --- src/fns.c 2014-08-30 23:29:23 +0000 +++ src/fns.c 2014-09-07 07:04:01 +0000 @@ -1992,17 +1992,14 @@ return; ptrdiff_t halflen = len >> 1; Lisp_Object *tmp; - Lisp_Object tmpvec = Qnil; - struct gcpro gcpro1, gcpro2, gcpro3; - GCPRO3 (vector, predicate, tmpvec); - if (halflen < MAX_ALLOCA / word_size) - tmp = alloca (halflen * word_size); - else - { - tmpvec = Fmake_vector (make_number (halflen), make_number (0)); - tmp = XVECTOR (tmpvec)->contents; - } + struct gcpro gcpro1, gcpro2; + GCPRO2 (vector, predicate); + USE_SAFE_ALLOCA; + SAFE_ALLOCA_LISP (tmp, halflen); + for (ptrdiff_t i = 0; i < halflen; i++) + tmp[i] = make_number (0); sort_vector_inplace (predicate, len, XVECTOR (vector)->contents, tmp); + SAFE_FREE (); UNGCPRO; } @@ -3289,7 +3286,6 @@ if (encoded_length < 0) { /* The encoding wasn't possible. */ - SAFE_FREE (); error ("Multibyte character in data for base64 encoding"); } @@ -3434,7 +3430,6 @@ if (decoded_length < 0) { /* The decoding wasn't possible. */ - SAFE_FREE (); error ("Invalid base64 data"); } @@ -4581,12 +4576,12 @@ { Lisp_Object test, size, rehash_size, rehash_threshold, weak; struct hash_table_test testdesc; - char *used; ptrdiff_t i; + USE_SAFE_ALLOCA; /* The vector `used' is used to keep track of arguments that have been consumed. */ - used = alloca (nargs * sizeof *used); + char *used = SAFE_ALLOCA (nargs * sizeof *used); memset (used, 0, nargs * sizeof *used); /* See if there's a `:test TEST' among the arguments. */ @@ -4653,6 +4648,7 @@ if (!used[i]) signal_error ("Invalid argument list", args[i]); + SAFE_FREE (); return make_hash_table (testdesc, size, rehash_size, rehash_threshold, weak); } === modified file 'src/font.c' --- src/font.c 2014-07-26 13:17:25 +0000 +++ src/font.c 2014-09-07 07:04:01 +0000 @@ -1299,6 +1299,9 @@ val = AREF (font, FONT_SIZE_INDEX); eassert (NUMBERP (val) || NILP (val)); + char font_size_index_buf[sizeof "-*" + + MAX (INT_STRLEN_BOUND (EMACS_INT), + 1 + DBL_MAX_10_EXP + 1)]; if (INTEGERP (val)) { EMACS_INT v = XINT (val); @@ -1306,8 +1309,7 @@ v = pixel_size; if (v > 0) { - f[XLFD_PIXEL_INDEX] = p = - alloca (sizeof "-*" + INT_STRLEN_BOUND (EMACS_INT)); + f[XLFD_PIXEL_INDEX] = p = font_size_index_buf; sprintf (p, "%"pI"d-*", v); } else @@ -1316,21 +1318,22 @@ else if (FLOATP (val)) { double v = XFLOAT_DATA (val) * 10; - f[XLFD_PIXEL_INDEX] = p = alloca (sizeof "*-" + 1 + DBL_MAX_10_EXP + 1); + f[XLFD_PIXEL_INDEX] = p = font_size_index_buf; sprintf (p, "*-%.0f", v); } else f[XLFD_PIXEL_INDEX] = "*-*"; + char dpi_index_buf[sizeof "-" + 2 * INT_STRLEN_BOUND (EMACS_INT)]; if (INTEGERP (AREF (font, FONT_DPI_INDEX))) { EMACS_INT v = XINT (AREF (font, FONT_DPI_INDEX)); - f[XLFD_RESX_INDEX] = p = - alloca (sizeof "-" + 2 * INT_STRLEN_BOUND (EMACS_INT)); + f[XLFD_RESX_INDEX] = p = dpi_index_buf; sprintf (p, "%"pI"d-%"pI"d", v, v); } else f[XLFD_RESX_INDEX] = "*-*"; + if (INTEGERP (AREF (font, FONT_SPACING_INDEX))) { EMACS_INT spacing = XINT (AREF (font, FONT_SPACING_INDEX)); @@ -1342,13 +1345,16 @@ } else f[XLFD_SPACING_INDEX] = "*"; + + char avgwidth_index_buf[INT_BUFSIZE_BOUND (EMACS_INT)]; if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) { - f[XLFD_AVGWIDTH_INDEX] = p = alloca (INT_BUFSIZE_BOUND (EMACS_INT)); + f[XLFD_AVGWIDTH_INDEX] = p = avgwidth_index_buf; sprintf (p, "%"pI"d", XINT (AREF (font, FONT_AVGWIDTH_INDEX))); } else f[XLFD_AVGWIDTH_INDEX] = "*"; + len = snprintf (name, nbytes, "-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s-%s", f[XLFD_FOUNDRY_INDEX], f[XLFD_FAMILY_INDEX], f[XLFD_WEIGHT_INDEX], f[XLFD_SLANT_INDEX], @@ -2185,13 +2191,17 @@ static Lisp_Object font_vconcat_entity_vectors (Lisp_Object list) { - int nargs = XINT (Flength (list)); - Lisp_Object *args = alloca (word_size * nargs); - int i; + EMACS_INT nargs = XFASTINT (Flength (list)); + Lisp_Object *args; + USE_SAFE_ALLOCA; + SAFE_ALLOCA_LISP (args, nargs); + ptrdiff_t i; for (i = 0; i < nargs; i++, list = XCDR (list)) args[i] = XCAR (list); - return Fvconcat (nargs, args); + Lisp_Object result = Fvconcat (nargs, args); + SAFE_FREE (); + return result; } @@ -3219,9 +3229,10 @@ val = attrs[LFACE_FAMILY_INDEX]; val = font_intern_prop (SSDATA (val), SBYTES (val), 1); } + Lisp_Object familybuf[3]; if (NILP (val)) { - family = alloca ((sizeof family[0]) * 2); + family = familybuf; family[0] = Qnil; family[1] = zero_vector; /* terminator. */ } @@ -3242,7 +3253,7 @@ } else { - family = alloca ((sizeof family[0]) * 3); + family = familybuf; i = 0; family[i++] = val; if (NILP (AREF (spec, FONT_FAMILY_INDEX))) @@ -3529,8 +3540,9 @@ struct font_driver_list **list_table, **next; Lisp_Object tail; int i; + USE_SAFE_ALLOCA; - list_table = alloca (sizeof list_table[0] * (num_font_drivers + 1)); + SAFE_NALLOCA (list_table, 1, num_font_drivers + 1); for (i = 0, tail = new_drivers; ! NILP (tail); tail = XCDR (tail)) { for (list = f->font_driver_list; list; list = list->next) @@ -3551,6 +3563,7 @@ next = &(*next)->next; } *next = NULL; + SAFE_FREE (); if (! f->font_driver_list->on) { /* None of the drivers is enabled: enable them all. === modified file 'src/fontset.c' --- src/fontset.c 2014-08-11 00:59:34 +0000 +++ src/fontset.c 2014-09-07 07:04:01 +0000 @@ -1079,10 +1079,11 @@ /* If PATTERN is not full XLFD we convert "*" to ".*". Otherwise we convert "*" to "[^-]*" which is much faster in regular expression matching. */ - if (ndashes < 14) - p1 = regex = alloca (SBYTES (pattern) + 2 * nstars + 2 * nescs + 1); - else - p1 = regex = alloca (SBYTES (pattern) + 5 * nstars + 2 * nescs + 1); + ptrdiff_t regexsize = (SBYTES (pattern) + + (ndashes < 14 ? 2 : 5) * nstars + + 2 * nescs + 1); + USE_SAFE_ALLOCA; + p1 = regex = SAFE_ALLOCA (regexsize); *p1++ = '^'; for (p0 = SDATA (pattern); *p0; p0++) @@ -1110,6 +1111,7 @@ Vcached_fontset_data = Fcons (build_string (SSDATA (pattern)), build_string ((char *) regex)); + SAFE_FREE (); } return CACHED_FONTSET_REGEX; @@ -1892,7 +1894,9 @@ /* Recode fontsets realized on FRAME from the base fontset FONTSET in the table `realized'. */ - realized[0] = alloca (word_size * ASIZE (Vfontset_table)); + USE_SAFE_ALLOCA; + SAFE_ALLOCA_LISP (realized[0], 2 * ASIZE (Vfontset_table)); + realized[1] = realized[0] + ASIZE (Vfontset_table); for (i = j = 0; i < ASIZE (Vfontset_table); i++) { elt = FONTSET_FROM_ID (i); @@ -1903,7 +1907,6 @@ } realized[0][j] = Qnil; - realized[1] = alloca (word_size * ASIZE (Vfontset_table)); for (i = j = 0; ! NILP (realized[0][i]); i++) { elt = FONTSET_DEFAULT (realized[0][i]); @@ -1995,6 +1998,7 @@ break; } + SAFE_FREE (); return tables[0]; } === modified file 'src/frame.c' --- src/frame.c 2014-09-03 15:10:29 +0000 +++ src/frame.c 2014-09-07 07:04:01 +0000 @@ -994,22 +994,24 @@ { char *name = 0, *type = 0; Lisp_Object tty, tty_type; + USE_SAFE_ALLOCA; tty = get_future_frame_param (Qtty, parms, (FRAME_TERMCAP_P (XFRAME (selected_frame)) ? FRAME_TTY (XFRAME (selected_frame))->name : NULL)); if (!NILP (tty)) - name = xlispstrdupa (tty); + SAFE_ALLOCA_STRING (name, tty); tty_type = get_future_frame_param (Qtty_type, parms, (FRAME_TERMCAP_P (XFRAME (selected_frame)) ? FRAME_TTY (XFRAME (selected_frame))->type : NULL)); if (!NILP (tty_type)) - type = xlispstrdupa (tty_type); + SAFE_ALLOCA_STRING (type, tty_type); t = init_tty (name, type, 0); /* Errors are not fatal. */ + SAFE_FREE (); } f = make_terminal_frame (t); @@ -3017,14 +3019,14 @@ #ifdef HAVE_X_WINDOWS bool icon_left_no_change = 0, icon_top_no_change = 0; #endif - struct gcpro gcpro1, gcpro2; i = 0; for (tail = alist; CONSP (tail); tail = XCDR (tail)) i++; - parms = alloca (i * sizeof *parms); - values = alloca (i * sizeof *values); + USE_SAFE_ALLOCA; + SAFE_ALLOCA_LISP (parms, 2 * i); + values = parms + i; /* Extract parm names and values into those vectors. */ @@ -3041,10 +3043,6 @@ /* TAIL and ALIST are not used again below here. */ alist = tail = Qnil; - GCPRO2 (*parms, *values); - gcpro1.nvars = i; - gcpro2.nvars = i; - /* There is no need to gcpro LEFT, TOP, ICON_LEFT, or ICON_TOP, because their values appear in VALUES and strings are not valid. */ top = left = Qunbound; @@ -3273,7 +3271,7 @@ #endif /* HAVE_X_WINDOWS */ } - UNGCPRO; + SAFE_FREE (); } @@ -4010,10 +4008,6 @@ static Lisp_Object xrdb_get_resource (XrmDatabase rdb, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass) { - register char *value; - char *name_key; - char *class_key; - CHECK_STRING (attribute); CHECK_STRING (class); @@ -4028,17 +4022,20 @@ /* Allocate space for the components, the dots which separate them, and the final '\0'. Make them big enough for the worst case. */ - name_key = alloca (SBYTES (Vx_resource_name) - + (STRINGP (component) - ? SBYTES (component) : 0) - + SBYTES (attribute) - + 3); + ptrdiff_t name_keysize = (SBYTES (Vx_resource_name) + + (STRINGP (component) + ? SBYTES (component) : 0) + + SBYTES (attribute) + + 3); - class_key = alloca (SBYTES (Vx_resource_class) - + SBYTES (class) - + (STRINGP (subclass) - ? SBYTES (subclass) : 0) - + 3); + ptrdiff_t class_keysize = (SBYTES (Vx_resource_class) + + SBYTES (class) + + (STRINGP (subclass) + ? SBYTES (subclass) : 0) + + 3); + USE_SAFE_ALLOCA; + char *name_key = SAFE_ALLOCA (name_keysize + class_keysize); + char *class_key = name_key + name_keysize; /* Start with emacs.FRAMENAME for the name (the specific one) and with `Emacs' for the class key (the general one). */ @@ -4060,7 +4057,8 @@ strcat (name_key, "."); strcat (name_key, SSDATA (attribute)); - value = x_get_string_resource (rdb, name_key, class_key); + char *value = x_get_string_resource (rdb, name_key, class_key); + SAFE_FREE(); if (value && *value) return build_string (value); @@ -4112,8 +4110,10 @@ /* Allocate space for the components, the dots which separate them, and the final '\0'. */ - char *name_key = SAFE_ALLOCA (invocation_namelen + strlen (attribute) + 2); - char *class_key = alloca ((sizeof (EMACS_CLASS) - 1) + strlen (class) + 2); + ptrdiff_t name_keysize = invocation_namelen + strlen (attribute) + 2; + ptrdiff_t class_keysize = sizeof (EMACS_CLASS) - 1 + strlen (class) + 2; + char *name_key = SAFE_ALLOCA (name_keysize + class_keysize); + char *class_key = name_key + name_keysize; esprintf (name_key, "%s.%s", SSDATA (Vinvocation_name), attribute); sprintf (class_key, "%s.%s", EMACS_CLASS, class); === modified file 'src/ftfont.c' --- src/ftfont.c 2014-08-25 07:00:42 +0000 +++ src/ftfont.c 2014-09-07 07:04:01 +0000 @@ -24,6 +24,8 @@ #include #include +#include + #include "lisp.h" #include "dispextern.h" #include "frame.h" @@ -140,6 +142,12 @@ { NULL } }; +static bool +matching_prefix (char const *str, ptrdiff_t len, char const *pat) +{ + return len == strlen (pat) && c_strncasecmp (str, pat, len) == 0; +} + /* Dirty hack for handing ADSTYLE property. Fontconfig (actually the underlying FreeType) gives such ADSTYLE @@ -171,18 +179,10 @@ return Qnil; str = (char *) fcstr; for (end = str; *end && *end != ' '; end++); - if (*end) - { - char *newstr = alloca (end - str + 1); - memcpy (newstr, str, end - str); - newstr[end - str] = '\0'; - end = newstr + (end - str); - str = newstr; - } - if (xstrcasecmp (str, "Regular") == 0 - || xstrcasecmp (str, "Bold") == 0 - || xstrcasecmp (str, "Oblique") == 0 - || xstrcasecmp (str, "Italic") == 0) + if (matching_prefix (str, end - str, "Regular") + || matching_prefix (str, end - str, "Bold") + || matching_prefix (str, end - str, "Oblique") + || matching_prefix (str, end - str, "Italic")) return Qnil; adstyle = font_intern_prop (str, end - str, 1); if (font_style_to_value (FONT_WIDTH_INDEX, adstyle, 0) >= 0) @@ -573,7 +573,8 @@ ftfont_get_charset (Lisp_Object registry) { char *str = SSDATA (SYMBOL_NAME (registry)); - char *re = alloca (SBYTES (SYMBOL_NAME (registry)) * 2 + 1); + USE_SAFE_ALLOCA; + char *re = SAFE_ALLOCA (SBYTES (SYMBOL_NAME (registry)) * 2 + 1); Lisp_Object regexp; int i, j; @@ -589,6 +590,7 @@ } re[j] = '\0'; regexp = make_unibyte_string (re, j); + SAFE_FREE (); for (i = 0; fc_charset_table[i].name; i++) if (fast_c_string_match_ignore_case (regexp, fc_charset_table[i].name, @@ -1688,7 +1690,8 @@ else if (! otf) return 0; for (n = 1; spec->features[i][n]; n++); - tags = alloca (sizeof (OTF_Tag) * n); + USE_SAFE_ALLOCA; + SAFE_NALLOCA (tags, 1, n); for (n = 0, negative = 0; spec->features[i][n]; n++) { if (spec->features[i][n] == 0xFFFFFFFF) @@ -1698,16 +1701,17 @@ else tags[n] = spec->features[i][n]; } -#ifdef M17N_FLT_USE_NEW_FEATURE - if (OTF_check_features (otf, i == 0, spec->script, spec->langsys, - tags, n - negative) != 1) - return 0; -#else /* not M17N_FLT_USE_NEW_FEATURE */ - if (n - negative > 0 - && OTF_check_features (otf, i == 0, spec->script, spec->langsys, - tags, n - negative) != 1) - return 0; -#endif /* not M17N_FLT_USE_NEW_FEATURE */ + bool passed = true; +#ifndef M17N_FLT_USE_NEW_FEATURE + passed = n - negative > 0; +#endif + if (passed) + passed = (OTF_check_features (otf, i == 0, spec->script, + spec->langsys, tags, n - negative) + != 1); + SAFE_FREE (); + if (passed) + return 0; } return 1; #undef FEATURE_NONE @@ -1799,11 +1803,15 @@ if (len == 0) return from; OTF_tag_name (spec->script, script); + + char langsysbuf[5]; if (spec->langsys) { - langsys = alloca (5); + langsys = langsysbuf; OTF_tag_name (spec->langsys, langsys); } + + USE_SAFE_ALLOCA; for (i = 0; i < 2; i++) { char *p; @@ -1811,10 +1819,11 @@ if (spec->features[i] && spec->features[i][1] != 0xFFFFFFFF) { for (j = 0; spec->features[i][j]; j++); + SAFE_NALLOCA (p, 6, j); if (i == 0) - p = gsub_features = alloca (6 * j); + gsub_features = p; else - p = gpos_features = alloca (6 * j); + gpos_features = p; for (j = 0; spec->features[i][j]; j++) { if (spec->features[i][j] == 0xFFFFFFFF) @@ -1846,7 +1855,10 @@ gsub_features) < 0) goto simple_copy; if (out->allocated < out->used + otf_gstring.used) - return -2; + { + SAFE_FREE (); + return -2; + } features = otf->gsub->FeatureList.Feature; for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; ) { @@ -1935,7 +1947,10 @@ else if (out) { if (out->allocated < out->used + len) - return -2; + { + SAFE_FREE (); + return -2; + } for (i = 0; i < len; i++) out->glyphs[out->used++] = in->glyphs[from + i]; } @@ -1947,7 +1962,10 @@ if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys, gpos_features) < 0) - return to; + { + SAFE_FREE (); + return to; + } features = otf->gpos->FeatureList.Feature; x_ppem = ft_face->size->metrics.x_ppem; y_ppem = ft_face->size->metrics.y_ppem; @@ -2069,7 +2087,10 @@ { if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys, gpos_features) < 0) - return to; + { + SAFE_FREE (); + return to; + } features = otf->gpos->FeatureList.Feature; for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; i++, otfg++) @@ -2089,9 +2110,11 @@ } } } + SAFE_FREE (); return to; simple_copy: + SAFE_FREE (); if (! out) return to; if (out->allocated < out->used + len) @@ -2129,11 +2152,15 @@ if (len == 0) return from; OTF_tag_name (spec->script, script); + + char langsysbuf[5]; if (spec->langsys) { - langsys = alloca (5); + langsys = langsysbuf; OTF_tag_name (spec->langsys, langsys); } + + USE_SAFE_ALLOCA; for (i = 0; i < 2; i++) { char *p; @@ -2141,10 +2168,11 @@ if (spec->features[i] && spec->features[i][1] != 0xFFFFFFFF) { for (j = 0; spec->features[i][j]; j++); + SAFE_NALLOCA (p, 6, j); if (i == 0) - p = gsub_features = alloca (6 * j); + gsub_features = p; else - p = gpos_features = alloca (6 * j); + gpos_features = p; for (j = 0; spec->features[i][j]; j++) { if (spec->features[i][j] == 0xFFFFFFFF) @@ -2176,7 +2204,10 @@ < 0) goto simple_copy; if (out->allocated < out->used + otf_gstring.used) - return -2; + { + SAFE_FREE (); + return -2; + } for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; ) { MFLTGlyph *g; @@ -2227,7 +2258,10 @@ else { if (out->allocated < out->used + len) - return -2; + { + SAFE_FREE (); + return -2; + } for (i = 0; i < len; i++) out->glyphs[out->used++] = in->glyphs[from + i]; } @@ -2239,7 +2273,10 @@ if (OTF_drive_gpos (otf, &otf_gstring, script, langsys, gpos_features) < 0) - return to; + { + SAFE_FREE (); + return to; + } x_ppem = ft_face->size->metrics.x_ppem; y_ppem = ft_face->size->metrics.y_ppem; @@ -2349,9 +2386,11 @@ base = g; } } + SAFE_FREE (); return to; simple_copy: + SAFE_FREE (); if (out->allocated < out->used + len) return -2; font->get_metrics (font, in, from, to); === modified file 'src/ftxfont.c' --- src/ftxfont.c 2014-07-03 12:20:00 +0000 +++ src/ftxfont.c 2014-09-07 07:04:01 +0000 @@ -271,10 +271,11 @@ n[0] = n[1] = n[2] = n[3] = n[4] = n[5] = n[6] = 0; + USE_SAFE_ALLOCA; + SAFE_NALLOCA (code, 1, len); block_input (); if (with_background) ftxfont_draw_background (f, font, s->gc, x, y, s->width); - code = alloca (sizeof (unsigned) * len); for (i = 0; i < len; i++) code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) | XCHAR2B_BYTE2 (s->char2b + from + i)); @@ -322,6 +323,7 @@ } unblock_input (); + SAFE_FREE (); return len; } === modified file 'src/image.c' --- src/image.c 2014-07-07 23:25:13 +0000 +++ src/image.c 2014-09-07 07:04:01 +0000 @@ -3037,13 +3037,16 @@ + SBYTES (data))); else { + USE_SAFE_ALLOCA; + if (VECTORP (data)) { int i; char *p; int nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR; - p = bits = alloca (nbytes * img->height); + SAFE_NALLOCA (bits, nbytes, img->height); + p = bits; for (i = 0; i < img->height; ++i, p += nbytes) { Lisp_Object line = AREF (data, i); @@ -3064,9 +3067,8 @@ int nbytes, i; /* Windows mono bitmaps are reversed compared with X. */ invertedBits = bits; - nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR - * img->height; - bits = alloca (nbytes); + nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR; + SAFE_NALLOCA (bits, nbytes, img->height); for (i = 0; i < nbytes; i++) bits[i] = XBM_BIT_SHUFFLE (invertedBits[i]); } @@ -3088,6 +3090,8 @@ img->spec, Qnil); x_clear_image (f, img); } + + SAFE_FREE (); } } @@ -3494,6 +3498,8 @@ int rc; XpmAttributes attrs; Lisp_Object specified_file, color_symbols; + USE_SAFE_ALLOCA; + #ifdef HAVE_NTGUI HDC hdc; xpm_XImage * xpm_image = NULL, * xpm_mask = NULL; @@ -3536,7 +3542,7 @@ { Lisp_Object tail; XpmColorSymbol *xpm_syms; - int i, size; + ptrdiff_t i, size; attrs.valuemask |= XpmColorSymbols; @@ -3546,8 +3552,8 @@ ++attrs.numsymbols; /* Allocate an XpmColorSymbol array. */ + SAFE_NALLOCA (xpm_syms, 1, attrs.numsymbols); size = attrs.numsymbols * sizeof *xpm_syms; - xpm_syms = alloca (size); memset (xpm_syms, 0, size); attrs.colorsymbols = xpm_syms; @@ -3569,17 +3575,11 @@ name = XCAR (XCAR (tail)); color = XCDR (XCAR (tail)); if (STRINGP (name)) - { - xpm_syms[i].name = alloca (SCHARS (name) + 1); - strcpy (xpm_syms[i].name, SSDATA (name)); - } + SAFE_ALLOCA_STRING (xpm_syms[i].name, name); else xpm_syms[i].name = empty_string; if (STRINGP (color)) - { - xpm_syms[i].value = alloca (SCHARS (color) + 1); - strcpy (xpm_syms[i].value, SSDATA (color)); - } + SAFE_ALLOCA_STRING (xpm_syms[i].value, color); else xpm_syms[i].value = empty_string; } @@ -3610,6 +3610,7 @@ #ifdef ALLOC_XPM_COLORS xpm_free_color_cache (); #endif + SAFE_FREE (); return 0; } @@ -3640,6 +3641,7 @@ #ifdef ALLOC_XPM_COLORS xpm_free_color_cache (); #endif + SAFE_FREE (); return 0; } #ifdef HAVE_NTGUI @@ -3782,6 +3784,7 @@ #ifdef ALLOC_XPM_COLORS xpm_free_color_cache (); #endif + SAFE_FREE (); return rc == XpmSuccess; } @@ -6580,6 +6583,7 @@ colors generated, and mgr->cinfo.colormap is a two-dimensional array of color indices in the range 0..mgr->cinfo.actual_number_of_colors. No more than 255 colors will be generated. */ + USE_SAFE_ALLOCA; { int i, ir, ig, ib; @@ -6595,7 +6599,7 @@ a default color, and we don't have to care about which colors can be freed safely, and which can't. */ init_color_table (); - colors = alloca (mgr->cinfo.actual_number_of_colors * sizeof *colors); + SAFE_NALLOCA (colors, 1, mgr->cinfo.actual_number_of_colors); for (i = 0; i < mgr->cinfo.actual_number_of_colors; ++i) { @@ -6638,6 +6642,7 @@ /* Put ximg into the image. */ image_put_x_image (f, img, ximg, 0); + SAFE_FREE (); return 1; } === modified file 'src/keyboard.c' --- src/keyboard.c 2014-08-27 10:51:21 +0000 +++ src/keyboard.c 2014-09-07 07:04:01 +0000 @@ -500,10 +500,12 @@ static void echo_add_key (Lisp_Object c) { - int size = KEY_DESCRIPTION_SIZE + 100; - char *buffer = alloca (size); + char initbuf[KEY_DESCRIPTION_SIZE + 100]; + ptrdiff_t size = sizeof initbuf; + char *buffer = initbuf; char *ptr = buffer; Lisp_Object echo_string; + USE_SAFE_ALLOCA; echo_string = KVAR (current_kboard, echo_string); @@ -515,13 +517,13 @@ else if (SYMBOLP (c)) { Lisp_Object name = SYMBOL_NAME (c); - int nbytes = SBYTES (name); + ptrdiff_t nbytes = SBYTES (name); if (size - (ptr - buffer) < nbytes) { - int offset = ptr - buffer; + ptrdiff_t offset = ptr - buffer; size = max (2 * size, size + nbytes); - buffer = alloca (size); + buffer = SAFE_ALLOCA (size); ptr = buffer + offset; } @@ -532,14 +534,14 @@ if ((NILP (echo_string) || SCHARS (echo_string) == 0) && help_char_p (c)) { - const char *text = " (Type ? for further options)"; - int len = strlen (text); + static const char text[] = " (Type ? for further options)"; + int len = sizeof text - 1; if (size - (ptr - buffer) < len) { - int offset = ptr - buffer; + ptrdiff_t offset = ptr - buffer; size += len; - buffer = alloca (size); + buffer = SAFE_ALLOCA (size); ptr = buffer + offset; } @@ -572,6 +574,7 @@ kset_echo_string (current_kboard, concat2 (echo_string, make_string (buffer, ptr - buffer))); + SAFE_FREE (); } /* Add C to the echo string, if echoing is going on. C can be a @@ -1147,7 +1150,7 @@ Lisp_Object command_loop (void) { -#ifdef HAVE_STACK_OVERFLOW_HANDLING +#ifdef HAVE_STACK_OVERFLOW_HANDLING /* At least on GNU/Linux, saving signal mask is important here. */ if (sigsetjmp (return_to_command_loop, 1) != 0) { @@ -2351,14 +2354,15 @@ { /* An encoded byte sequence, let's try to decode it. */ struct coding_system *coding = TERMINAL_KEYBOARD_CODING (terminal); - unsigned char *src = alloca (n); + unsigned char src[MAX_ENCODED_BYTES]; + unsigned char dest[4 * sizeof src]; int i; for (i = 0; i < n; i++) src[i] = XINT (events[i]); if (meta_key != 2) for (i = 0; i < n; i++) src[i] &= ~0x80; - coding->destination = alloca (n * 4); + coding->destination = dest; coding->dst_bytes = n * 4; decode_coding_c_string (coding, src, n, Qnil); eassert (coding->produced_char <= n); @@ -7434,11 +7438,14 @@ in the current keymaps, or nil where it is not a prefix. */ Lisp_Object *maps; + Lisp_Object mapsbuf[3]; Lisp_Object def, tail; ptrdiff_t mapno; Lisp_Object oquit; + USE_SAFE_ALLOCA; + /* In order to build the menus, we need to call the keymap accessors. They all call QUIT. But this function is called during redisplay, during which a quit is fatal. So inhibit @@ -7467,7 +7474,7 @@ && !NILP (Voverriding_local_map)) { /* Yes, use them (if non-nil) as well as the global map. */ - maps = alloca (3 * sizeof (maps[0])); + maps = mapsbuf; nmaps = 0; if (!NILP (KVAR (current_kboard, Voverriding_terminal_local_map))) maps[nmaps++] = KVAR (current_kboard, Voverriding_terminal_local_map); @@ -7484,7 +7491,7 @@ Lisp_Object tem; ptrdiff_t nminor; nminor = current_minor_maps (NULL, &tmaps); - maps = alloca ((nminor + 4) * sizeof *maps); + SAFE_NALLOCA (maps, 1, nminor + 4); nmaps = 0; tem = KVAR (current_kboard, Voverriding_terminal_local_map); if (!NILP (tem) && !NILP (Voverriding_local_map_menu_flag)) @@ -7556,6 +7563,7 @@ } Vinhibit_quit = oquit; + SAFE_FREE (); return menu_bar_items_vector; } @@ -7992,9 +8000,11 @@ tool_bar_items (Lisp_Object reuse, int *nitems) { Lisp_Object *maps; + Lisp_Object mapsbuf[3]; ptrdiff_t nmaps, i; Lisp_Object oquit; Lisp_Object *tmaps; + USE_SAFE_ALLOCA; *nitems = 0; @@ -8018,7 +8028,7 @@ && !NILP (Voverriding_local_map)) { /* Yes, use them (if non-nil) as well as the global map. */ - maps = alloca (3 * sizeof *maps); + maps = mapsbuf; nmaps = 0; if (!NILP (KVAR (current_kboard, Voverriding_terminal_local_map))) maps[nmaps++] = KVAR (current_kboard, Voverriding_terminal_local_map); @@ -8035,7 +8045,7 @@ Lisp_Object tem; ptrdiff_t nminor; nminor = current_minor_maps (NULL, &tmaps); - maps = alloca ((nminor + 4) * sizeof *maps); + SAFE_NALLOCA (maps, 1, nminor + 4); nmaps = 0; tem = KVAR (current_kboard, Voverriding_terminal_local_map); if (!NILP (tem) && !NILP (Voverriding_local_map_menu_flag)) @@ -8064,6 +8074,7 @@ Vinhibit_quit = oquit; *nitems = ntool_bar_items / TOOL_BAR_ITEM_NSLOTS; + SAFE_FREE (); return tool_bar_items_vector; } === modified file 'src/keymap.c' --- src/keymap.c 2014-07-14 04:44:01 +0000 +++ src/keymap.c 2014-09-07 07:04:01 +0000 @@ -2883,13 +2883,14 @@ if (!SYMBOLP (modes[i])) emacs_abort (); - p = title = alloca (42 + SCHARS (SYMBOL_NAME (modes[i]))); + USE_SAFE_ALLOCA; + p = title = SAFE_ALLOCA (42 + SBYTES (SYMBOL_NAME (modes[i]))); *p++ = '\f'; *p++ = '\n'; *p++ = '`'; memcpy (p, SDATA (SYMBOL_NAME (modes[i])), - SCHARS (SYMBOL_NAME (modes[i]))); - p += SCHARS (SYMBOL_NAME (modes[i])); + SBYTES (SYMBOL_NAME (modes[i]))); + p += SBYTES (SYMBOL_NAME (modes[i])); *p++ = '\''; memcpy (p, " Minor Mode Bindings", strlen (" Minor Mode Bindings")); p += strlen (" Minor Mode Bindings"); @@ -2898,6 +2899,7 @@ describe_map_tree (maps[i], 1, shadow, prefix, title, nomenu, 0, 0, 0); shadow = Fcons (maps[i], shadow); + SAFE_FREE (); } start1 = get_local_map (BUF_PT (XBUFFER (buffer)), @@ -3184,10 +3186,10 @@ /* These accumulate the values from sparse keymap bindings, so we can sort them and handle them in order. */ - int length_needed = 0; + ptrdiff_t length_needed = 0; struct describe_map_elt *vect; - int slots_used = 0; - int i; + ptrdiff_t slots_used = 0; + ptrdiff_t i; suppress = Qnil; @@ -3207,7 +3209,8 @@ for (tail = map; CONSP (tail); tail = XCDR (tail)) length_needed++; - vect = alloca (length_needed * sizeof *vect); + USE_SAFE_ALLOCA; + SAFE_NALLOCA (vect, 1, length_needed); for (tail = map; CONSP (tail); tail = XCDR (tail)) { @@ -3350,6 +3353,7 @@ } } + SAFE_FREE (); UNGCPRO; } === modified file 'src/lisp.h' --- src/lisp.h 2014-09-02 18:05:00 +0000 +++ src/lisp.h 2014-09-07 07:04:01 +0000 @@ -4451,12 +4451,6 @@ return egetenv_internal (var, strlen (var)); } -/* Copy Lisp string to temporary (allocated on stack) C string. */ - -#define xlispstrdupa(string) \ - memcpy (alloca (SBYTES (string) + 1), \ - SSDATA (string), SBYTES (string) + 1) - /* Set up the name of the machine we're running on. */ extern void init_system_name (void); @@ -4484,7 +4478,7 @@ /* SAFE_ALLOCA allocates a simple buffer. */ -#define SAFE_ALLOCA(size) ((size) < MAX_ALLOCA \ +#define SAFE_ALLOCA(size) ((size) <= MAX_ALLOCA \ ? alloca (size) \ : (sa_must_free = true, record_xmalloc (size))) @@ -4504,6 +4498,14 @@ } \ } while (false) +/* SAFE_ALLOCA_STRING allocates a C copy of a Lisp string. */ + +#define SAFE_ALLOCA_STRING(ptr, string) \ + do { \ + (ptr) = SAFE_ALLOCA (SBYTES (string) + 1); \ + memcpy (ptr, SDATA (string), SBYTES (string) + 1); \ + } while (false) + /* SAFE_FREE frees xmalloced memory and enables GC as needed. */ #define SAFE_FREE() \ @@ -4519,9 +4521,9 @@ #define SAFE_ALLOCA_LISP(buf, nelt) \ do { \ - if ((nelt) < MAX_ALLOCA / word_size) \ + if ((nelt) <= MAX_ALLOCA / word_size) \ (buf) = alloca ((nelt) * word_size); \ - else if ((nelt) < min (PTRDIFF_MAX, SIZE_MAX) / word_size) \ + else if ((nelt) <= min (PTRDIFF_MAX, SIZE_MAX) / word_size) \ { \ Lisp_Object arg_; \ (buf) = xmalloc ((nelt) * word_size); \ === modified file 'src/lread.c' --- src/lread.c 2014-09-01 16:05:43 +0000 +++ src/lread.c 2014-09-07 07:04:01 +0000 @@ -1473,6 +1473,7 @@ ptrdiff_t max_suffix_len = 0; int last_errno = ENOENT; int save_fd = -1; + USE_SAFE_ALLOCA; /* The last-modified time of the newest matching file found. Initialize it to something less than all valid timestamps. */ @@ -1513,7 +1514,10 @@ this path element/specified file name and any possible suffix. */ want_length = max_suffix_len + SBYTES (filename); if (fn_size <= want_length) - fn = alloca (fn_size = 100 + want_length); + { + fn_size = 100 + want_length; + fn = SAFE_ALLOCA (fn_size); + } /* Loop over suffixes. */ for (tail = NILP (suffixes) ? list1 (empty_unibyte_string) : suffixes; @@ -1579,6 +1583,7 @@ /* We succeeded; return this descriptor and filename. */ if (storeptr) *storeptr = string; + SAFE_FREE (); UNGCPRO; return -2; } @@ -1651,6 +1656,7 @@ /* We succeeded; return this descriptor and filename. */ if (storeptr) *storeptr = string; + SAFE_FREE (); UNGCPRO; return fd; } @@ -1661,6 +1667,7 @@ { if (storeptr) *storeptr = save_string; + SAFE_FREE (); UNGCPRO; return save_fd; } @@ -1670,6 +1677,7 @@ break; } + SAFE_FREE (); UNGCPRO; errno = last_errno; return -1; === modified file 'src/menu.c' --- src/menu.c 2014-08-10 08:26:28 +0000 +++ src/menu.c 2014-09-07 07:04:01 +0000 @@ -632,8 +632,9 @@ widget_value **submenu_stack; bool panes_seen = 0; struct frame *f = XFRAME (Vmenu_updating_frame); + USE_SAFE_ALLOCA; - submenu_stack = alloca (menu_items_used * sizeof *submenu_stack); + SAFE_NALLOCA (submenu_stack, 1, menu_items_used); wv = make_widget_value ("menu", NULL, true, Qnil); wv->button_type = BUTTON_TYPE_NONE; first_wv = wv; @@ -835,11 +836,12 @@ that was originally a button, return it by itself. */ if (top_level_items && first_wv->contents && first_wv->contents->next == 0) { - wv = first_wv->contents; - xfree (first_wv); - return wv; + wv = first_wv; + first_wv = first_wv->contents; + xfree (wv); } + SAFE_FREE (); return first_wv; } @@ -890,9 +892,10 @@ Lisp_Object *subprefix_stack; int submenu_depth = 0; int i; + USE_SAFE_ALLOCA; entry = Qnil; - subprefix_stack = alloca (menu_bar_items_used * sizeof *subprefix_stack); + SAFE_NALLOCA (subprefix_stack, 1, menu_bar_items_used); prefix = Qnil; i = 0; @@ -954,11 +957,13 @@ buf.arg = entry; kbd_buffer_store_event (&buf); - return; + break; } i += MENU_ITEMS_ITEM_LENGTH; } } + + SAFE_FREE (); } #endif /* USE_X_TOOLKIT || USE_GTK || HAVE_NS || HAVE_NTGUI */ @@ -973,10 +978,11 @@ int i; Lisp_Object *subprefix_stack; int submenu_depth = 0; + USE_SAFE_ALLOCA; prefix = entry = Qnil; i = 0; - subprefix_stack = alloca (menu_items_used * word_size); + SAFE_ALLOCA_LISP (subprefix_stack, menu_items_used); while (i < menu_items_used) { @@ -1018,11 +1024,13 @@ if (!NILP (subprefix_stack[j])) entry = Fcons (subprefix_stack[j], entry); } + SAFE_FREE (); return entry; } i += MENU_ITEMS_ITEM_LENGTH; } } + SAFE_FREE (); return Qnil; } #endif /* HAVE_NS */ === modified file 'src/print.c' --- src/print.c 2014-07-17 09:12:51 +0000 +++ src/print.c 2014-09-07 07:04:01 +0000 @@ -169,11 +169,13 @@ if (print_buffer_pos != print_buffer_pos_byte \ && NILP (BVAR (current_buffer, enable_multibyte_characters)))\ { \ - unsigned char *temp = alloca (print_buffer_pos + 1); \ + USE_SAFE_ALLOCA; \ + unsigned char *temp = SAFE_ALLOCA (print_buffer_pos + 1); \ copy_text ((unsigned char *) print_buffer, temp, \ print_buffer_pos_byte, 1, 0); \ insert_1_both ((char *) temp, print_buffer_pos, \ print_buffer_pos, 0, 1, 0); \ + SAFE_FREE (); \ } \ else \ insert_1_both (print_buffer, print_buffer_pos, \ === modified file 'src/process.c' --- src/process.c 2014-08-09 16:20:29 +0000 +++ src/process.c 2014-09-07 07:04:01 +0000 @@ -1386,9 +1386,10 @@ (ptrdiff_t nargs, Lisp_Object *args) { Lisp_Object buffer, name, program, proc, current_dir, tem; - register unsigned char **new_argv; + unsigned char **new_argv; ptrdiff_t i; ptrdiff_t count = SPECPDL_INDEX (); + USE_SAFE_ALLOCA; buffer = args[1]; if (!NILP (buffer)) @@ -1464,7 +1465,7 @@ val = Vcoding_system_for_read; if (NILP (val)) { - args2 = alloca ((nargs + 1) * sizeof *args2); + SAFE_ALLOCA_LISP (args2, nargs + 1); args2[0] = Qstart_process; for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; GCPRO2 (proc, current_dir); @@ -1483,7 +1484,7 @@ { if (EQ (coding_systems, Qt)) { - args2 = alloca ((nargs + 1) * sizeof *args2); + SAFE_ALLOCA_LISP (args2, nargs + 1); args2[0] = Qstart_process; for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; GCPRO2 (proc, current_dir); @@ -1578,7 +1579,7 @@ /* Now that everything is encoded we can collect the strings into NEW_ARGV. */ - new_argv = alloca ((nargs - 1) * sizeof *new_argv); + SAFE_NALLOCA (new_argv, 1, nargs - 1); new_argv[nargs - 2] = 0; for (i = nargs - 2; i-- != 0; ) @@ -1592,6 +1593,7 @@ else create_pty (proc); + SAFE_FREE (); return unbind_to (count, proc); } @@ -2071,8 +2073,10 @@ && VECTORP (XCDR (address))) { struct sockaddr *sa; + p = XVECTOR (XCDR (address)); + if (MAX_ALLOCA - sizeof sa->sa_family < p->header.size) + return 0; *familyp = XINT (XCAR (address)); - p = XVECTOR (XCDR (address)); return p->header.size + sizeof (sa->sa_family); } return 0; @@ -4973,18 +4977,17 @@ for decoding. */ static int -read_process_output (Lisp_Object proc, register int channel) +read_process_output (Lisp_Object proc, int channel) { - register ssize_t nbytes; - char *chars; - register struct Lisp_Process *p = XPROCESS (proc); + ssize_t nbytes; + struct Lisp_Process *p = XPROCESS (proc); struct coding_system *coding = proc_decode_coding_system[channel]; int carryover = p->decoding_carryover; - int readmax = 4096; + enum { readmax = 4096 }; ptrdiff_t count = SPECPDL_INDEX (); Lisp_Object odeactivate; + char chars[sizeof coding->carryover + readmax]; - chars = alloca (carryover + readmax); if (carryover) /* See the comment above. */ memcpy (chars, SDATA (p->decoding_buf), carryover); @@ -6837,7 +6840,7 @@ { FD_SET (fd, &input_wait_mask); FD_SET (fd, &non_keyboard_wait_mask); - FD_SET (fd, &non_process_wait_mask); + FD_SET (fd, &non_process_wait_mask); fd_callback_info[fd].func = timerfd_callback; fd_callback_info[fd].data = NULL; fd_callback_info[fd].condition |= FOR_READ; === modified file 'src/regex.c' --- src/regex.c 2014-07-15 14:04:06 +0000 +++ src/regex.c 2014-09-07 07:04:01 +0000 @@ -457,11 +457,17 @@ # endif /* not alloca */ -# define REGEX_ALLOCATE alloca +# ifdef emacs +# define REGEX_USE_SAFE_ALLOCA USE_SAFE_ALLOCA +# define REGEX_SAFE_FREE() SAFE_FREE () +# define REGEX_ALLOCATE SAFE_ALLOCA +# else +# define REGEX_ALLOCATE alloca +# endif /* Assumes a `char *destination' variable. */ # define REGEX_REALLOCATE(source, osize, nsize) \ - (destination = alloca (nsize), \ + (destination = REGEX_ALLOCATE (nsize), \ memcpy (destination, source, osize)) /* No need to do anything to free, after alloca. */ @@ -469,6 +475,11 @@ #endif /* not REGEX_MALLOC */ +#ifndef REGEX_USE_SAFE_ALLOCA +# define REGEX_USE_SAFE_ALLOCA ((void) 0) +# define REGEX_SAFE_FREE() ((void) 0) +#endif + /* Define how to allocate the failure stack. */ #if defined REL_ALLOC && defined REGEX_MALLOC @@ -482,22 +493,10 @@ #else /* not using relocating allocator */ -# ifdef REGEX_MALLOC - -# define REGEX_ALLOCATE_STACK malloc -# define REGEX_REALLOCATE_STACK(source, osize, nsize) realloc (source, nsize) -# define REGEX_FREE_STACK free - -# else /* not REGEX_MALLOC */ - -# define REGEX_ALLOCATE_STACK alloca - -# define REGEX_REALLOCATE_STACK(source, osize, nsize) \ - REGEX_REALLOCATE (source, osize, nsize) -/* No need to explicitly free anything. */ -# define REGEX_FREE_STACK(arg) ((void)0) - -# endif /* not REGEX_MALLOC */ +# define REGEX_ALLOCATE_STACK(size) REGEX_ALLOCATE (size) +# define REGEX_REALLOCATE_STACK(source, o, n) REGEX_REALLOCATE (source, o, n) +# define REGEX_FREE_STACK(ptr) REGEX_FREE (ptr) + #endif /* not using relocating allocator */ @@ -4579,6 +4578,7 @@ FREE_VAR (regend); \ FREE_VAR (best_regstart); \ FREE_VAR (best_regend); \ + REGEX_SAFE_FREE (); \ } while (0) #else # define FREE_VARIABLES() ((void)0) /* Do nothing! But inhibit gcc warning. */ @@ -5018,6 +5018,8 @@ DEBUG_PRINT ("\n\nEntering re_match_2.\n"); + REGEX_USE_SAFE_ALLOCA; + INIT_FAIL_STACK (); #ifdef MATCH_MAY_ALLOCATE === modified file 'src/scroll.c' --- src/scroll.c 2014-08-03 12:34:44 +0000 +++ src/scroll.c 2014-09-07 07:04:01 +0000 @@ -245,18 +245,20 @@ { struct matrix_elt *p; int i, j, k; + USE_SAFE_ALLOCA; /* True if we have set a terminal window with set_terminal_window. */ bool terminal_window_p = 0; /* A queue for line insertions to be done. */ struct queue { int count, pos; }; - struct queue *queue_start - = alloca (current_matrix->nrows * sizeof *queue_start); + struct queue *queue_start; + SAFE_NALLOCA (queue_start, 1, current_matrix->nrows); struct queue *queue = queue_start; - char *retained_p = alloca (window_size * sizeof *retained_p); - int *copy_from = alloca (window_size * sizeof *copy_from); + char *retained_p = SAFE_ALLOCA (window_size); + int *copy_from; + SAFE_NALLOCA (copy_from, 1, window_size); /* Zero means line is empty. */ memset (retained_p, 0, window_size * sizeof (char)); @@ -378,6 +380,7 @@ if (terminal_window_p) set_terminal_window (frame, 0); + SAFE_FREE (); } @@ -649,10 +652,12 @@ { struct matrix_elt *p; int i, j; + USE_SAFE_ALLOCA; /* A queue of deletions and insertions to be performed. */ struct alt_queue { int count, pos, window; }; - struct alt_queue *queue_start = alloca (window_size * sizeof *queue_start); + struct alt_queue *queue_start; + SAFE_NALLOCA (queue_start, 1, window_size); struct alt_queue *queue = queue_start; /* True if a terminal window has been set with set_terminal_window. */ @@ -667,11 +672,12 @@ bool write_follows_p = 1; /* For each row in the new matrix what row of the old matrix it is. */ - int *copy_from = alloca (window_size * sizeof *copy_from); + int *copy_from; + SAFE_NALLOCA (copy_from, 1, window_size); /* Non-zero for each row in the new matrix that is retained from the old matrix. Lines not retained are empty. */ - char *retained_p = alloca (window_size * sizeof *retained_p); + char *retained_p = SAFE_ALLOCA (window_size); memset (retained_p, 0, window_size * sizeof (char)); @@ -787,6 +793,7 @@ if (terminal_window_p) set_terminal_window (frame, 0); + SAFE_FREE (); } @@ -796,8 +803,9 @@ int unchanged_at_bottom, int *draw_cost, int *old_draw_cost, unsigned *old_hash, unsigned *new_hash, int free_at_end) { - struct matrix_elt *matrix - = alloca ((window_size + 1) * (window_size + 1) * sizeof *matrix); + USE_SAFE_ALLOCA; + struct matrix_elt *matrix; + SAFE_NALLOCA (matrix, window_size + 1, window_size + 1); if (FRAME_SCROLL_REGION_OK (frame)) { @@ -817,6 +825,8 @@ frame->current_matrix, matrix, window_size, unchanged_at_top); } + + SAFE_FREE (); } === modified file 'src/search.c' --- src/search.c 2014-06-23 04:11:29 +0000 +++ src/search.c 2014-09-07 07:04:01 +0000 @@ -1318,6 +1318,7 @@ translation. Otherwise set to zero later. */ int char_base = -1; bool boyer_moore_ok = 1; + USE_SAFE_ALLOCA; /* MULTIBYTE says whether the text to be searched is multibyte. We must convert PATTERN to match that, or we will not really @@ -1335,7 +1336,7 @@ raw_pattern_size_byte = count_size_as_multibyte (SDATA (string), raw_pattern_size); - raw_pattern = alloca (raw_pattern_size_byte + 1); + raw_pattern = SAFE_ALLOCA (raw_pattern_size_byte + 1); copy_text (SDATA (string), raw_pattern, SCHARS (string), 0, 1); } @@ -1349,7 +1350,7 @@ the chosen single-byte character set can possibly match. */ raw_pattern_size = SCHARS (string); raw_pattern_size_byte = SCHARS (string); - raw_pattern = alloca (raw_pattern_size + 1); + raw_pattern = SAFE_ALLOCA (raw_pattern_size + 1); copy_text (SDATA (string), raw_pattern, SBYTES (string), 1, 0); } @@ -1357,7 +1358,7 @@ /* Copy and optionally translate the pattern. */ len = raw_pattern_size; len_byte = raw_pattern_size_byte; - patbuf = alloca (len * MAX_MULTIBYTE_LENGTH); + SAFE_NALLOCA (patbuf, MAX_MULTIBYTE_LENGTH, len); pat = patbuf; base_pat = raw_pattern; if (multibyte) @@ -1497,13 +1498,15 @@ len_byte = pat - patbuf; pat = base_pat = patbuf; - if (boyer_moore_ok) - return boyer_moore (n, pat, len_byte, trt, inverse_trt, - pos_byte, lim_byte, - char_base); - else - return simple_search (n, pat, raw_pattern_size, len_byte, trt, - pos, pos_byte, lim, lim_byte); + EMACS_INT result + = (boyer_moore_ok + ? boyer_moore (n, pat, len_byte, trt, inverse_trt, + pos_byte, lim_byte, + char_base) + : simple_search (n, pat, raw_pattern_size, len_byte, trt, + pos, pos_byte, lim, lim_byte)); + SAFE_FREE (); + return result; } } @@ -2809,7 +2812,8 @@ prev = Qnil; - data = alloca ((2 * search_regs.num_regs + 1) * sizeof *data); + USE_SAFE_ALLOCA; + SAFE_NALLOCA (data, 1, 2 * search_regs.num_regs + 1); len = 0; for (i = 0; i < search_regs.num_regs; i++) @@ -2852,25 +2856,28 @@ /* If REUSE is not usable, cons up the values and return them. */ if (! CONSP (reuse)) - return Flist (len, data); + reuse = Flist (len, data); + else + { + /* If REUSE is a list, store as many value elements as will fit + into the elements of REUSE. */ + for (i = 0, tail = reuse; CONSP (tail); + i++, tail = XCDR (tail)) + { + if (i < len) + XSETCAR (tail, data[i]); + else + XSETCAR (tail, Qnil); + prev = tail; + } - /* If REUSE is a list, store as many value elements as will fit - into the elements of REUSE. */ - for (i = 0, tail = reuse; CONSP (tail); - i++, tail = XCDR (tail)) - { + /* If we couldn't fit all value elements into REUSE, + cons up the rest of them and add them to the end of REUSE. */ if (i < len) - XSETCAR (tail, data[i]); - else - XSETCAR (tail, Qnil); - prev = tail; + XSETCDR (prev, Flist (len - i, data + i)); } - /* If we couldn't fit all value elements into REUSE, - cons up the rest of them and add them to the end of REUSE. */ - if (i < len) - XSETCDR (prev, Flist (len - i, data + i)); - + SAFE_FREE (); return reuse; } @@ -3075,7 +3082,8 @@ CHECK_STRING (string); - temp = alloca (SBYTES (string) * 2); + USE_SAFE_ALLOCA; + SAFE_NALLOCA (temp, 2, SBYTES (string)); /* Now copy the data into the new string, inserting escapes. */ @@ -3093,10 +3101,13 @@ *out++ = *in; } - return make_specified_string (temp, - SCHARS (string) + backslashes_added, - out - temp, - STRING_MULTIBYTE (string)); + Lisp_Object result + = make_specified_string (temp, + SCHARS (string) + backslashes_added, + out - temp, + STRING_MULTIBYTE (string)); + SAFE_FREE (); + return result; } /* Like find_newline, but doesn't use the cache, and only searches forward. */ === modified file 'src/sound.c' --- src/sound.c 2014-03-25 14:43:26 +0000 +++ src/sound.c 2014-09-07 07:04:01 +0000 @@ -564,12 +564,11 @@ SBYTES (s->data) - sizeof *header); else { - char *buffer; ptrdiff_t nbytes = 0; ptrdiff_t blksize = sd->period_size ? sd->period_size (sd) : 2048; ptrdiff_t data_left = header->data_length; - - buffer = alloca (blksize); + USE_SAFE_ALLOCA; + char *buffer = SAFE_ALLOCA (blksize); lseek (s->fd, sizeof *header, SEEK_SET); while (data_left > 0 && (nbytes = emacs_read (s->fd, buffer, blksize)) > 0) @@ -582,6 +581,7 @@ if (nbytes < 0) sound_perror ("Error reading sound file"); + SAFE_FREE (); } } @@ -656,19 +656,20 @@ else { ptrdiff_t blksize = sd->period_size ? sd->period_size (sd) : 2048; - char *buffer; ptrdiff_t nbytes; /* Seek */ lseek (s->fd, header->data_offset, SEEK_SET); /* Copy sound data to the device. */ - buffer = alloca (blksize); + USE_SAFE_ALLOCA; + char *buffer = SAFE_ALLOCA (blksize); while ((nbytes = emacs_read (s->fd, buffer, blksize)) > 0) sd->write (sd, buffer, nbytes); if (nbytes < 0) sound_perror ("Error reading sound file"); + SAFE_FREE (); } } @@ -1309,7 +1310,6 @@ struct gcpro gcpro1, gcpro2; Lisp_Object args[2]; #else /* WINDOWSNT */ - int len = 0; Lisp_Object lo_file = {0}; char * psz_file = NULL; unsigned long ui_volume_tmp = UINT_MAX; @@ -1326,7 +1326,8 @@ current_sound_device = xzalloc (sizeof *current_sound_device); current_sound = xzalloc (sizeof *current_sound); record_unwind_protect_void (sound_cleanup); - current_sound->header = alloca (MAX_SOUND_HEADER_BYTES); + char headerbuf[MAX_SOUND_HEADER_BYTES]; + current_sound->header = headerbuf; if (STRINGP (attrs[SOUND_FILE])) { === modified file 'src/syntax.c' --- src/syntax.c 2014-09-04 16:14:05 +0000 +++ src/syntax.c 2014-09-07 07:04:01 +0000 @@ -1567,6 +1567,7 @@ const unsigned char *str; int len; Lisp_Object iso_classes; + USE_SAFE_ALLOCA; CHECK_STRING (string); iso_classes = Qnil; @@ -1699,7 +1700,7 @@ memcpy (himap, fastmap + 0200, 0200); himap[0200] = 0; memset (fastmap + 0200, 0, 0200); - char_ranges = alloca (sizeof *char_ranges * 128 * 2); + SAFE_NALLOCA (char_ranges, 2, 128); i = 0; while ((p1 = memchr (himap + i, 1, 0200 - i))) @@ -1723,7 +1724,7 @@ } else /* STRING is multibyte */ { - char_ranges = alloca (sizeof *char_ranges * SCHARS (string) * 2); + SAFE_NALLOCA (char_ranges, 2, SCHARS (string)); while (i_byte < size_byte) { @@ -2032,6 +2033,7 @@ SET_PT_BOTH (pos, pos_byte); immediate_quit = 0; + SAFE_FREE (); return make_number (PT - start_point); } } === modified file 'src/term.c' --- src/term.c 2014-08-10 16:28:36 +0000 +++ src/term.c 2014-09-07 07:04:01 +0000 @@ -3191,6 +3191,7 @@ Lisp_Object selectface; int first_item = 0; int col, row; + USE_SAFE_ALLOCA; /* Don't allow non-positive x0 and y0, lest the menu will wrap around the display. */ @@ -3199,7 +3200,7 @@ if (y0 <= 0) y0 = 1; - state = alloca (menu->panecount * sizeof (struct tty_menu_state)); + SAFE_NALLOCA (state, 1, menu->panecount); memset (state, 0, sizeof (*state)); faces[0] = lookup_derived_face (sf, intern ("tty-menu-disabled-face"), @@ -3421,6 +3422,7 @@ discard_mouse_events (); if (!kbd_buffer_events_waiting ()) clear_input_pending (); + SAFE_FREE (); return result; } @@ -3606,6 +3608,7 @@ item_y = y += f->top_pos; /* Create all the necessary panes and their items. */ + USE_SAFE_ALLOCA; maxwidth = maxlines = lines = i = 0; lpane = TTYM_FAILURE; while (i < menu_items_used) @@ -3674,9 +3677,7 @@ if (!NILP (descrip)) { - /* If alloca is fast, use that to make the space, - to reduce gc needs. */ - item_data = (char *) alloca (maxwidth + SBYTES (descrip) + 1); + item_data = SAFE_ALLOCA (maxwidth + SBYTES (descrip) + 1); memcpy (item_data, SSDATA (item_name), SBYTES (item_name)); for (j = SCHARS (item_name); j < maxwidth; j++) item_data[j] = ' '; @@ -3829,6 +3830,7 @@ tty_menu_end: + SAFE_FREE (); unbind_to (specpdl_count, Qnil); return entry; } === modified file 'src/textprop.c' --- src/textprop.c 2014-01-14 17:59:19 +0000 +++ src/textprop.c 2014-09-07 07:04:01 +0000 @@ -660,6 +660,7 @@ set_buffer_temp (XBUFFER (object)); + USE_SAFE_ALLOCA; GET_OVERLAYS_AT (XINT (position), overlay_vec, noverlays, NULL, 0); noverlays = sort_overlays (overlay_vec, noverlays, w); @@ -674,9 +675,11 @@ if (overlay) /* Return the overlay we got the property from. */ *overlay = overlay_vec[noverlays]; + SAFE_FREE (); return tem; } } + SAFE_FREE (); } if (overlay) === modified file 'src/window.c' --- src/window.c 2014-08-11 00:59:34 +0000 +++ src/window.c 2014-09-07 07:04:01 +0000 @@ -6124,6 +6124,7 @@ Lisp_Object frame; struct frame *f; ptrdiff_t old_point = -1; + USE_SAFE_ALLOCA; CHECK_WINDOW_CONFIGURATION (configuration); @@ -6231,8 +6232,8 @@ really like to do is to free only those matrices not reused below. */ root_window = XWINDOW (FRAME_ROOT_WINDOW (f)); - leaf_windows = alloca (count_windows (root_window) - * sizeof *leaf_windows); + int nwindows = count_windows (root_window); + SAFE_NALLOCA (leaf_windows, 1, nwindows); n_leaf_windows = get_leaf_windows (root_window, leaf_windows, 0); /* Kludge Alert! @@ -6456,6 +6457,7 @@ Vminibuf_scroll_window = data->minibuf_scroll_window; minibuf_selected_window = data->minibuf_selected_window; + SAFE_FREE (); return (FRAME_LIVE_P (f) ? Qt : Qnil); } === modified file 'src/xdisp.c' --- src/xdisp.c 2014-09-04 16:14:05 +0000 +++ src/xdisp.c 2014-09-07 07:04:01 +0000 @@ -2626,15 +2626,14 @@ { ptrdiff_t i; ptrdiff_t count = SPECPDL_INDEX (); - struct gcpro gcpro1; - Lisp_Object *args = alloca (nargs * word_size); + Lisp_Object *args; + USE_SAFE_ALLOCA; + SAFE_ALLOCA_LISP (args, nargs); args[0] = func; for (i = 1; i < nargs; i++) args[i] = va_arg (ap, Lisp_Object); - GCPRO1 (args[0]); - gcpro1.nvars = nargs; specbind (Qinhibit_redisplay, Qt); if (inhibit_quit) specbind (Qinhibit_quit, Qt); @@ -2642,7 +2641,7 @@ so there is no possibility of wanting to redisplay. */ val = internal_condition_case_n (Ffuncall, nargs, args, Qt, safe_eval_handler); - UNGCPRO; + SAFE_FREE (); val = unbind_to (count, val); } @@ -3659,6 +3658,7 @@ ptrdiff_t i, noverlays; ptrdiff_t endpos; Lisp_Object *overlays; + USE_SAFE_ALLOCA; /* Get all overlays at the given position. */ GET_OVERLAYS_AT (pos, overlays, noverlays, &endpos, 1); @@ -3675,6 +3675,7 @@ endpos = min (endpos, oendpos); } + SAFE_FREE (); return endpos; } @@ -5735,10 +5736,11 @@ Lisp_Object overlay, window, str, invisible; struct Lisp_Overlay *ov; ptrdiff_t start, end; - ptrdiff_t size = 20; ptrdiff_t n = 0, i, j; int invis_p; - struct overlay_entry *entries = alloca (size * sizeof *entries); + struct overlay_entry entriesbuf[20]; + ptrdiff_t size = ARRAYELTS (entriesbuf); + struct overlay_entry *entries = entriesbuf; USE_SAFE_ALLOCA; if (charpos <= 0) @@ -10191,9 +10193,9 @@ { ptrdiff_t nbytes = SBYTES (m); bool multibyte = STRING_MULTIBYTE (m); + char *buffer; USE_SAFE_ALLOCA; - char *buffer = SAFE_ALLOCA (nbytes); - memcpy (buffer, SDATA (m), nbytes); + SAFE_ALLOCA_STRING (buffer, m); message_dolog (buffer, nbytes, 1, multibyte); SAFE_FREE (); } @@ -10395,11 +10397,13 @@ { ptrdiff_t len; ptrdiff_t maxsize = FRAME_MESSAGE_BUF_SIZE (f); - char *message_buf = alloca (maxsize + 1); + USE_SAFE_ALLOCA; + char *message_buf = SAFE_ALLOCA (maxsize + 1); len = doprnt (message_buf, maxsize, m, 0, ap); message3 (make_string (message_buf, len)); + SAFE_FREE (); } else message1 (0); @@ -18695,10 +18699,10 @@ else if (glyphs == 1) { int area; + char s[SHRT_MAX + 4]; for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) { - char *s = alloca (row->used[area] + 4); int i; for (i = 0; i < row->used[area]; ++i) @@ -22690,10 +22694,8 @@ } else if (CHARACTERP (eoltype)) { - unsigned char *tmp = alloca (MAX_MULTIBYTE_LENGTH); int c = XFASTINT (eoltype); - eol_str_len = CHAR_STRING (c, tmp); - eol_str = tmp; + return buf + CHAR_STRING (c, (unsigned char *) buf); } else { @@ -24609,7 +24611,7 @@ face_id = (row)->glyphs[area][START].face_id; \ \ s = alloca (sizeof *s); \ - char2b = alloca ((END - START) * sizeof *char2b); \ + SAFE_NALLOCA (char2b, 1, (END) - (START)); \ INIT_GLYPH_STRING (s, char2b, w, row, area, START, HL); \ append_glyph_string (&HEAD, &TAIL, s); \ s->x = (X); \ @@ -24637,7 +24639,7 @@ struct glyph_string *first_s = NULL; \ int n; \ \ - char2b = alloca (cmp->glyph_len * sizeof *char2b); \ + SAFE_NALLOCA (char2b, 1, cmp->glyph_len); \ \ /* Make glyph_strings for each glyph sequence that is drawable by \ the same face, and append them to HEAD/TAIL. */ \ @@ -24672,7 +24674,7 @@ gstring = (composition_gstring_from_id \ ((row)->glyphs[area][START].u.cmp.id)); \ s = alloca (sizeof *s); \ - char2b = alloca (LGSTRING_GLYPH_LEN (gstring) * sizeof *char2b); \ + SAFE_NALLOCA (char2b, 1, LGSTRING_GLYPH_LEN (gstring)); \ INIT_GLYPH_STRING (s, char2b, w, row, area, START, HL); \ append_glyph_string (&(HEAD), &(TAIL), s); \ s->x = (X); \ @@ -24824,6 +24826,7 @@ BUILD_GLYPH_STRINGS will modify its start parameter. That's the reason we use a separate variable `i'. */ i = start; + USE_SAFE_ALLOCA; BUILD_GLYPH_STRINGS (i, end, head, tail, hl, x, last_x); if (tail) x_reached = tail->x + tail->background_width; @@ -25023,6 +25026,7 @@ RELEASE_HDC (hdc, f); + SAFE_FREE (); return x_reached; } @@ -29291,6 +29295,8 @@ /* Is this char mouse-active or does it have help-echo? */ position = make_number (pos); + USE_SAFE_ALLOCA; + if (BUFFERP (object)) { /* Put all the overlays we want in a vector in overlay_vec. */ @@ -29572,6 +29578,7 @@ BEGV = obegv; ZV = ozv; current_buffer = obuf; + SAFE_FREE (); } set_cursor: === modified file 'src/xfaces.c' --- src/xfaces.c 2014-08-07 10:15:52 +0000 +++ src/xfaces.c 2014-09-07 07:04:01 +0000 @@ -5980,6 +5980,7 @@ endpos = XINT (end); /* Look at properties from overlays. */ + USE_SAFE_ALLOCA; { ptrdiff_t next_overlay; @@ -6006,7 +6007,10 @@ /* Optimize common cases where we can use the default face. */ if (noverlays == 0 && NILP (prop)) - return default_face->id; + { + SAFE_FREE (); + return default_face->id; + } /* Begin with attributes from the default face. */ memcpy (attrs, default_face->lface, sizeof attrs); @@ -6034,6 +6038,8 @@ *endptr = endpos; + SAFE_FREE (); + /* Look up a realized face with the given face attributes, or realize a new one for ASCII characters. */ return lookup_face (f, attrs); === modified file 'src/xmenu.c' --- src/xmenu.c 2014-07-27 13:21:30 +0000 +++ src/xmenu.c 2014-09-07 07:04:01 +0000 @@ -2023,7 +2023,8 @@ Window root; XMenu *menu; int pane, selidx, lpane, status; - Lisp_Object entry, pane_prefix; + Lisp_Object entry = Qnil; + Lisp_Object pane_prefix; char *datap; int ulx, uly, width, height; int dispwidth, dispheight; @@ -2045,6 +2046,7 @@ return Qnil; } + USE_SAFE_ALLOCA; block_input (); /* Figure out which root window F is on. */ @@ -2057,8 +2059,7 @@ if (menu == NULL) { *error_name = "Can't create menu"; - unblock_input (); - return Qnil; + goto return_entry; } /* Don't GC while we prepare and show the menu, @@ -2101,8 +2102,7 @@ { XMenuDestroy (FRAME_X_DISPLAY (f), menu); *error_name = "Can't create pane"; - unblock_input (); - return Qnil; + goto return_entry; } i += MENU_ITEMS_PANE_LENGTH; @@ -2146,9 +2146,7 @@ if (!NILP (descrip)) { - /* if alloca is fast, use that to make the space, - to reduce gc needs. */ - item_data = alloca (maxwidth + SBYTES (descrip) + 1); + item_data = SAFE_ALLOCA (maxwidth + SBYTES (descrip) + 1); memcpy (item_data, SSDATA (item_name), SBYTES (item_name)); for (j = SCHARS (item_name); j < maxwidth; j++) item_data[j] = ' '; @@ -2166,8 +2164,7 @@ { XMenuDestroy (FRAME_X_DISPLAY (f), menu); *error_name = "Can't add selection to menu"; - unblock_input (); - return Qnil; + goto return_entry; } i += MENU_ITEMS_ITEM_LENGTH; lines++; @@ -2241,7 +2238,7 @@ status = XMenuActivate (FRAME_X_DISPLAY (f), menu, &pane, &selidx, x, y, ButtonReleaseMask, &datap, menu_help_callback); - entry = pane_prefix = Qnil; + pane_prefix = Qnil; switch (status) { @@ -2300,10 +2297,10 @@ break; } + return_entry: unblock_input (); - unbind_to (specpdl_count, Qnil); - - return entry; + SAFE_FREE (); + return unbind_to (specpdl_count, entry); } #endif /* not USE_X_TOOLKIT */ ------------------------------------------------------------ revno: 117828 fixes bug: http://debbugs.gnu.org/18416 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-09-06 10:40:43 +0300 message: Remove unused variable EMACS_HEAPSIZE from src/Makefile.in. src/Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416) ChangeLog: Mention explicitly the removal of EMACS_HEAPSIZE. diff: === modified file 'ChangeLog' --- ChangeLog 2014-09-04 02:02:46 +0000 +++ ChangeLog 2014-09-06 07:40:43 +0000 @@ -368,6 +368,7 @@ dumped heap size depending on 32/64bits arch on Windows. Don't check for pthreads.h on MinGW32/64, it gets in the way. Use mmap(2) for buffers and system malloc for MinGW32/64. + (EMACS_HEAPSIZE): Remove. 2014-05-27 Paul Eggert === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-04 05:38:37 +0000 +++ src/ChangeLog 2014-09-06 07:40:43 +0000 @@ -1,3 +1,7 @@ +2014-09-06 Eli Zaretskii + + * Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416) + 2014-09-04 Jan D * xterm.c (x_term_init): Don't call x_session_initialize if running @@ -2571,7 +2575,7 @@ Use mmap(2) emulation for allocating buffer text on MS-Windows. * Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from - configure. + configure, not from HEAPSIZE. (ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used. * lisp.h (NONPOINTER_BITS): Modify the condition to define to zero === modified file 'src/Makefile.in' --- src/Makefile.in 2014-09-04 02:15:56 +0000 +++ src/Makefile.in 2014-09-06 07:40:43 +0000 @@ -297,9 +297,6 @@ RUN_TEMACS = ./temacs -## Static heap size for temacs on MinGW. -EMACS_HEAPSIZE = @EMACS_HEAPSIZE@ - UNEXEC_OBJ = @UNEXEC_OBJ@ CANNOT_DUMP=@CANNOT_DUMP@ ------------------------------------------------------------ revno: 117827 fixes bug: http://debbugs.gnu.org/18327 committer: Leo Liu branch nick: trunk timestamp: Sat 2014-09-06 08:59:00 +0800 message: Add vector qpattern to pcase * doc/lispref/control.texi (Pattern matching case statement): Document vector qpattern. * etc/NEWS: Mention vector qpattern for pcase. (Bug#18327). * lisp/emacs-lisp/pcase.el (pcase): Doc fix. (pcase--split-vector): New function. (pcase--q1): Support vector qpattern. (Bug#18327) diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-08-29 11:02:56 +0000 +++ doc/lispref/ChangeLog 2014-09-06 00:59:00 +0000 @@ -1,3 +1,8 @@ +2014-09-06 Leo Liu + + * control.texi (Pattern matching case statement): Document vector + qpattern. (Bug#18327) + 2014-08-29 Dmitry Antipov * lists.texi (Functions that Rearrange Lists): Remove === modified file 'doc/lispref/control.texi' --- doc/lispref/control.texi 2014-01-24 04:11:48 +0000 +++ doc/lispref/control.texi 2014-09-06 00:59:00 +0000 @@ -370,6 +370,10 @@ @item (@var{qpattern1} . @var{qpattern2}) This pattern matches any cons cell whose @code{car} matches @var{QPATTERN1} and whose @code{cdr} matches @var{PATTERN2}. +@item [@var{qpattern1 qpattern2..qpatternm}] +This pattern matches a vector of length @code{M} whose 0..(M-1)th +elements match @var{QPATTERN1}, @var{QPATTERN2}..@var{QPATTERNm}, +respectively. @item @var{atom} This pattern matches any atom @code{equal} to @var{atom}. @item ,@var{upattern} === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-09-01 14:57:21 +0000 +++ etc/ChangeLog 2014-09-06 00:59:00 +0000 @@ -1,3 +1,7 @@ +2014-09-06 Leo Liu + + * NEWS: Mention vector qpattern for pcase. (Bug#18327). + 2014-09-01 Eli Zaretskii * NEWS: Mention that ls-lisp uses string-collate-lessp. === modified file 'etc/NEWS' --- etc/NEWS 2014-09-05 19:07:52 +0000 +++ etc/NEWS 2014-09-06 00:59:00 +0000 @@ -107,6 +107,9 @@ *** C-x C-x in rectangle-mark-mode now cycles through the four corners. *** `string-rectangle' provides on-the-fly preview of the result. ++++ +** Macro `pcase' now supports vector qpattern. + ** New font-lock functions font-lock-ensure and font-lock-flush, which should be used instead of font-lock-fontify-buffer when called from Elisp. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-05 19:07:52 +0000 +++ lisp/ChangeLog 2014-09-06 00:59:00 +0000 @@ -1,3 +1,9 @@ +2014-09-06 Leo Liu + + * emacs-lisp/pcase.el (pcase): Doc fix. + (pcase--split-vector): New function. + (pcase--q1): Support vector qpattern. (Bug#18327) + 2014-09-05 Sam Steingold * textmodes/tex-mode.el (tex-print-file-extension): New user === modified file 'lisp/emacs-lisp/pcase.el' --- lisp/emacs-lisp/pcase.el 2014-01-03 04:40:30 +0000 +++ lisp/emacs-lisp/pcase.el 2014-09-06 00:59:00 +0000 @@ -108,11 +108,12 @@ \"non-linear\"), then the second occurrence is turned into an `eq'uality test. QPatterns can take the following forms: - (QPAT1 . QPAT2) matches if QPAT1 matches the car and QPAT2 the cdr. - ,UPAT matches if the UPattern UPAT matches. - STRING matches if the object is `equal' to STRING. - ATOM matches if the object is `eq' to ATOM. -QPatterns for vectors are not implemented yet. + (QPAT1 . QPAT2) matches if QPAT1 matches the car and QPAT2 the cdr. + [QPAT1 QPAT2..QPATn] matches a vector of length n and QPAT1..QPATn match + its 0..(n-1)th elements, respectively. + ,UPAT matches if the UPattern UPAT matches. + STRING matches if the object is `equal' to STRING. + ATOM matches if the object is `eq' to ATOM. PRED can take the form FUNCTION in which case it gets called with one argument. @@ -447,6 +448,24 @@ (pcase--mutually-exclusive-p #'consp (cadr pat))) '(:pcase--fail . nil)))) +(defun pcase--split-vector (syms pat) + (cond + ;; A QPattern for a vector of same length. + ((and (eq (car-safe pat) '\`) + (vectorp (cadr pat)) + (= (length syms) (length (cadr pat)))) + (let ((qpat (cadr pat))) + (cons `(and ,@(mapcar (lambda (s) + `(match ,(car s) . + ,(pcase--upat (aref qpat (cdr s))))) + syms)) + :pcase--fail))) + ;; Other QPatterns go to the `else' side. + ((eq (car-safe pat) '\`) '(:pcase--fail . nil)) + ((and (eq (car-safe pat) 'pred) + (pcase--mutually-exclusive-p #'vectorp (cadr pat))) + '(:pcase--fail . nil)))) + (defun pcase--split-equal (elem pat) (cond ;; The same match will give the same result. @@ -738,8 +757,30 @@ ((eq (car-safe qpat) '\,) (error "Can't use `,UPATTERN")) ((floatp qpat) (error "Floating point patterns not supported")) ((vectorp qpat) - ;; FIXME. - (error "Vector QPatterns not implemented yet")) + (let* ((len (length qpat)) + (syms (mapcar (lambda (i) (cons (make-symbol (format "xaref%s" i)) i)) + (number-sequence 0 (1- len)))) + (splitrest (pcase--split-rest + sym + (lambda (pat) (pcase--split-vector syms pat)) + rest)) + (then-rest (car splitrest)) + (else-rest (cdr splitrest)) + (then-body (pcase--u1 + `(,@(mapcar (lambda (s) + `(match ,(car s) . + ,(pcase--upat (aref qpat (cdr s))))) + syms) + ,@matches) + code vars then-rest))) + (pcase--if + `(and (vectorp ,sym) (= (length ,sym) ,len)) + (macroexp-let* (delq nil (mapcar (lambda (s) + (and (get (car s) 'pcase-used) + `(,(car s) (aref ,sym ,(cdr s))))) + syms)) + then-body) + (pcase--u else-rest)))) ((consp qpat) (let* ((syma (make-symbol "xcar")) (symd (make-symbol "xcdr")) ------------------------------------------------------------ revno: 117826 committer: Sam Steingold branch nick: trunk timestamp: Fri 2014-09-05 15:07:52 -0400 message: New custom variable `tex-print-file-extension' to help users who use PDF instead of DVI. * lisp/textmodes/tex-mode.el (tex-print-file-extension): New user option. (tex-print): Use it instead of the hard-coded string. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-09-05 10:29:34 +0000 +++ etc/NEWS 2014-09-05 19:07:52 +0000 @@ -163,6 +163,11 @@ *** New custom variable `hide-ifdef-exclude-define-regexp' to define symbol name patterns (e.x. all "FOR_DOXYGEN_ONLY_*") to be excluded. +** TeX mode + +*** New custom variable `tex-print-file-extension' to help users who +use PDF instead of DVI. + ** Obsolete packages --- === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-05 14:12:48 +0000 +++ lisp/ChangeLog 2014-09-05 19:07:52 +0000 @@ -1,3 +1,9 @@ +2014-09-05 Sam Steingold + + * textmodes/tex-mode.el (tex-print-file-extension): New user + option. + (tex-print): Use it instead of the hard-coded string. + 2014-09-05 Michael Albinus * net/tramp-sh.el (tramp-sh-handle-start-file-process): === modified file 'lisp/textmodes/tex-mode.el' --- lisp/textmodes/tex-mode.el 2014-07-27 11:38:59 +0000 +++ lisp/textmodes/tex-mode.el 2014-09-05 19:07:52 +0000 @@ -2573,18 +2573,28 @@ (prefix-numeric-value linenum) (/ (window-height) 2))))))) +(defcustom tex-print-file-extension ".dvi" + "The TeX-compiled file extension for viewing and printing. +If you use pdflatex instead of latex, set this to \".pdf\" and modify + `tex-dvi-view-command' and `tex-dvi-print-command' appropriatelty." + :type 'string + :group 'tex-view + :version "24.5") + (defun tex-print (&optional alt) "Print the .dvi file made by \\[tex-region], \\[tex-buffer] or \\[tex-file]. Runs the shell command defined by `tex-dvi-print-command'. If prefix argument is provided, use the alternative command, `tex-alt-dvi-print-command'." (interactive "P") - (let ((print-file-name-dvi (tex-append tex-print-file ".dvi")) + (let ((print-file-name-dvi (tex-append tex-print-file + tex-print-file-extension)) test-name) (if (and (not (equal (current-buffer) tex-last-buffer-texed)) (buffer-file-name) ;; Check that this buffer's printed file is up to date. (file-newer-than-file-p - (setq test-name (tex-append (buffer-file-name) ".dvi")) + (setq test-name (tex-append (buffer-file-name) + tex-print-file-extension)) (buffer-file-name))) (setq print-file-name-dvi test-name)) (if (not (file-exists-p print-file-name-dvi)) ------------------------------------------------------------ revno: 117825 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-09-05 16:12:48 +0200 message: * net/tramp-sh.el (tramp-sh-handle-start-file-process): Expand `default-directory'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-05 10:29:34 +0000 +++ lisp/ChangeLog 2014-09-05 14:12:48 +0000 @@ -1,3 +1,8 @@ +2014-09-05 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-start-file-process): + Expand `default-directory'. + 2014-09-05 Martin Rudalics * scroll-bar.el (horizontal-scroll-bars-available-p): New === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-08-07 09:13:54 +0000 +++ lisp/net/tramp-sh.el 2014-09-05 14:12:48 +0000 @@ -2811,7 +2811,7 @@ ;; connection has been setup. (defun tramp-sh-handle-start-file-process (name buffer program &rest args) "Like `start-file-process' for Tramp files." - (with-parsed-tramp-file-name default-directory nil + (with-parsed-tramp-file-name (expand-file-name default-directory) nil (let* (;; When PROGRAM matches "*sh", and the first arg is "-c", ;; it might be that the arguments exceed the command line ;; length. Therefore, we modify the command. ------------------------------------------------------------ revno: 117824 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-09-05 15:32:55 +0200 message: New string collation tests. * automated/fns-tests.el (fns-tests-compare-strings): In case `compare-strings' shall return t, check for this. (fns-tests-collate-strings, fns-tests-collate-sort): New tests. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-09-03 04:21:40 +0000 +++ test/ChangeLog 2014-09-05 13:32:55 +0000 @@ -1,3 +1,9 @@ +2014-09-05 Michael Albinus + + * automated/fns-tests.el (fns-tests-compare-strings): In case + `compare-strings' shall return t, check for this. + (fns-tests-collate-strings, fns-tests-collate-sort): New tests. + 2014-09-03 Fabián Ezequiel Gallina * automated/python-tests.el (python-indent-electric-colon-1): === modified file 'test/automated/fns-tests.el' --- test/automated/fns-tests.el 2014-08-29 11:02:56 +0000 +++ test/automated/fns-tests.el 2014-09-05 13:32:55 +0000 @@ -79,12 +79,12 @@ (should-error (compare-strings "xyzzy" 0 'foo "zyxxy" 2 3)) (should-error (compare-strings "xyzzy" 0 2 "zyxxy" 'foo 3)) (should-error (compare-strings "xyzzy" nil 3 "zyxxy" 4 'foo)) - (should (compare-strings "" nil nil "" nil nil)) - (should (compare-strings "" 0 0 "" 0 0)) - (should (compare-strings "test" nil nil "test" nil nil)) - (should (compare-strings "test" nil nil "test" nil nil t)) - (should (compare-strings "test" nil nil "test" nil nil nil)) - (should (compare-strings "Test" nil nil "test" nil nil t)) + (should (eq (compare-strings "" nil nil "" nil nil) t)) + (should (eq (compare-strings "" 0 0 "" 0 0) t)) + (should (eq (compare-strings "test" nil nil "test" nil nil) t)) + (should (eq (compare-strings "test" nil nil "test" nil nil t) t)) + (should (eq (compare-strings "test" nil nil "test" nil nil nil) t)) + (should (eq (compare-strings "Test" nil nil "test" nil nil t) t)) (should (= (compare-strings "Test" nil nil "test" nil nil) -1)) (should (= (compare-strings "Test" nil nil "test" nil nil) -1)) (should (= (compare-strings "test" nil nil "Test" nil nil) 1)) @@ -92,22 +92,48 @@ (should (= (compare-strings "barbaz" nil nil "foobar" nil nil) -1)) (should (= (compare-strings "foobaz" nil nil "farbaz" nil nil) 2)) (should (= (compare-strings "farbaz" nil nil "foobar" nil nil) -2)) - (should (compare-strings "abcxyz" 0 2 "abcprq" 0 2)) - (should (compare-strings "abcxyz" 0 -3 "abcprq" 0 -3)) + (should (eq (compare-strings "abcxyz" 0 2 "abcprq" 0 2) t)) + (should (eq (compare-strings "abcxyz" 0 -3 "abcprq" 0 -3) t)) (should (= (compare-strings "abcxyz" 0 6 "abcprq" 0 6) 4)) (should (= (compare-strings "abcprq" 0 6 "abcxyz" 0 6) -4)) - (should (compare-strings "xyzzy" -3 4 "azza" -3 3)) - (should (compare-strings "こんにちはｺﾝﾆﾁﾊ" nil nil "こんにちはｺﾝﾆﾁﾊ" nil nil)) + (should (eq (compare-strings "xyzzy" -3 4 "azza" -3 3) t)) + (should (eq (compare-strings "こんにちはｺﾝﾆﾁﾊ" nil nil "こんにちはｺﾝﾆﾁﾊ" nil nil) t)) (should (= (compare-strings "んにちはｺﾝﾆﾁﾊこ" nil nil "こんにちはｺﾝﾆﾁﾊ" nil nil) 1)) (should (= (compare-strings "こんにちはｺﾝﾆﾁﾊ" nil nil "んにちはｺﾝﾆﾁﾊこ" nil nil) -1))) +(ert-deftest fns-tests-collate-strings () + ;; When there is no collation library, collation functions fall back + ;; to their lexicographic counterparts. We don't need to test then. + (skip-unless (not (ignore-errors (string-collate-equalp "" "" t)))) + + (should (string-collate-equalp "xyzzy" "xyzzy")) + (should-not (string-collate-equalp "xyzzy" "XYZZY")) + + ;; In POSIX or C locales, collation order is lexicographic. + (should (string-collate-lessp "XYZZY" "xyzzy" "POSIX")) + ;; In a language specific locale, collation order is different. + (should (string-collate-lessp + "xyzzy" "XYZZY" + (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8"))) + + ;; Ignore case. + (should (string-collate-equalp "xyzzy" "XYZZY" nil t)) + + ;; Locale must be valid. + (should-error (string-collate-equalp "xyzzy" "xyzzy" "en_DE.UTF-8"))) + +;; There must be a check for valid codepoints. (Check not implemented yet) +; (should-error +; (string-collate-equalp (string ?\x00110000) (string ?\x00110000))) +;; Invalid UTF-8 sequences shall be indicated. How to create such strings? + (ert-deftest fns-tests-sort () (should (equal (sort '(9 5 2 -1 5 3 8 7 4) (lambda (x y) (< x y))) '(-1 2 3 4 5 5 7 8 9))) (should (equal (sort '(9 5 2 -1 5 3 8 7 4) (lambda (x y) (> x y))) '(9 8 7 5 5 4 3 2 -1))) (should (equal (sort '[9 5 2 -1 5 3 8 7 4] (lambda (x y) (< x y))) - [-1 2 3 4 5 5 7 8 9])) + [-1 2 3 4 5 5 7 8 9])) (should (equal (sort '[9 5 2 -1 5 3 8 7 4] (lambda (x y) (> x y))) [9 8 7 5 5 4 3 2 -1])) (should (equal @@ -118,3 +144,35 @@ (lambda (x y) (< (car x) (car y)))) [(8 . "xxx") (8 . "bbb") (8 . "ttt") (8 . "eee") (9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")]))) + +(ert-deftest fns-tests-collate-sort () + ;; Punctuation and whitespace characters are relevant for POSIX. + (should + (equal + (sort '("11" "12" "1 1" "1 2" "1.1" "1.2") + (lambda (a b) (string-collate-lessp a b "POSIX"))) + '("1 1" "1 2" "1.1" "1.2" "11" "12"))) + ;; Punctuation and whitespace characters are not taken into account + ;; for collation in other locales. + (should + (equal + (sort '("11" "12" "1 1" "1 2" "1.1" "1.2") + (lambda (a b) + (string-collate-lessp + a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))) + '("11" "1 1" "1.1" "12" "1 2" "1.2"))) + + ;; Diacritics are different letters for POSIX, they sort lexicographical. + (should + (equal + (sort '("Ævar" "Agustín" "Adrian" "Eli") + (lambda (a b) (string-collate-lessp a b "POSIX"))) + '("Adrian" "Agustín" "Eli" "Ævar"))) + ;; Diacritics are sorted between similar letters for other locales. + (should + (equal + (sort '("Ævar" "Agustín" "Adrian" "Eli") + (lambda (a b) + (string-collate-lessp + a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))) + '("Adrian" "Ævar" "Agustín" "Eli")))) ------------------------------------------------------------ revno: 117823 committer: martin rudalics branch nick: trunk timestamp: Fri 2014-09-05 12:29:34 +0200 message: Add and use function horizontal-scroll-bars-available-p. * scroll-bar.el (horizontal-scroll-bars-available-p): New function. (horizontal-scroll-bar-mode): Rewrite using horizontal-scroll-bars-available-p. * menu-bar.el (menu-bar-showhide-scroll-bar-menu): Rewrite using horizontal-scroll-bars-available-p. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-09-05 01:20:51 +0000 +++ etc/NEWS 2014-09-05 10:29:34 +0000 @@ -240,6 +240,8 @@ ** Emacs can now draw horizontal scroll bars on some platforms that provide toolkit scroll bars, namely Gtk, Lucid, Motif and Windows. Horizontal scroll bars are turned off by default. +*** New function `horizontal-scroll-bars-available-p' telling whether + horizontal scroll bars are available on the underlying system. *** New mode `horizontal-scroll-bar-mode' to toggle horizontal scroll bars on all existing and future frames. *** New frame parameters `horizontal-scroll-bars' and === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-05 01:20:51 +0000 +++ lisp/ChangeLog 2014-09-05 10:29:34 +0000 @@ -1,3 +1,12 @@ +2014-09-05 Martin Rudalics + + * scroll-bar.el (horizontal-scroll-bars-available-p): New + function. + (horizontal-scroll-bar-mode): Rewrite using + horizontal-scroll-bars-available-p. + * menu-bar.el (menu-bar-showhide-scroll-bar-menu): Rewrite using + horizontal-scroll-bars-available-p. + 2014-09-05 Stefan Monnier * subr.el (call-process-shell-command, process-file-shell-command): === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2014-07-29 14:21:11 +0000 +++ lisp/menu-bar.el 2014-09-05 10:29:34 +0000 @@ -903,19 +903,17 @@ '(menu-item "Horizontal" menu-bar-horizontal-scroll-bar :help "Horizontal scroll bar" - :visible (display-graphic-p) - :button (:radio . (eq (cdr (assq 'horizontal-scroll-bars - (frame-parameters))) - t)))) + :visible (horizontal-scroll-bars-available-p) + :button (:radio . (cdr (assq 'horizontal-scroll-bars + (frame-parameters)))))) (bindings--define-key menu [none-horizontal] '(menu-item "None-horizontal" menu-bar-no-horizontal-scroll-bar :help "Turn off horizontal scroll bars" - :visible (display-graphic-p) - :button (:radio . (eq (cdr (assq 'horizontal-scroll-bars - (frame-parameters))) - nil)))) + :visible (horizontal-scroll-bars-available-p) + :button (:radio . (not (cdr (assq 'horizontal-scroll-bars + (frame-parameters))))))) (bindings--define-key menu [right] '(menu-item "On the Right" === modified file 'lisp/scroll-bar.el' --- lisp/scroll-bar.el 2014-09-03 15:10:29 +0000 +++ lisp/scroll-bar.el 2014-09-05 10:29:34 +0000 @@ -144,6 +144,13 @@ (if v (or previous-scroll-bar-mode default-frame-scroll-bars)))))) +(defun horizontal-scroll-bars-available-p () + "Return non-nil when horizontal scroll bars are available on this system." + (and (display-graphic-p) + (boundp 'x-toolkit-scroll-bars) + x-toolkit-scroll-bars + (not (eq (window-system) 'ns)))) + (define-minor-mode horizontal-scroll-bar-mode "Toggle horizontal scroll bars on all frames (Horizontal Scroll Bar mode). With a prefix argument ARG, enable Horizontal Scroll Bar mode if @@ -155,14 +162,19 @@ :init-value nil :global t :group 'frames - (dolist (frame (frame-list)) - (set-frame-parameter - frame 'horizontal-scroll-bars horizontal-scroll-bar-mode)) - ;; Handle `default-frame-alist' entry. - (setq default-frame-alist - (cons (cons 'horizontal-scroll-bars horizontal-scroll-bar-mode) - (assq-delete-all 'horizontal-scroll-bars - default-frame-alist)))) + (if (and horizontal-scroll-bar-mode + (not (horizontal-scroll-bars-available-p))) + (progn + (setq horizontal-scroll-bar-mode nil) + (message "Horizontal scroll bars are not implemented on this system")) + (dolist (frame (frame-list)) + (set-frame-parameter + frame 'horizontal-scroll-bars horizontal-scroll-bar-mode)) + ;; Handle `default-frame-alist' entry. + (setq default-frame-alist + (cons (cons 'horizontal-scroll-bars horizontal-scroll-bar-mode) + (assq-delete-all 'horizontal-scroll-bars + default-frame-alist))))) (defun toggle-scroll-bar (arg) "Toggle whether or not the selected frame has vertical scroll bars. ------------------------------------------------------------ revno: 117822 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18409 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-09-04 21:20:51 -0400 message: * lisp/subr.el (call-process-shell-command, process-file-shell-command): Make the `args' obsolete. (start-process-shell-command, start-file-process-shell-command): Use `declare'. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-09-03 16:13:17 +0000 +++ etc/NEWS 2014-09-05 01:20:51 +0000 @@ -200,6 +200,9 @@ * Lisp Changes in Emacs 24.5 +*** call-process-shell-command and process-file-shell-command +don't take "&rest args" an more. + ** New function `funcall-interactively', which works like `funcall' but makes `called-interactively-p' treat the function as (you guessed it) called interactively. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-05 01:04:47 +0000 +++ lisp/ChangeLog 2014-09-05 01:20:51 +0000 @@ -1,3 +1,10 @@ +2014-09-05 Stefan Monnier + + * subr.el (call-process-shell-command, process-file-shell-command): + Make the `args' obsolete (bug#18409). + (start-process-shell-command, start-file-process-shell-command): + Use `declare'. + 2014-09-05 Jay Belanger * calc/calc-forms.el (math-normalize-hms): Do a better check for === modified file 'lisp/subr.el' --- lisp/subr.el 2014-09-03 04:21:40 +0000 +++ lisp/subr.el 2014-09-05 01:20:51 +0000 @@ -2877,23 +2877,21 @@ An old calling convention accepted any number of arguments after COMMAND, which were just concatenated to COMMAND. This is still supported but strongly discouraged." - ;; We used to use `exec' to replace the shell with the command, - ;; but that failed to handle (...) and semicolon, etc. + (declare (advertised-calling-convention (name buffer command) "23.1")) + ;; We used to use `exec' to replace the shell with the command, + ;; but that failed to handle (...) and semicolon, etc. (start-process name buffer shell-file-name shell-command-switch (mapconcat 'identity args " "))) -(set-advertised-calling-convention 'start-process-shell-command - '(name buffer command) "23.1") (defun start-file-process-shell-command (name buffer &rest args) "Start a program in a subprocess. Return the process object for it. Similar to `start-process-shell-command', but calls `start-file-process'." + (declare (advertised-calling-convention (name buffer command) "23.1")) (start-file-process name buffer (if (file-remote-p default-directory) "/bin/sh" shell-file-name) (if (file-remote-p default-directory) "-c" shell-command-switch) (mapconcat 'identity args " "))) -(set-advertised-calling-convention 'start-file-process-shell-command - '(name buffer command) "23.1") (defun call-process-shell-command (command &optional infile buffer display &rest args) @@ -2909,13 +2907,18 @@ t (mix it with ordinary output), or a file name string. Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. -Remaining arguments are strings passed as additional arguments for COMMAND. Wildcards and redirection are handled as usual in the shell. If BUFFER is 0, `call-process-shell-command' returns immediately with value nil. Otherwise it waits for COMMAND to terminate and returns a numeric exit status or a signal description string. -If you quit, the process is killed with SIGINT, or SIGKILL if you quit again." +If you quit, the process is killed with SIGINT, or SIGKILL if you quit again. + +An old calling convention accepted any number of arguments after DISPLAY, +which were just concatenated to COMMAND. This is still supported but strongly +discouraged." + (declare (advertised-calling-convention + (command &optional infile buffer display) "24.5")) ;; We used to use `exec' to replace the shell with the command, ;; but that failed to handle (...) and semicolon, etc. (call-process shell-file-name @@ -2927,6 +2930,8 @@ &rest args) "Process files synchronously in a separate process. Similar to `call-process-shell-command', but calls `process-file'." + (declare (advertised-calling-convention + (command &optional infile buffer display) "24.5")) (process-file (if (file-remote-p default-directory) "/bin/sh" shell-file-name) infile buffer display ------------------------------------------------------------ revno: 117821 committer: Jay Belanger branch nick: trunk timestamp: Thu 2014-09-04 20:04:47 -0500 message: calc/calc-forms.el (math-normalize-hms): Do a better check for "negative" hms forms. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-04 16:34:45 +0000 +++ lisp/ChangeLog 2014-09-05 01:04:47 +0000 @@ -1,3 +1,8 @@ +2014-09-05 Jay Belanger + + * calc/calc-forms.el (math-normalize-hms): Do a better check for + "negative" hms forms. + 2014-09-04 Rasmus Pank Roulund * vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status === modified file 'lisp/calc/calc-forms.el' --- lisp/calc/calc-forms.el 2014-01-01 07:43:34 +0000 +++ lisp/calc/calc-forms.el 2014-09-05 01:04:47 +0000 @@ -273,7 +273,10 @@ (m (math-normalize (nth 2 a))) (s (let ((calc-internal-prec (max (- calc-internal-prec 4) 3))) (math-normalize (nth 3 a))))) - (if (math-negp h) + (if (or + (math-negp h) + (and (= h 0) (math-negp m)) + (and (= h 0) (= m 0) (math-negp s))) (progn (if (math-posp s) (setq s (math-add s -60) ------------------------------------------------------------ revno: 117820 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18391 author: Rasmus Pank Roulund committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-09-04 12:34:45 -0400 message: * lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status returns nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-04 15:23:37 +0000 +++ lisp/ChangeLog 2014-09-04 16:34:45 +0000 @@ -1,3 +1,8 @@ +2014-09-04 Rasmus Pank Roulund + + * vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status + returns nil (bug#18391). + 2014-09-04 Stefan Monnier * emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip @@ -195,27 +200,27 @@ 2014-08-24 Alan Mackenzie Handle C++11's "auto" and "decltype" constructions. - * progmodes/cc-engine.el (c-forward-type): Enhance to recognise + * progmodes/cc-engine.el (c-forward-type): Enhance to recognise and return 'decltype. - (c-forward-decl-or-cast-1): New let variables backup-kwd-sym, + (c-forward-decl-or-cast-1): New let variables backup-kwd-sym, prev-kwd-sym, new-style-auto. Enhance to handle the new "auto" keyword. - * progmodes/cc-fonts.el (c-font-lock-declarations): Handle the + * progmodes/cc-fonts.el (c-font-lock-declarations): Handle the "decltype" keyword. - (c-font-lock-c++-new): Handle "decltype" constructions. - * progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re): + (c-font-lock-c++-new): Handle "decltype" constructions. + * progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re): New c-lang-defconsts/defvars. - (c-haskell-op, c-haskell-op-re): New c-lang-defconsts/defvars. - (c-typeof-kwds, c-typeof-key): New c-lang-defconsts/defvars. - (c-typeless-decl-kwds): Append "auto" onto the C++ value. - (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value. + (c-haskell-op, c-haskell-op-re): New c-lang-defconsts/defvars. + (c-typeof-kwds, c-typeof-key): New c-lang-defconsts/defvars. + (c-typeless-decl-kwds): Append "auto" onto the C++ value. + (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value. Make ">>" act as double template ender in C++ Mode. - * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split + * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split off from c->-op-cont-re. - (c->-op-cont-tokens): Change to use the above. - (c->-op-without->-cont-regexp): New lang-const. - * progmodes/cc-engine.el (c-forward-<>-arglist-recur): + (c->-op-cont-tokens): Change to use the above. + (c->-op-without->-cont-regexp): New lang-const. + * progmodes/cc-engine.el (c-forward-<>-arglist-recur): Use c->-op-without->-cont-regexp in place of c->-op-cont-tokens. === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2014-08-25 16:48:08 +0000 +++ lisp/vc/vc-git.el 2014-09-04 16:34:45 +0000 @@ -774,7 +774,7 @@ "Return the list of files with conflicts in DIRECTORY." (let* ((status (vc-git--run-command-string directory "status" "--porcelain" "--")) - (lines (split-string status "\n" 'omit-nulls)) + (lines (when status (split-string status "\n" 'omit-nulls))) files) (dolist (line lines files) (when (string-match "\\([ MADRCU?!][ MADRCU?!]\\) \\(.+\\)\\(?: -> \\(.+\\)\\)?" ------------------------------------------------------------ revno: 117819 committer: Paul Eggert branch nick: trunk timestamp: Thu 2014-09-04 09:14:05 -0700 message: Remove stray semicolons. diff: === modified file 'src/gtkutil.c' --- src/gtkutil.c 2014-08-02 13:32:40 +0000 +++ src/gtkutil.c 2014-09-04 16:14:05 +0000 @@ -1324,7 +1324,7 @@ size_hints.base_width = base_width; size_hints.base_height = base_height; - size_hints.min_width = base_width + min_cols * FRAME_COLUMN_WIDTH (f);; + size_hints.min_width = base_width + min_cols * FRAME_COLUMN_WIDTH (f); size_hints.min_height = base_height + min_rows * FRAME_LINE_HEIGHT (f); /* These currently have a one to one mapping with the X values, but I === modified file 'src/syntax.c' --- src/syntax.c 2014-09-03 04:21:40 +0000 +++ src/syntax.c 2014-09-04 16:14:05 +0000 @@ -1231,7 +1231,7 @@ syntax_code = XINT (first) & INT_MAX; code = syntax_code & 0377; start1 = SYNTAX_FLAGS_COMSTART_FIRST (syntax_code); - start2 = SYNTAX_FLAGS_COMSTART_SECOND (syntax_code);; + start2 = SYNTAX_FLAGS_COMSTART_SECOND (syntax_code); end1 = SYNTAX_FLAGS_COMEND_FIRST (syntax_code); end2 = SYNTAX_FLAGS_COMEND_SECOND (syntax_code); prefix = SYNTAX_FLAGS_PREFIX (syntax_code); === modified file 'src/xdisp.c' --- src/xdisp.c 2014-09-03 04:21:40 +0000 +++ src/xdisp.c 2014-09-04 16:14:05 +0000 @@ -2538,7 +2538,7 @@ gy = 0; /* The bottom divider prevails. */ height = WINDOW_PIXEL_HEIGHT (w) - WINDOW_BOTTOM_DIVIDER_WIDTH (w); - goto add_edge;; + goto add_edge; case ON_BOTTOM_DIVIDER: gx = 0; @@ -5120,7 +5120,7 @@ if (it) { - int face_id = lookup_basic_face (it->f, DEFAULT_FACE_ID);; + int face_id = lookup_basic_face (it->f, DEFAULT_FACE_ID); if (CONSP (XCDR (XCDR (spec)))) { @@ -20988,7 +20988,7 @@ if ((gpt->resolved_level - row->reversed_p) % 2 == 0) new_pos += (row->reversed_p ? -dir : dir); else - new_pos -= (row->reversed_p ? -dir : dir);; + new_pos -= (row->reversed_p ? -dir : dir); } else if (BUFFERP (g->object)) new_pos = g->charpos; === modified file 'test/indent/octave.m' --- test/indent/octave.m 2014-05-27 14:28:07 +0000 +++ test/indent/octave.m 2014-09-04 16:14:05 +0000 @@ -1982,7 +1982,7 @@ endif h1 = postpad (h1, max_name_length + 1, " "); - h2 = postpad (h2, max_version_length, " ");; + h2 = postpad (h2, max_version_length, " "); ## Print a header. header = sprintf("%s | %s | %s\n", h1, h2, h3); ------------------------------------------------------------ revno: 117818 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18352 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-09-04 11:23:37 -0400 message: * lisp/emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip terminating paren. (eldoc-last-data-store): Return cached data. (eldoc-get-var-docstring): Avoid setq. (eldoc-get-fnsym-args-string): Clarify data flow. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-04 14:49:56 +0000 +++ lisp/ChangeLog 2014-09-04 15:23:37 +0000 @@ -1,3 +1,11 @@ +2014-09-04 Stefan Monnier + + * emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip + terminating paren (bug#18352). + (eldoc-last-data-store): Return cached data. + (eldoc-get-var-docstring): Avoid setq. + (eldoc-get-fnsym-args-string): Clarify data flow. + 2014-09-04 Thierry Volpiatto * emacs-lisp/eldoc.el (eldoc-highlight-function-argument): Handle the === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-09-04 14:49:56 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-09-04 15:23:37 +0000 @@ -1,4 +1,4 @@ -;;; eldoc.el --- show function arglist or variable docstring in echo area -*- lexical-binding: t; -*- +;;; eldoc.el --- Show function arglist or variable docstring in echo area -*- lexical-binding:t; -*- ;; Copyright (C) 1996-2014 Free Software Foundation, Inc. @@ -344,27 +344,29 @@ "Return a string containing the parameter list of the function SYM. If SYM is a subr and no arglist is obtainable from the docstring or elsewhere, return a 1-line docstring." - (let (args doc advertised) - (cond ((not (and sym (symbolp sym) (fboundp sym)))) + (let ((argstring + (cond + ((not (and sym (symbolp sym) (fboundp sym))) nil) ((and (eq sym (aref eldoc-last-data 0)) (eq 'function (aref eldoc-last-data 2))) - (setq doc (aref eldoc-last-data 1))) - ((listp (setq advertised (gethash (indirect-function sym) - advertised-signature-table t))) - (setq args advertised)) - ((setq doc (help-split-fundoc (documentation sym t) sym)) - (setq args (car doc))) + (aref eldoc-last-data 1)) (t - (setq args (help-function-arglist sym)))) - (if args - ;; Stringify, and store before highlighting, downcasing, etc. - ;; FIXME should truncate before storing. - (eldoc-last-data-store sym (setq args (eldoc-function-argstring args)) - 'function) - (setq args doc)) ; use stored value - ;; Change case, highlight, truncate. - (if args - (eldoc-highlight-function-argument sym args index)))) + (let* ((advertised (gethash (indirect-function sym) + advertised-signature-table t)) + doc + (args + (cond + ((listp advertised) advertised) + ((setq doc (help-split-fundoc (documentation sym t) sym)) + (car doc)) + (t (help-function-arglist sym))))) + ;; Stringify, and store before highlighting, downcasing, etc. + ;; FIXME should truncate before storing. + (eldoc-last-data-store sym (eldoc-function-argstring args) + 'function)))))) + ;; Highlight, truncate. + (if argstring + (eldoc-highlight-function-argument sym argstring index)))) (defun eldoc-highlight-function-argument (sym args index) "Highlight argument INDEX in ARGS list for function SYM. @@ -478,23 +480,23 @@ ;; Return a string containing a brief (one-line) documentation string for ;; the variable. (defun eldoc-get-var-docstring (sym) - (when sym - (cond ((and (eq sym (aref eldoc-last-data 0)) - (eq 'variable (aref eldoc-last-data 2))) - (aref eldoc-last-data 1)) - (t - (let ((doc (documentation-property sym 'variable-documentation t))) - (cond (doc - (setq doc (eldoc-docstring-format-sym-doc - sym (eldoc-docstring-first-line doc) - 'font-lock-variable-name-face)) - (eldoc-last-data-store sym doc 'variable))) - doc))))) + (cond ((not sym) nil) + ((and (eq sym (aref eldoc-last-data 0)) + (eq 'variable (aref eldoc-last-data 2))) + (aref eldoc-last-data 1)) + (t + (let ((doc (documentation-property sym 'variable-documentation t))) + (when doc + (let ((doc (eldoc-docstring-format-sym-doc + sym (eldoc-docstring-first-line doc) + 'font-lock-variable-name-face))) + (eldoc-last-data-store sym doc 'variable))))))) (defun eldoc-last-data-store (symbol doc type) (aset eldoc-last-data 0 symbol) (aset eldoc-last-data 1 doc) - (aset eldoc-last-data 2 type)) + (aset eldoc-last-data 2 type) + doc) ;; Note that any leading `*' in the docstring (which indicates the variable ;; is a user option) is removed. @@ -596,7 +598,7 @@ (let ((str (cond ((stringp arglist) arglist) ((not (listp arglist)) nil) (t (format "%S" (help-make-usage 'toto arglist)))))) - (if (and str (string-match "\\`([^ ]+ ?" str)) + (if (and str (string-match "\\`([^ )]+ ?" str)) (replace-match "(" t t str) str))) ------------------------------------------------------------ revno: 117817 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18048 author: Thierry Volpiatto committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-09-04 10:49:56 -0400 message: * lisp/emacs-lisp/eldoc.el (eldoc-highlight-function-argument): Handle the case where we're currently providing part of the &rest arg after some &key args, as in define-ibuffer-op. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-03 19:10:15 +0000 +++ lisp/ChangeLog 2014-09-04 14:49:56 +0000 @@ -1,3 +1,9 @@ +2014-09-04 Thierry Volpiatto + + * emacs-lisp/eldoc.el (eldoc-highlight-function-argument): Handle the + case where we're currently providing part of the &rest arg after some + &key args, as in define-ibuffer-op (bug#18048). + 2014-09-03 Stefan Monnier * progmodes/which-func.el (which-func-ff-hook): Obey pre-existing === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-08-18 19:28:40 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-09-04 14:49:56 +0000 @@ -369,9 +369,16 @@ (defun eldoc-highlight-function-argument (sym args index) "Highlight argument INDEX in ARGS list for function SYM. In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." + ;; FIXME: This should probably work on the list representation of `args' + ;; rather than its string representation. + ;; FIXME: This function is much too long, we need to split it up! (let ((start nil) (end 0) - (argument-face 'eldoc-highlight-function-argument)) + (argument-face 'eldoc-highlight-function-argument) + (args-lst (mapcar (lambda (x) + (replace-regexp-in-string + "\\`[(]\\|[)]\\'" "" x)) + (split-string args)))) ;; Find the current argument in the argument string. We need to ;; handle `&rest' and informal `...' properly. ;; @@ -385,23 +392,53 @@ ;; position in ARGS based on this current arg. (when (string-match "&key" args) (let* (case-fold-search + key-have-value + (sym-name (symbol-name sym)) (cur-w (current-word)) + (args-lst-ak (cdr (member "&key" args-lst))) (limit (save-excursion - (when (re-search-backward (symbol-name sym) nil t) + (when (re-search-backward sym-name nil t) (match-end 0)))) - (cur-a (if (string-match ":\\([^ ()]*\\)" cur-w) + (cur-a (if (and cur-w (string-match ":\\([^ ()]*\\)" cur-w)) (substring cur-w 1) (save-excursion - (when (re-search-backward ":\\([^ ()\n]*\\)" limit t) - (match-string 1)))))) - ;; If `cur-a' is nil probably cursor is on a positional arg - ;; before `&key', in this case, exit this block and determine - ;; position with `index'. - (when (and cur-a - (string-match (concat "\\_<" (upcase cur-a) "\\_>") args)) - (setq index nil ; Skip next block based on positional args. - start (match-beginning 0) - end (match-end 0))))) + (let (split) + (when (re-search-backward ":\\([^()\n]*\\)" limit t) + (setq split (split-string (match-string 1) " " t)) + (prog1 (car split) + (when (cdr split) + (setq key-have-value t)))))))) + ;; If `cur-a' is not one of `args-lst-ak' + ;; assume user is entering an unknow key + ;; referenced in last position in signature. + (other-key-arg (and (stringp cur-a) + args-lst-ak + (not (member (upcase cur-a) args-lst-ak)) + (upcase (car (last args-lst-ak)))))) + (unless (string= cur-w sym-name) + ;; The last keyword have already a value + ;; i.e :foo a b and cursor is at b. + ;; If signature have also `&rest' + ;; (assume it is after the `&key' section) + ;; go to the arg after `&rest'. + (if (and key-have-value + (save-excursion + (not (re-search-forward ":.*" (point-at-eol) t))) + (string-match "&rest \\([^ ()]*\\)" args)) + (setq index nil ; Skip next block based on positional args. + start (match-beginning 1) + end (match-end 1)) + ;; If `cur-a' is nil probably cursor is on a positional arg + ;; before `&key', in this case, exit this block and determine + ;; position with `index'. + (when (and cur-a ; A keyword arg (dot removed) or nil. + (or (string-match + (concat "\\_<" (upcase cur-a) "\\_>") args) + (string-match + (concat "\\_<" other-key-arg "\\_>") args))) + (setq index nil ; Skip next block based on positional args. + start (match-beginning 0) + end (match-end 0))))))) ;; Handle now positional arguments. (while (and index (>= index 1)) (if (string-match "[^ ()]+" args end) @@ -412,12 +449,15 @@ (cond ((string= argument "&rest") ;; All the rest arguments are the same. (setq index 1)) - ((string= argument "&optional")) ; Skip. + ((string= argument "&optional")) ; Skip. ((string= argument "&allow-other-keys")) ; Skip. ;; Back to index 0 in ARG1 ARG2 ARG2 ARG3 etc... ;; like in `setq'. - ((or (string-match-p "\\.\\.\\.$" argument) - (and (string-match-p "\\.\\.\\.)?$" args) + ((or (and (string-match-p "\\.\\.\\.$" argument) + (string= argument (car (last args-lst)))) + (and (string-match-p "\\.\\.\\.$" + (substring args 1 (1- (length args)))) + (= (length (remove "..." args-lst)) 2) (> index 1) (cl-oddp index))) (setq index 0)) (t ------------------------------------------------------------ revno: 117816 fixes bug: http://debbugs.gnu.org/18375 committer: Jan D. branch nick: trunk timestamp: Thu 2014-09-04 07:38:37 +0200 message: * xsmfns.c: Initialize ice_fd. * xterm.c (x_term_init): Don't call x_session_initialize if running as a daemon. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-04 02:15:56 +0000 +++ src/ChangeLog 2014-09-04 05:38:37 +0000 @@ -1,3 +1,10 @@ +2014-09-04 Jan D + + * xterm.c (x_term_init): Don't call x_session_initialize if running + as a daemon (Bug#18375). + + * xsmfns.c: Initialize ice_fd. + 2014-09-04 Paul Eggert Less chatter in 'make' output. === modified file 'src/xsmfns.c' --- src/xsmfns.c 2014-04-05 19:30:36 +0000 +++ src/xsmfns.c 2014-09-04 05:38:37 +0000 @@ -49,7 +49,7 @@ /* The descriptor that we use to check for data from the session manager. */ -static int ice_fd; +static int ice_fd = -1; /* A flag that says if we are in shutdown interactions or not. */ === modified file 'src/xterm.c' --- src/xterm.c 2014-08-28 18:33:18 +0000 +++ src/xterm.c 2014-09-04 05:38:37 +0000 @@ -11183,8 +11183,8 @@ #ifdef HAVE_X_SM /* Only do this for the very first display in the Emacs session. Ignore X session management when Emacs was first started on a - tty. */ - if (terminal->id == 1) + tty or started as a daemon. */ + if (terminal->id == 1 && ! IS_DAEMON) x_session_initialize (dpyinfo); #endif ------------------------------------------------------------ revno: 117815 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-03 19:15:56 -0700 message: Less chatter in 'make' output. * doc/Makefile.in (clean): * oldXMenu/Makefile.in (clean mostlyclean): Simplify, for shorter command line. * src/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at) (am__v_at_, am__v_at_0, am__v_at_1): New macros, taken from Automake. ($(etc)/DOC, buildobj.h, gl-stamp): Use them. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-08-28 22:18:39 +0000 +++ doc/misc/ChangeLog 2014-09-04 02:15:56 +0000 @@ -1,3 +1,8 @@ +2014-09-04 Paul Eggert + + Less chatter in 'make' output. + * Makefile.in (clean): Simplify, for shorter command line. + 2014-08-07 Reuben Thomas * ediff.texi (Merging and diff3): Don't mention lack of support === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2014-06-23 06:25:47 +0000 +++ doc/misc/Makefile.in 2014-09-04 02:15:56 +0000 @@ -221,8 +221,7 @@ rm -f gnustmp* clean: mostlyclean - rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS) - rm -f efaq-w32.dvi efaq-w32.html efaq-w32.pdf efaq-w32.ps + rm -f *.dvi *.html *.pdf *.ps rm -f emacs-misc-${version}.tar* distclean: clean === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2014-09-01 09:54:12 +0000 +++ oldXMenu/ChangeLog 2014-09-04 02:15:56 +0000 @@ -1,3 +1,8 @@ +2014-09-04 Paul Eggert + + Less chatter in 'make' output. + * Makefile.in (clean mostlyclean): Simplify, for shorter command line. + 2014-09-01 Paul Eggert --enable-silent-rules now suppresses more chatter. === modified file 'oldXMenu/Makefile.in' --- oldXMenu/Makefile.in 2014-09-01 09:49:51 +0000 +++ oldXMenu/Makefile.in 2014-09-04 02:15:56 +0000 @@ -128,7 +128,7 @@ .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: - rm -f libXMenu11.a ${OBJS} ${EXTRA} + rm -f libXMenu11.a *.o -rm -rf ${DEPDIR} bootstrap-clean maintainer-clean distclean: clean === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-03 15:10:29 +0000 +++ src/ChangeLog 2014-09-04 02:15:56 +0000 @@ -1,3 +1,10 @@ +2014-09-04 Paul Eggert + + Less chatter in 'make' output. + * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at) + (am__v_at_, am__v_at_0, am__v_at_1): New macros, taken from Automake. + ($(etc)/DOC, buildobj.h, gl-stamp): Use them. + 2014-09-03 Martin Rudalics * buffer.c (scroll-bar-height): Fix typo in doc-string. === modified file 'src/Makefile.in' --- src/Makefile.in 2014-09-01 09:49:51 +0000 +++ src/Makefile.in 2014-09-04 02:15:56 +0000 @@ -317,6 +317,16 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = + +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = + DEPDIR=deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS=@DEPFLAGS@ @@ -469,29 +479,32 @@ ## in the contents of the DOC file. ## $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) - $(MKDIR_P) $(etc) - -rm -f $(etc)/DOC - $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC - $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk` + $(AM_V_GEN)$(MKDIR_P) $(etc) + -$(AM_V_at)rm -f $(etc)/DOC + $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC + $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ + `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' \ + $(srcdir)/lisp.mk` $(libsrc)/make-docfile$(EXEEXT): $(MAKE) -C $(libsrc) make-docfile$(EXEEXT) buildobj.h: Makefile - for i in $(ALLOBJS); do \ + $(AM_V_GEN)for i in $(ALLOBJS); do \ echo "$$i" | sed 's,.*/,,; s/\.obj$$/\.o/; s/^/"/; s/$$/",/' \ || exit; \ done >$@.tmp - mv $@.tmp $@ + $(AM_V_at)mv $@.tmp $@ globals.h: gl-stamp; @true GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) - $(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp - $(top_srcdir)/build-aux/move-if-change gl.tmp globals.h - echo timestamp > $@ + $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change gl.tmp globals.h + $(AM_V_at)echo timestamp > $@ $(ALLOBJS): globals.h ------------------------------------------------------------ revno: 117814 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-09-03 19:02:46 -0700 message: * configure.ac (MAKEINFO): Clean up some configuration bitrot. MAKEINFO is already set before we get here, so no need to call AC_PATH_PROG. Bypass $am_missing_run. Simplify version-number checking. diff: === modified file 'ChangeLog' --- ChangeLog 2014-09-02 19:17:23 +0000 +++ ChangeLog 2014-09-04 02:02:46 +0000 @@ -1,3 +1,9 @@ +2014-09-04 Paul Eggert + + * configure.ac (MAKEINFO): Clean up some configuration bitrot. + MAKEINFO is already set before we get here, so no need to call AC_PATH_PROG. + Bypass $am_missing_run. Simplify version-number checking. + 2014-09-02 Paul Eggert Merge from gnulib, incorporating: === modified file 'configure.ac' --- configure.ac 2014-09-01 02:37:22 +0000 +++ configure.ac 2014-09-04 02:02:46 +0000 @@ -1087,15 +1087,16 @@ fi ## Need makeinfo >= 4.7 (?) to build the manuals. -AC_PATH_PROG(MAKEINFO, makeinfo, no) -dnl By this stage, configure has already checked for egrep and set EGREP, -dnl or exited with an error if no egrep was found. if test "$MAKEINFO" != "no"; then - case ` - $MAKEINFO --version 2> /dev/null | - $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)' - ` in - '') MAKEINFO=no;; + if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then + MAKEINFO=makeinfo + fi + case `($MAKEINFO --version) 2>/dev/null` in + 'makeinfo (GNU texinfo) '4.[[7-9]]* | \ + 'makeinfo (GNU texinfo) '4.[[1-9][0-9]]* | \ + 'makeinfo (GNU texinfo) '[[5-9]]* | \ + 'makeinfo (GNU texinfo) '[[1-9][0-9]]* ) ;; + *) MAKEINFO=no;; esac fi ------------------------------------------------------------ revno: 117813 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-09-03 20:40:03 -0400 message: * admin/notes/bzr: Some bisect tips. diff: === modified file 'admin/notes/bzr' --- admin/notes/bzr 2014-04-24 23:18:40 +0000 +++ admin/notes/bzr 2014-09-04 00:40:03 +0000 @@ -307,6 +307,18 @@ or simply delete the entire branch if you created it just for this. +** Some tips for speeding up bisections: + +*** Use ./configure --without-all --cache-file=/tmp/config.cache +(assuming the thing you are testing for does not need a feature that +--without-all disables). + +*** Rather than `make', use `make -C lib && make -C src bootstrap-emacs +&& make -C src emacs', to avoid compiling the non-essential lisp files +(unless the thing you are testing for only shows up in compiled files; +if so compile just the relevant ones). Obviously use whatever make -j +option is appropriate for your system. + * Commit emails ** Old method: bzr-hookless-email ------------------------------------------------------------ revno: 117812 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2014-09-03 15:10:15 -0400 message: * lisp/progmodes/which-func.el (which-func-ff-hook): Obey pre-existing buffer-local setting of which-func-mode. (which-func-mode): Use defvar-local. (which-function-mode): Don't reset which-func-mode in each buffer since it might have been set by someone else. (which-func-update-ediff-windows): Check which-function-mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-03 15:10:29 +0000 +++ lisp/ChangeLog 2014-09-03 19:10:15 +0000 @@ -1,3 +1,12 @@ +2014-09-03 Stefan Monnier + + * progmodes/which-func.el (which-func-ff-hook): Obey pre-existing + buffer-local setting of which-func-mode. + (which-func-mode): Use defvar-local. + (which-function-mode): Don't reset which-func-mode in each buffer since + it might have been set by someone else. + (which-func-update-ediff-windows): Check which-function-mode. + 2014-09-03 Martin Rudalics * frame.el (frame-initialize): Remove horizontal-scroll-bars === modified file 'lisp/progmodes/which-func.el' --- lisp/progmodes/which-func.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/which-func.el 2014-09-03 19:10:15 +0000 @@ -187,21 +187,20 @@ which-func-unknown)))) ;;;###autoload (put 'which-func-current 'risky-local-variable t) -(defvar which-func-mode nil +(defvar-local which-func-mode nil "Non-nil means display current function name in mode line. This makes a difference only if `which-function-mode' is non-nil.") -(make-variable-buffer-local 'which-func-mode) -;;(put 'which-func-mode 'permanent-local t) (add-hook 'find-file-hook 'which-func-ff-hook t) (defun which-func-ff-hook () "File find hook for Which Function mode. It creates the Imenu index for the buffer, if necessary." - (setq which-func-mode - (and which-function-mode - (or (eq which-func-modes t) - (member major-mode which-func-modes)))) + (unless (local-variable-p 'which-func-mode) + (setq which-func-mode + (and which-function-mode + (or (eq which-func-modes t) + (member major-mode which-func-modes))))) (condition-case err (if (and which-func-mode @@ -259,15 +258,13 @@ ;;Turn it on (progn (setq which-func-update-timer - (run-with-idle-timer idle-update-delay t 'which-func-update)) + (run-with-idle-timer idle-update-delay t #'which-func-update)) (dolist (buf (buffer-list)) (with-current-buffer buf - (setq which-func-mode - (or (eq which-func-modes t) - (member major-mode which-func-modes)))))) - ;; Turn it off - (dolist (buf (buffer-list)) - (with-current-buffer buf (setq which-func-mode nil))))) + (unless (local-variable-p 'which-func-mode) + (setq which-func-mode + (or (eq which-func-modes t) + (member major-mode which-func-modes))))))))) (defvar which-function-imenu-failed nil "Locally t in a buffer if `imenu--make-index-alist' found nothing there.") @@ -347,10 +344,11 @@ (defvar ediff-window-B) (defvar ediff-window-C) +;; FIXME: Why does ediff require special support? (defun which-func-update-ediff-windows () "Update Which-Function mode display for Ediff windows. This function is meant to be called from `ediff-select-hook'." - (when (eq major-mode 'ediff-mode) + (when (and (derived-mode-p 'ediff-mode) which-function-mode) (when ediff-window-A (which-func-update-1 ediff-window-A)) (when ediff-window-B ------------------------------------------------------------ revno: 117811 committer: martin rudalics branch nick: trunk timestamp: Wed 2014-09-03 18:13:17 +0200 message: NEWS and TODO changes. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-09-03 15:10:29 +0000 +++ etc/NEWS 2014-09-03 16:13:17 +0000 @@ -236,12 +236,33 @@ ** Emacs can now draw horizontal scroll bars on some platforms that provide toolkit scroll bars, namely Gtk, Lucid, Motif and Windows. -Horizontal scroll bars are turned off by default. Use the command -`horizontal-scroll-bar-mode' to toggle them on all frames; the frame -parameter `horizontal-scroll-bars' to turn them on/off on individual -frames; the function `set-window-scroll-bars' to turn them on/off on -individual windows. - +Horizontal scroll bars are turned off by default. +*** New mode `horizontal-scroll-bar-mode' to toggle horizontal scroll + bars on all existing and future frames. +*** New frame parameters `horizontal-scroll-bars' and + `scroll-bar-height' to set horizontal scroll bars and their height + for individual frames and in `default-frame-alist'. +*** New function `frame-scroll-bar-height' to return the height of + horizontal scroll bars on a specific frame. +*** `set-window-scroll-bars' now accepts five parameters where the last + two specify height and type of the window's horizontal scroll bar. + +** The height of a frame's menu and tool bar are no more counted in the +frame's text height. This means that the text height stands only for +the height of the frame's root window plus that of the echo area (if +present). This was already the behavior for frames with external tool +and menu bars (like in the Gtk builds) but has now been extended to all +builds. + +** Frames now do not necessarily preserve the number of columns or lines +they display when setting default font, menu bar, fringe width, or +scroll bars. In particular, maximized and fullscreen frames are +conceptually never resized if such settings change. For fullheight and +fullwidth frames, the behavior may depend on the toolkit used. +*** New option `frame-inhibit-implied-resize' if non-nil, means that + setting default font, menu bar, fringe width, or scroll bars of a + specific frame does not resize that frame in order to preserve the + number of columns or lines it displays. * Changes in Emacs 24.5 on Non-Free Operating Systems === modified file 'etc/TODO' --- etc/TODO 2014-07-21 16:58:12 +0000 +++ etc/TODO 2014-09-03 16:13:17 +0000 @@ -467,7 +467,8 @@ ** Add definitions for symbol properties, for documentation purposes. -** Add horizontal scroll bars. +** Temporarily remove scroll bars when they are not needed, typically + when a buffer can be fully displayed in its window. ** Provide an optional feature which computes a scroll bar slider's size and its position from lines instead of characters. ------------------------------------------------------------ revno: 117810 committer: martin rudalics branch nick: trunk timestamp: Wed 2014-09-03 17:10:29 +0200 message: Clean up initialization and customization of horizontal scroll bars. * frame.el (frame-initialize): Remove horizontal-scroll-bars from frame-initial-frame-alist. * scroll-bar.el (previous-horizontal-scroll-bar-mode) (horizontal-scroll-bar-mode-explicit) (set-horizontal-scroll-bar-mode, get-horizontal-scroll-bar-mode) (toggle-horizontal-scroll-bar): Remove. (horizontal-scroll-bar-mode): Remove defcustom. (horizontal-scroll-bar-mode): Fix doc-string. (scroll-bar-toolkit-scroll) (scroll-bar-toolkit-horizontal-scroll): Add doc-strings stubs. * buffer.c (scroll-bar-height): Fix typo in doc-string. * frame.c (Vdefault_frame_horizontal_scroll_bars): Remove variable. * nsfns.m (Fx_create_frame): * w32fns.c (Fx_create_frame): * xfns.c (Fx_create_frame): Default horizontal scroll bars to nil. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-09-01 14:57:21 +0000 +++ etc/NEWS 2014-09-03 15:10:29 +0000 @@ -232,6 +232,17 @@ as the first or last argument of subsequent forms. +* Changes in Frames and Windows Code in Emacs 24.5 + +** Emacs can now draw horizontal scroll bars on some platforms that +provide toolkit scroll bars, namely Gtk, Lucid, Motif and Windows. +Horizontal scroll bars are turned off by default. Use the command +`horizontal-scroll-bar-mode' to toggle them on all frames; the frame +parameter `horizontal-scroll-bars' to turn them on/off on individual +frames; the function `set-window-scroll-bars' to turn them on/off on +individual windows. + + * Changes in Emacs 24.5 on Non-Free Operating Systems --- === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-03 04:21:40 +0000 +++ lisp/ChangeLog 2014-09-03 15:10:29 +0000 @@ -1,3 +1,16 @@ +2014-09-03 Martin Rudalics + + * frame.el (frame-initialize): Remove horizontal-scroll-bars + from frame-initial-frame-alist. + * scroll-bar.el (previous-horizontal-scroll-bar-mode) + (horizontal-scroll-bar-mode-explicit) + (set-horizontal-scroll-bar-mode, get-horizontal-scroll-bar-mode) + (toggle-horizontal-scroll-bar): Remove. + (horizontal-scroll-bar-mode): Remove defcustom. + (horizontal-scroll-bar-mode): Fix doc-string. + (scroll-bar-toolkit-scroll) + (scroll-bar-toolkit-horizontal-scroll): Add doc-strings stubs. + 2014-09-03 Stefan Monnier * emacs-lisp/package.el (package-generate-description-file): === modified file 'lisp/frame.el' --- lisp/frame.el 2014-08-07 09:55:09 +0000 +++ lisp/frame.el 2014-09-03 15:10:29 +0000 @@ -174,10 +174,6 @@ (progn (setq frame-initial-frame-alist (append initial-frame-alist default-frame-alist nil)) - (or (assq 'horizontal-scroll-bars frame-initial-frame-alist) - (setq frame-initial-frame-alist - (cons '(horizontal-scroll-bars . t) - frame-initial-frame-alist))) (setq frame-initial-frame-alist (cons (cons 'window-system initial-window-system) frame-initial-frame-alist)) === modified file 'lisp/scroll-bar.el' --- lisp/scroll-bar.el 2014-08-28 06:46:58 +0000 +++ lisp/scroll-bar.el 2014-09-03 15:10:29 +0000 @@ -90,16 +90,11 @@ (defvar scroll-bar-mode) (defvar horizontal-scroll-bar-mode) (defvar previous-scroll-bar-mode nil) -(defvar previous-horizontal-scroll-bar-mode nil) (defvar scroll-bar-mode-explicit nil "Non-nil means `set-scroll-bar-mode' should really do something. This is nil while loading `scroll-bar.el', and t afterward.") -(defvar horizontal-scroll-bar-mode-explicit nil - "Non-nil means `set-horizontal-scroll-bar-mode' should really do something. -This is nil while loading `scroll-bar.el', and t afterward.") - (defun set-scroll-bar-mode (value) "Set the scroll bar mode to VALUE and put the new value into effect. See the `scroll-bar-mode' variable for possible values to use." @@ -112,18 +107,6 @@ (modify-all-frames-parameters (list (cons 'vertical-scroll-bars scroll-bar-mode))))) -(defun set-horizontal-scroll-bar-mode (value) - "Set the horizontal scroll bar mode to VALUE and put the new value into effect. -See the `horizontal-scroll-bar-mode' variable for possible values to use." - (if horizontal-scroll-bar-mode - (setq previous-horizontal-scroll-bar-mode horizontal-scroll-bar-mode)) - - (setq horizontal-scroll-bar-mode value) - - (when horizontal-scroll-bar-mode-explicit - (modify-all-frames-parameters (list (cons 'horizontal-scroll-bars - horizontal-scroll-bar-mode))))) - (defcustom scroll-bar-mode default-frame-scroll-bars "Specify whether to have vertical scroll bars, and on which side. Possible values are nil (no scroll bars), `left' (scroll bars on left) @@ -140,32 +123,14 @@ :initialize 'custom-initialize-default :set (lambda (_sym val) (set-scroll-bar-mode val))) -(defcustom horizontal-scroll-bar-mode default-frame-horizontal-scroll-bars - "Specify whether to have horizontal scroll bars, and on which side. -To set this variable in a Lisp program, use `set-horizontal-scroll-bar-mode' -to make it take real effect. -Setting the variable with a customization buffer also takes effect." - :type '(choice (const :tag "none (nil)" nil) - (const t)) - :group 'frames - ;; The default value for :initialize would try to use :set - ;; when processing the file in cus-dep.el. - :initialize 'custom-initialize-default - :set (lambda (_sym val) (set-horizontal-scroll-bar-mode val))) - ;; We just set scroll-bar-mode, but that was the default. ;; If it is set again, that is for real. (setq scroll-bar-mode-explicit t) -(setq horizontal-scroll-bar-mode-explicit t) (defun get-scroll-bar-mode () (declare (gv-setter set-scroll-bar-mode)) scroll-bar-mode) -(defun get-horizontal-scroll-bar-mode () - (declare (gv-setter set-horizontal-scroll-bar-mode)) - horizontal-scroll-bar-mode) - (define-minor-mode scroll-bar-mode "Toggle vertical scroll bars on all frames (Scroll Bar mode). With a prefix argument ARG, enable Scroll Bar mode if ARG is @@ -187,10 +152,17 @@ This command applies to all frames that exist and frames to be created in the future." - :variable ((get-horizontal-scroll-bar-mode) - . (lambda (v) (set-horizontal-scroll-bar-mode - (if v (or previous-scroll-bar-mode - default-frame-horizontal-scroll-bars)))))) + :init-value nil + :global t + :group 'frames + (dolist (frame (frame-list)) + (set-frame-parameter + frame 'horizontal-scroll-bars horizontal-scroll-bar-mode)) + ;; Handle `default-frame-alist' entry. + (setq default-frame-alist + (cons (cons 'horizontal-scroll-bars horizontal-scroll-bar-mode) + (assq-delete-all 'horizontal-scroll-bars + default-frame-alist)))) (defun toggle-scroll-bar (arg) "Toggle whether or not the selected frame has vertical scroll bars. @@ -209,22 +181,6 @@ (list (cons 'vertical-scroll-bars (if (> arg 0) (or scroll-bar-mode default-frame-scroll-bars)))))) - -(defun toggle-horizontal-scroll-bar (arg) - "Toggle whether or not the selected frame has horizontal scroll bars. -With arg, turn horizontal scroll bars on if and only if arg is positive." - (interactive "P") - (if (null arg) - (setq arg - (if (cdr (assq 'horizontal-scroll-bars - (frame-parameters (selected-frame)))) - -1 1)) - (setq arg (prefix-numeric-value arg))) - (modify-frame-parameters - (selected-frame) - (list (cons 'horizontal-scroll-bars - (if (> arg 0) - (or horizontal-scroll-bar-mode default-frame-horizontal-scroll-bars)))))) ;;;; Buffer navigation using the scroll bar. @@ -412,6 +368,7 @@ ;;; Tookit scroll bars. (defun scroll-bar-toolkit-scroll (event) + "Handle event EVENT on vertical scroll bar." (interactive "e") (let* ((end-position (event-end event)) (window (nth 0 end-position)) @@ -453,6 +410,7 @@ (setq point-before-scroll before-scroll)))))) (defun scroll-bar-toolkit-horizontal-scroll (event) + "Handle event EVENT on horizontal scroll bar." (interactive "e") (let* ((end-position (event-end event)) (window (nth 0 end-position)) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-03 04:21:40 +0000 +++ src/ChangeLog 2014-09-03 15:10:29 +0000 @@ -1,3 +1,13 @@ +2014-09-03 Martin Rudalics + + * buffer.c (scroll-bar-height): Fix typo in doc-string. + * frame.c (Vdefault_frame_horizontal_scroll_bars): Remove + variable. + * nsfns.m (Fx_create_frame): + * w32fns.c (Fx_create_frame): + * xfns.c (Fx_create_frame): Default horizontal scroll bars to + nil. + 2014-09-03 Eli Zaretskii * dispnew.c (buffer_posn_from_coords): Fix an off-by-one error in === modified file 'src/buffer.c' --- src/buffer.c 2014-09-02 18:05:00 +0000 +++ src/buffer.c 2014-09-03 15:10:29 +0000 @@ -5919,7 +5919,7 @@ DEFVAR_PER_BUFFER ("scroll-bar-height", &BVAR (current_buffer, scroll_bar_height), Qintegerp, doc: /* Height of this buffer's scroll bars in pixels. -A value of nil means to use the scroll bar heiht from the window's frame. */); +A value of nil means to use the scroll bar height from the window's frame. */); DEFVAR_PER_BUFFER ("vertical-scroll-bar", &BVAR (current_buffer, vertical_scroll_bar_type), Qvertical_scroll_bar, === modified file 'src/frame.c' --- src/frame.c 2014-08-12 09:47:27 +0000 +++ src/frame.c 2014-09-03 15:10:29 +0000 @@ -4872,16 +4872,6 @@ Vdefault_frame_scroll_bars = Qnil; #endif - DEFVAR_LISP ("default-frame-horizontal-scroll-bars", Vdefault_frame_horizontal_scroll_bars, - doc: /* Default value for horizontal scroll bars on this window-system. */); -#if (defined (HAVE_WINDOW_SYSTEM) \ - && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ - || defined (HAVE_NTGUI))) - Vdefault_frame_horizontal_scroll_bars = Qt; -#else - Vdefault_frame_horizontal_scroll_bars = Qnil; -#endif - DEFVAR_BOOL ("scroll-bar-adjust-thumb-portion", scroll_bar_adjust_thumb_portion_p, doc: /* Adjust thumb for overscrolling for Gtk+ and MOTIF. === modified file 'src/nsfns.m' --- src/nsfns.m 2014-08-11 13:16:31 +0000 +++ src/nsfns.m 2014-09-03 15:10:29 +0000 @@ -1244,7 +1244,7 @@ "verticalScrollBars", "VerticalScrollBars", RES_TYPE_SYMBOL); } - x_default_parameter (f, parms, Qhorizontal_scroll_bars, Qt, + x_default_parameter (f, parms, Qhorizontal_scroll_bars, Qnil, "horizontalScrollBars", "HorizontalScrollBars", RES_TYPE_SYMBOL); x_default_parameter (f, parms, Qforeground_color, build_string ("Black"), === modified file 'src/w32fns.c' --- src/w32fns.c 2014-07-27 13:21:30 +0000 +++ src/w32fns.c 2014-09-03 15:10:29 +0000 @@ -4569,7 +4569,7 @@ NULL, NULL, RES_TYPE_NUMBER); x_default_parameter (f, parameters, Qvertical_scroll_bars, Qright, "verticalScrollBars", "ScrollBars", RES_TYPE_SYMBOL); - x_default_parameter (f, parameters, Qhorizontal_scroll_bars, Qbottom, + x_default_parameter (f, parameters, Qhorizontal_scroll_bars, Qnil, "horizontalScrollBars", "ScrollBars", RES_TYPE_SYMBOL); /* Also do the stuff which must be set before the window exists. */ === modified file 'src/xfns.c' --- src/xfns.c 2014-08-03 20:34:33 +0000 +++ src/xfns.c 2014-09-03 15:10:29 +0000 @@ -3112,15 +3112,9 @@ #endif "verticalScrollBars", "ScrollBars", RES_TYPE_SYMBOL); - x_default_parameter (f, parms, Qhorizontal_scroll_bars, -#if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS) - Qt, -#else - Qnil, -#endif + x_default_parameter (f, parms, Qhorizontal_scroll_bars, Qnil, "horizontalScrollBars", "ScrollBars", RES_TYPE_SYMBOL); - /* Also do the stuff which must be set before the window exists. */ x_default_parameter (f, parms, Qforeground_color, build_string ("black"), "foreground", "Foreground", RES_TYPE_STRING); ------------------------------------------------------------ revno: 117809 [merge] committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-09-02 21:21:40 -0700 message: Merge from emacs-24; up to r117476 diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-03 00:38:49 +0000 +++ lisp/ChangeLog 2014-09-03 04:21:40 +0000 @@ -1,5 +1,47 @@ 2014-09-03 Stefan Monnier + * emacs-lisp/package.el (package-generate-description-file): + Properly quote the arguments (bug#18332). Change second arg. + (package--alist-to-plist-args): Rename from package--alist-to-plist and + quote the elements. + (package--make-autoloads-and-stuff): Fix the test for pre-existence of + the *-pkg.el file. Adjust to new calling convention of + package-generate-description-file. + + * progmodes/gud.el (gud-gdb-completion-at-point): Add hack (bug#18282). + (gud-gdb-completions): Remove obsolete workaround. + +2014-09-03 Eli Zaretskii + + * subr.el (posn-col-row): Revert the change from commit + r99634.2.576 eliz@gnu.org-20101113210758-8ml5kibjtza5ysmb, which + was inadvertently merged from emacs-23 release branch in r102428 + monnier@iro.umontreal.ca-20101118035414-yvlg7k7dk4k4l3q, and + introduced an off-by-one error in the reported row when there is a + header line. (Bug#18384) + +2014-09-03 Fabián Ezequiel Gallina + + * progmodes/python.el (python-indent-post-self-insert-function): + Avoid electric colon at beginning-of-defun. (Bug#18228) + +2014-09-03 Glenn Morris + + * tutorial.el (tutorial--display-changes): + Fix 2014-08-01 change. (Bug#18382) + +2014-09-03 Ken Brown + + * startup.el (fancy-splash-frame): Extend the fix for Bug#16014 to + the Cygwin-w32 build. (Bug#18347) + +2014-09-03 Glenn Morris + + * tar-mode.el (tar--extract, tar-extract): + Avoid permanently disabling undo in extracted buffers. (Bug#18344) + +2014-09-03 Stefan Monnier + * progmodes/sh-script.el (sh-font-lock-quoted-subshell): Try to better handle multiline elements (bug#18380). === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2014-06-28 17:27:29 +0000 +++ lisp/emacs-lisp/package.el 2014-09-03 04:21:40 +0000 @@ -689,11 +689,9 @@ (error "Package does not untar cleanly into directory %s/" dir))))) (tar-untar-buffer)) -(defun package-generate-description-file (pkg-desc pkg-dir) +(defun package-generate-description-file (pkg-desc pkg-file) "Create the foo-pkg.el file for single-file packages." - (let* ((name (package-desc-name pkg-desc)) - (pkg-file (expand-file-name (package--description-file pkg-dir) - pkg-dir))) + (let* ((name (package-desc-name pkg-desc))) (let ((print-level nil) (print-quoted t) (print-length nil)) @@ -714,25 +712,20 @@ (list (car elt) (package-version-join (cadr elt)))) requires)))) - (let ((alist (package-desc-extras pkg-desc)) - flat) - (while alist - (let* ((pair (pop alist)) - (key (car pair)) - (val (cdr pair))) - ;; Don't bother ‘quote’ing ‘key’; it is always a keyword. - (push key flat) - (push (if (and (not (consp val)) - (or (keywordp val) - (not (symbolp val)) - (memq val '(nil t)))) - val - `',val) - flat))) - (nreverse flat)))) + (package--alist-to-plist-args + (package-desc-extras pkg-desc)))) "\n") nil pkg-file nil 'silent)))) +(defun package--alist-to-plist-args (alist) + (mapcar (lambda (x) + (if (and (not (consp x)) + (or (keywordp x) + (not (symbolp x)) + (memq x '(nil t)))) + x `',x)) + (apply #'nconc + (mapcar (lambda (pair) (list (car pair) (cdr pair))) alist)))) (defun package-unpack (pkg-desc) "Install the contents of the current buffer as a package." (let* ((name (package-desc-name pkg-desc)) @@ -764,9 +757,10 @@ (defun package--make-autoloads-and-stuff (pkg-desc pkg-dir) "Generate autoloads, description file, etc.. for PKG-DESC installed at PKG-DIR." (package-generate-autoloads (package-desc-name pkg-desc) pkg-dir) - (let ((desc-file (package--description-file pkg-dir))) + (let ((desc-file (expand-file-name (package--description-file pkg-dir) + pkg-dir))) (unless (file-exists-p desc-file) - (package-generate-description-file pkg-desc pkg-dir))) + (package-generate-description-file pkg-desc desc-file))) ;; FIXME: Create foo.info and dir file from foo.texi? ) === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2014-08-13 19:15:28 +0000 +++ lisp/progmodes/gud.el 2014-09-03 04:21:40 +0000 @@ -810,18 +810,6 @@ (current-buffer) ;; From string-match above. (length context)))) - ;; `gud-gdb-run-command-fetch-lines' has some nasty side-effects on the - ;; buffer (via `gud-delete-prompt-marker'): it removes the prompt and then - ;; re-adds it later, thus messing up markers and overlays along the way. - ;; This is a problem for completion-in-region which uses an overlay to - ;; create a field. - ;; So we restore completion-in-region's field if needed. - ;; FIXME: change gud-gdb-run-command-fetch-lines so it doesn't modify the - ;; buffer at all. - (when (/= start (- (point) (field-beginning))) - (dolist (ol (overlays-at (1- (point)))) - (when (eq (overlay-get ol 'field) 'completion) - (move-overlay ol (- (point) start) (overlay-end ol))))) ;; Protect against old versions of GDB. (and complete-list (string-match "^Undefined command: \"complete\"" (car complete-list)) @@ -860,7 +848,14 @@ (save-excursion (skip-chars-backward "^ " (comint-line-beginning-position)) (point)))) - (list start end + ;; FIXME: `gud-gdb-run-command-fetch-lines' has some nasty side-effects on + ;; the buffer (via `gud-delete-prompt-marker'): it removes the prompt and + ;; then re-adds it later, thus messing up markers and overlays along the + ;; way (bug#18282). + ;; We use an "insert-before" marker for `start', since it's typically right + ;; after the prompt, which works around the problem, but is a hack (and + ;; comes with other downsides, e.g. if completion adds text at `start'). + (list (copy-marker start t) end (completion-table-dynamic (apply-partially gud-gdb-completion-function (buffer-substring (comint-line-beginning-position) === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2014-08-28 01:59:29 +0000 +++ lisp/progmodes/python.el 2014-09-03 04:21:40 +0000 @@ -1162,9 +1162,15 @@ ((and (eq ?: last-command-event) (memq ?: electric-indent-chars) (not current-prefix-arg) + ;; Trigger electric colon only at end of line (eolp) + ;; Avoid re-indenting on extra colon (not (equal ?: (char-before (1- (point))))) - (not (python-syntax-comment-or-string-p))) + (not (python-syntax-comment-or-string-p)) + ;; Never re-indent at beginning of defun + (not (save-excursion + (python-nav-beginning-of-statement) + (python-info-looking-at-beginning-of-defun)))) (python-indent-line))))) === modified file 'lisp/startup.el' --- lisp/startup.el 2014-08-27 10:51:21 +0000 +++ lisp/startup.el 2014-09-03 04:21:40 +0000 @@ -1797,7 +1797,7 @@ (let (chosen-frame) ;; MS-Windows needs this to have a chance to make the initial ;; frame visible. - (if (eq system-type 'windows-nt) + (if (eq (window-system) 'w32) (sit-for 0 t)) (dolist (frame (append (frame-list) (list (selected-frame)))) (if (and (frame-visible-p frame) === modified file 'lisp/subr.el' --- lisp/subr.el 2014-08-28 01:55:45 +0000 +++ lisp/subr.el 2014-09-03 04:21:40 +0000 @@ -1156,10 +1156,7 @@ ((null spacing) (setq spacing 0))) (cons (/ (car pair) (frame-char-width frame)) - (- (/ (cdr pair) (+ (frame-char-height frame) spacing)) - (if (null (with-current-buffer (window-buffer window) - header-line-format)) - 0 1)))))))) + (/ (cdr pair) (+ (frame-char-height frame) spacing)))))))) (defun posn-actual-col-row (position) "Return the actual column and row in POSITION, measured in characters. === modified file 'lisp/tar-mode.el' --- lisp/tar-mode.el 2014-02-10 01:34:22 +0000 +++ lisp/tar-mode.el 2014-08-28 19:18:24 +0000 @@ -800,8 +800,6 @@ tarname ")")) (buffer (generate-new-buffer bufname))) - (with-current-buffer buffer - (setq buffer-undo-list t)) (with-current-buffer tar-data-buffer (let (coding) (narrow-to-region start end) @@ -829,7 +827,11 @@ (with-current-buffer buffer (set-buffer-multibyte nil))) (widen) - (decode-coding-region start end coding buffer))) + (with-current-buffer buffer + (setq buffer-undo-list t)) + (decode-coding-region start end coding buffer) + (with-current-buffer buffer + (setq buffer-undo-list nil)))) buffer)) (defun tar-extract (&optional other-window-p) @@ -869,7 +871,6 @@ (with-current-buffer tar-buffer default-directory)) (set-buffer-modified-p nil) - (setq buffer-undo-list t) (normal-mode) ; pick a mode. (set (make-local-variable 'tar-superior-buffer) tar-buffer) (set (make-local-variable 'tar-superior-descriptor) descriptor) === modified file 'lisp/tutorial.el' --- lisp/tutorial.el 2014-07-29 13:41:50 +0000 +++ lisp/tutorial.el 2014-09-02 06:48:20 +0000 @@ -209,10 +209,10 @@ (symbol-name cx))))))) (defconst tutorial--default-keys - ;; On window system, `suspend-emacs' is replaced in the default - ;; keymap + ;; On window system, `suspend-emacs' is replaced in the default keymap. (let* ((suspend-emacs 'suspend-frame) (default-keys + ;; The first few are not mentioned but are basic: `((ESC-prefix [27]) (Control-X-prefix [?\C-x]) (mode-specific-command-prefix [?\C-c]) @@ -552,7 +552,7 @@ ;; binding because the Hebrew tutorial uses directional ;; controls and Hebrew character maqaf, the Hebrew hyphen, ;; immediately before the binding string. - (concat "\\([[:space:]]\\|[[:punct:]]\\)\\(" + (concat "\\(?:[[:space:]]\\|[[:punct:]]\\)\\(" (mapconcat (lambda (kdf) (regexp-quote (tutorial--key-description (nth 1 kdf)))) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-02 18:05:00 +0000 +++ src/ChangeLog 2014-09-03 04:21:40 +0000 @@ -1,3 +1,25 @@ +2014-09-03 Eli Zaretskii + + * dispnew.c (buffer_posn_from_coords): Fix an off-by-one error in + the reported row in the case of a window with a header line, by + improving on the fix committed in r106022 + eliz@gnu.org-20111008105850-ht4tvsayohvr1kjc. (Bug#18384) + +2014-09-03 Paul Eggert + + * eval.c (internal_lisp_condition_case): Don't overrun the stack + when configured --with-wide-int on typical 32-bit platforms. + +2014-09-03 Eli Zaretskii + + * xdisp.c (display_and_set_cursor): Call erase_phys_cursor also + when HPOS is negative, for the benefit of R2L glyph rows whose + newline overflows into the fringe. + +2014-09-03 Ken Brown + + * conf_post.h (strnicmp) [CYGWIN && HAVE_NTGUI]: Define. (Bug#18366) + 2014-09-02 Paul Eggert Minor cleanup of recent strlen-avoiding patch. === modified file 'src/conf_post.h' --- src/conf_post.h 2014-08-28 14:48:02 +0000 +++ src/conf_post.h 2014-09-03 04:21:40 +0000 @@ -193,6 +193,10 @@ #if defined CYGWIN && defined HAVE_NTGUI # define NTGUI_UNICODE /* Cygwin runs only on UNICODE-supporting systems */ # define _WIN32_WINNT 0x500 /* Win2k */ +/* The following was in /usr/include/string.h prior to Cygwin 1.7.33. */ +#ifndef strnicmp +#define strnicmp strncasecmp +#endif #endif #ifdef emacs /* Don't do this for lib-src. */ === modified file 'src/dispnew.c' --- src/dispnew.c 2014-08-28 01:59:29 +0000 +++ src/dispnew.c 2014-09-03 04:21:40 +0000 @@ -5121,7 +5121,7 @@ #ifdef HAVE_WINDOW_SYSTEM struct image *img = 0; #endif - int x0, x1, to_x; + int x0, x1, to_x, it_vpos; void *itdata = NULL; /* We used to set current_buffer directly here, but that does the @@ -5130,11 +5130,6 @@ itdata = bidi_shelve_cache (); CLIP_TEXT_POS_FROM_MARKER (startp, w->start); start_display (&it, w, startp); - /* start_display takes into account the header-line row, but IT's - vpos still counts from the glyph row that includes the window's - start position. Adjust for a possible header-line row. */ - it.vpos += WINDOW_WANTS_HEADER_LINE_P (w); - x0 = *x; /* First, move to the beginning of the row corresponding to *Y. We @@ -5204,8 +5199,13 @@ } #endif - if (it.vpos < w->current_matrix->nrows - && (row = MATRIX_ROW (w->current_matrix, it.vpos), + /* IT's vpos counts from the glyph row that includes the window's + start position, i.e. it excludes the header-line row, but + MATRIX_ROW includes the header-line row. Adjust for a possible + header-line row. */ + it_vpos = it.vpos + WINDOW_WANTS_MODELINE_P (w); + if (it_vpos < w->current_matrix->nrows + && (row = MATRIX_ROW (w->current_matrix, it_vpos), row->enabled_p)) { if (it.hpos < row->used[TEXT_AREA]) === modified file 'src/eval.c' --- src/eval.c 2014-07-27 13:21:30 +0000 +++ src/eval.c 2014-09-03 04:21:40 +0000 @@ -1273,7 +1273,7 @@ { /* The first clause is the one that should be checked first, so it should be added to handlerlist last. So we build in `clauses' a table that contains `handlers' but in reverse order. */ - Lisp_Object *clauses = alloca (clausenb * sizeof (Lisp_Object *)); + Lisp_Object *clauses = alloca (clausenb * sizeof *clauses); Lisp_Object *volatile clauses_volatile = clauses; int i = clausenb; for (val = handlers; CONSP (val); val = XCDR (val)) === modified file 'src/xdisp.c' --- src/xdisp.c 2014-08-31 15:46:47 +0000 +++ src/xdisp.c 2014-09-03 04:21:40 +0000 @@ -27513,6 +27513,10 @@ && (!on || w->phys_cursor.x != x || w->phys_cursor.y != y + /* HPOS can be negative in R2L rows whose + exact_window_width_line_p flag is set (i.e. their newline + would "overflow into the fringe"). */ + || hpos < 0 || new_cursor_type != w->phys_cursor_type || ((new_cursor_type == BAR_CURSOR || new_cursor_type == HBAR_CURSOR) && new_cursor_width != w->phys_cursor_width))) === modified file 'test/ChangeLog' --- test/ChangeLog 2014-08-29 07:29:47 +0000 +++ test/ChangeLog 2014-09-03 04:21:40 +0000 @@ -1,3 +1,8 @@ +2014-09-03 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-indent-electric-colon-1): + New test. (Bug#18228) + 2014-08-29 Dmitry Antipov * automated/fns-tests.el (fns-tests-sort): New test. === modified file 'test/automated/python-tests.el' --- test/automated/python-tests.el 2014-08-18 19:15:06 +0000 +++ test/automated/python-tests.el 2014-09-01 22:51:46 +0000 @@ -711,6 +711,20 @@ (should (= (python-indent-calculate-indentation) 0)) (should (equal (python-indent-calculate-levels) '(0))))) +(ert-deftest python-indent-electric-colon-1 () + "Test indentation case from Bug#18228." + (python-tests-with-temp-buffer + " +def a(): + pass + +def b() +" + (python-tests-look-at "def b()") + (goto-char (line-end-position)) + (python-tests-self-insert ":") + (should (= (current-indentation) 0)))) + ;;; Navigation === added file 'test/indent/scheme.scm' --- test/indent/scheme.scm 1970-01-01 00:00:00 +0000 +++ test/indent/scheme.scm 2014-09-03 04:21:40 +0000 @@ -0,0 +1,9 @@ +#!/usr/bin/scheme is this a comment? + +;; This one is a comment +(a) +#| and this one as #|well|# as this! |# +(b) +(cons #;(this is a + comment) + head tail) ------------------------------------------------------------ revno: 117808 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18380 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2014-09-02 20:38:49 -0400 message: * lisp/progmodes/sh-script.el (sh-font-lock-quoted-subshell): Try to better handle multiline elements. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-01 15:03:45 +0000 +++ lisp/ChangeLog 2014-09-03 00:38:49 +0000 @@ -1,3 +1,8 @@ +2014-09-03 Stefan Monnier + + * progmodes/sh-script.el (sh-font-lock-quoted-subshell): Try to better + handle multiline elements (bug#18380). + 2014-09-01 Eli Zaretskii * ls-lisp.el (ls-lisp-use-string-collate) @@ -7,8 +12,7 @@ (ls-lisp-version-lessp): New function. (ls-lisp-handle-switches): Use it to implement the -v switch of GNU ls. - (ls-lisp--insert-directory): Mention the -v switch in the doc - string. + (ls-lisp--insert-directory): Mention the -v switch in the doc string. 2014-08-31 Christoph Scholtes @@ -16,8 +20,8 @@ `quit-window' via `special-mode'. (ibuffer-mode-map): Use keybindings from special-mode-map instead of local overrides. - (ibuffer): Don't store previous windows configuration. Let - `quit-window' handle restoring. + (ibuffer): Don't store previous windows configuration. + Let `quit-window' handle restoring. (ibuffer-quit): Remove function. Use `quit-window' instead. (ibuffer-restore-window-config-on-quit): Remove variable. (ibuffer-prev-window-config): Remove variable. === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2014-07-21 01:41:59 +0000 +++ lisp/progmodes/sh-script.el 2014-09-03 00:38:49 +0000 @@ -1051,13 +1051,11 @@ "Search for a subshell embedded in a string. Find all the unescaped \" characters within said subshell, remembering that subshells can nest." - ;; FIXME: This can (and often does) match multiple lines, yet it makes no - ;; effort to handle multiline cases correctly, so it ends up being - ;; rather flaky. (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote. ;; bingo we have a $( or a ` inside a "" (let (;; `state' can be: double-quote, backquote, code. (state (if (eq (char-before) ?`) 'backquote 'code)) + (startpos (point)) ;; Stacked states in the context. (states '(double-quote))) (while (and state (progn (skip-chars-forward "^'\\\\\"`$()" limit) @@ -1088,7 +1086,12 @@ (`double-quote nil) (_ (setq state (pop states))))) (_ (error "Internal error in sh-font-lock-quoted-subshell"))) - (forward-char 1))))) + (forward-char 1)) + (when (< startpos (line-beginning-position)) + (put-text-property startpos (point) 'syntax-multiline t) + (add-hook 'syntax-propertize-extend-region-functions + 'syntax-propertize-multiline nil t)) + ))) (defun sh-is-quoted-p (pos) ------------------------------------------------------------ revno: 117807 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-09-02 12:17:23 -0700 message: Merge from gnulib, incorporating: 2014-09-02 gnulib-common.m4: port to GCC 4.2.1 and Sun Studio 12 C++ 2014-09-01 manywarnings: add GCC 4.9 warnings * m4/gnulib-common.m4, m4/manywarnings.m4: Update from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2014-09-01 09:54:12 +0000 +++ ChangeLog 2014-09-02 19:17:23 +0000 @@ -1,3 +1,10 @@ +2014-09-02 Paul Eggert + + Merge from gnulib, incorporating: + 2014-09-02 gnulib-common.m4: port to GCC 4.2.1 and Sun Studio 12 C++ + 2014-09-01 manywarnings: add GCC 4.9 warnings + * m4/gnulib-common.m4, m4/manywarnings.m4: Update from gnulib. + 2014-09-01 Paul Eggert --enable-silent-rules now suppresses more chatter. === modified file 'm4/gnulib-common.m4' --- m4/gnulib-common.m4 2014-06-17 16:09:19 +0000 +++ m4/gnulib-common.m4 2014-09-02 19:17:23 +0000 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 35 +# gnulib-common.m4 serial 36 dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -319,26 +319,28 @@ ]) # AC_C_RESTRICT -# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, -# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ -# works. -# This definition can be removed once autoconf >= 2.62 can be assumed. -# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. -m4_ifndef([AC_AUTOCONF_VERSION],[ +# This definition is copied from post-2.69 Autoconf and overrides the +# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed +# once autoconf >= 2.70 can be assumed. It's painful to check version +# numbers, and in practice this macro is more up-to-date than Autoconf +# is, so override Autoconf unconditionally. AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no # The order here caters to the fact that C++ does not require restrict. for ac_kw in __restrict __restrict__ _Restrict restrict; do - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - }]], - [[int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t)]])], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[typedef int *int_ptr; + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } + ]], + [[int s[1]; + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); + ]])], [ac_cv_c_restrict=$ac_kw]) test "$ac_cv_c_restrict" != no && break done @@ -348,21 +350,21 @@ nothing if this is not supported. Do not define if restrict is supported directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict, even - though the corresponding Sun C compiler does, which causes - "#define restrict _Restrict" in the previous line. Perhaps some future - version of Sun C++ will work with _Restrict; if so, it'll probably - define __RESTRICT, just as Sun C does. */ +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ #if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict +# define __restrict__ #endif]) case $ac_cv_c_restrict in restrict) ;; no) AC_DEFINE([restrict], []) ;; *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; esac -]) -]) +])# AC_C_RESTRICT # gl_BIGENDIAN # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. === modified file 'm4/manywarnings.m4' --- m4/manywarnings.m4 2014-01-03 01:59:58 +0000 +++ m4/manywarnings.m4 2014-09-02 19:17:23 +0000 @@ -1,4 +1,4 @@ -# manywarnings.m4 serial 6 +# manywarnings.m4 serial 7 dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -93,6 +93,14 @@ fi # List all gcc warning categories. + # To compare this list to your installed GCC's, run this Bash command: + # + # comm -3 \ + # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \ + # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort | + # grep -v -x -f <( + # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec)) + gl_manywarn_set= for gl_manywarn_item in \ -W \ @@ -111,6 +119,7 @@ -Wcomments \ -Wcoverage-mismatch \ -Wcpp \ + -Wdate-time \ -Wdeprecated \ -Wdeprecated-declarations \ -Wdisabled-optimization \ @@ -150,9 +159,9 @@ -Wnarrowing \ -Wnested-externs \ -Wnonnull \ - -Wnormalized=nfc \ -Wold-style-declaration \ -Wold-style-definition \ + -Wopenmp-simd \ -Woverflow \ -Woverlength-strings \ -Woverride-init \ @@ -203,13 +212,26 @@ -Wvla \ -Wvolatile-register-var \ -Wwrite-strings \ - -fdiagnostics-show-option \ - -funit-at-a-time \ \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" done + # gcc --help=warnings outputs an unusual form for this option; list + # it here so that the above 'comm' command doesn't report a false match. + gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" + + # These are needed for older GCC versions. + if test -n "$GCC"; then + case `($CC --version) 2>/dev/null` in + 'gcc (GCC) '[[0-3]].* | \ + 'gcc (GCC) '4.[[0-7]].*) + gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option" + gl_manywarn_set="$gl_manywarn_set -funit-at-a-time" + ;; + esac + fi + # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" ------------------------------------------------------------ revno: 117806 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-09-02 11:05:00 -0700 message: Minor cleanup of recent strlen-avoiding patch. * src/fileio.c (CHECK_LENGTH): Remove. Rewrite callers so that they don't need it. (Fexpand_file_name) [DOS_NT]: Fix a case where directory length variable wasn't set. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-02 11:41:22 +0000 +++ src/ChangeLog 2014-09-02 18:05:00 +0000 @@ -1,3 +1,11 @@ +2014-09-02 Paul Eggert + + Minor cleanup of recent strlen-avoiding patch. + * fileio.c (CHECK_LENGTH): Remove. + Rewrite callers so that they don't need it. + (Fexpand_file_name) [DOS_NT]: Fix a case where directory length + variable wasn't set. + 2014-09-02 Dmitry Antipov * fileio.c (CHECK_LENGTH): New macro. === modified file 'src/buffer.c' --- src/buffer.c 2014-09-02 11:41:22 +0000 +++ src/buffer.c 2014-09-02 18:05:00 +0000 @@ -1276,10 +1276,10 @@ For a symbol that is locally unbound, just the symbol appears in the value. Note that storing new VALUEs in these elements doesn't change the variables. No argument or nil as argument means use current buffer as BUFFER. */) - (register Lisp_Object buffer) + (Lisp_Object buffer) { - register struct buffer *buf = decode_buffer (buffer); - register Lisp_Object result = buffer_lisp_local_variables (buf, 0); + struct buffer *buf = decode_buffer (buffer); + Lisp_Object result = buffer_lisp_local_variables (buf, 0); /* Add on all the variables stored in special slots. */ { @@ -1306,9 +1306,9 @@ 0, 1, 0, doc: /* Return t if BUFFER was modified since its file was last read or saved. No argument or nil as argument means use current buffer as BUFFER. */) - (register Lisp_Object buffer) + (Lisp_Object buffer) { - register struct buffer *buf = decode_buffer (buffer); + struct buffer *buf = decode_buffer (buffer); return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; } === modified file 'src/data.c' --- src/data.c 2014-09-02 11:41:22 +0000 +++ src/data.c 2014-09-02 18:05:00 +0000 @@ -1952,9 +1952,9 @@ 1, 2, 0, doc: /* Non-nil if VARIABLE has a local binding in buffer BUFFER. BUFFER defaults to the current buffer. */) - (register Lisp_Object variable, Lisp_Object buffer) + (Lisp_Object variable, Lisp_Object buffer) { - register struct buffer *buf = decode_buffer (buffer); + struct buffer *buf = decode_buffer (buffer); struct Lisp_Symbol *sym; CHECK_SYMBOL (variable); === modified file 'src/fileio.c' --- src/fileio.c 2014-09-02 11:41:22 +0000 +++ src/fileio.c 2014-09-02 18:05:00 +0000 @@ -847,15 +847,6 @@ return make_temp_name (prefix, 0); } -/* The following function does a lot of work with \0-terminated strings. - To avoid extra calls to strlen and strcat, we maintain an important - lengths explicitly. This macro is used to check whether we're in sync. */ -#ifdef ENABLE_CHECKING -#define CHECK_LENGTH(str, len) (eassert (strlen (str) == len), len) -#else -#define CHECK_LENGTH(str, len) (len) -#endif /* ENABLE_CHECKING */ - DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, doc: /* Convert filename NAME to absolute, and canonicalize it. Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative @@ -885,7 +876,9 @@ /* These point to SDATA and need to be careful with string-relocation during GC (via DECODE_FILE). */ char *nm; + char *nmlim; const char *newdir; + const char *newdirlim; /* This should only point to alloca'd data. */ char *target; @@ -893,10 +886,10 @@ struct passwd *pw; #ifdef DOS_NT int drive = 0; - bool collapse_newdir = 1; + bool collapse_newdir = true; bool is_escaped = 0; #endif /* DOS_NT */ - ptrdiff_t length, newdirlen, nmlen, nbytes; + ptrdiff_t length, nbytes; Lisp_Object handler, result, handled_name; bool multibyte; Lisp_Object hdir; @@ -1027,14 +1020,13 @@ /* Make a local copy of NAME to protect it from GC in DECODE_FILE below. */ nm = xlispstrdupa (name); - nmlen = SBYTES (name); + nmlim = nm + SBYTES (name); #ifdef DOS_NT /* Note if special escape prefix is present, but remove for now. */ if (nm[0] == '/' && nm[1] == ':') { is_escaped = 1; - nmlen -= 2; nm += 2; } @@ -1044,7 +1036,6 @@ if (IS_DRIVE (nm[0]) && IS_DEVICE_SEP (nm[1])) { drive = (unsigned char) nm[0]; - nmlen -= 2; nm += 2; } @@ -1053,7 +1044,7 @@ colon when stripping the drive letter. Otherwise, this expands to "//somedir". */ if (drive && IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) - nmlen--, nm++; + nm++; /* Discard any previous drive specifier if nm is now in UNC format. */ if (IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1]) @@ -1114,8 +1105,7 @@ if (IS_DIRECTORY_SEP (nm[1])) { if (strcmp (nm, SSDATA (name)) != 0) - name = make_specified_string - (nm, -1, CHECK_LENGTH (nm, nmlen), multibyte); + name = make_specified_string (nm, -1, nmlim - nm, multibyte); } else #endif @@ -1136,8 +1126,7 @@ #else /* not DOS_NT */ if (strcmp (nm, SSDATA (name)) == 0) return name; - return make_specified_string - (nm, -1, CHECK_LENGTH (nm, nmlen), multibyte); + return make_specified_string (nm, -1, nmlim - nm, multibyte); #endif /* not DOS_NT */ } } @@ -1158,8 +1147,7 @@ return an absolute name, if the final prefix is not absolute we append it to the current working directory. */ - newdir = 0; - newdirlen = -1; + newdir = newdirlim = 0; if (nm[0] == '~') /* prefix ~ */ { @@ -1169,8 +1157,8 @@ Lisp_Object tem; if (!(newdir = egetenv ("HOME"))) - newdir = ""; - nmlen--, nm++; + newdir = newdirlim = ""; + nm++; /* `egetenv' may return a unibyte string, which will bite us since we expect the directory to be multibyte. */ #ifdef WINDOWSNT @@ -1184,15 +1172,15 @@ else #endif tem = build_string (newdir); - newdirlen = SBYTES (tem); + newdirlim = newdir + SBYTES (tem); if (multibyte && !STRING_MULTIBYTE (tem)) { hdir = DECODE_FILE (tem); newdir = SSDATA (hdir); - newdirlen = SBYTES (hdir); + newdirlim = newdir + SBYTES (hdir); } #ifdef DOS_NT - collapse_newdir = 0; + collapse_newdir = false; #endif } else /* ~user/filename */ @@ -1216,17 +1204,16 @@ bite us since we expect the directory to be multibyte. */ tem = build_string (newdir); - newdirlen = SBYTES (tem); + newdirlim = newdir + SBYTES (tem); if (multibyte && !STRING_MULTIBYTE (tem)) { hdir = DECODE_FILE (tem); newdir = SSDATA (hdir); - newdirlen = SBYTES (hdir); + newdirlim = newdir + SBYTES (hdir); } - nmlen -= (p - nm); nm = p; #ifdef DOS_NT - collapse_newdir = 0; + collapse_newdir = false; #endif } @@ -1252,8 +1239,8 @@ Lisp_Object tem = build_string (adir); tem = DECODE_FILE (tem); - newdirlen = SBYTES (tem); - memcpy (adir, SSDATA (tem), newdirlen + 1); + newdirlim = adir + SBYTES (tem); + memcpy (adir, SSDATA (tem), SBYTES (tem) + 1); } } if (!adir) @@ -1264,7 +1251,7 @@ adir[1] = ':'; adir[2] = '/'; adir[3] = 0; - newdirlen = 3; + newdirlim = adir + 3; } newdir = adir; } @@ -1285,13 +1272,12 @@ && !newdir) { newdir = SSDATA (default_directory); - newdirlen = SBYTES (default_directory); + newdirlim = newdir + SBYTES (default_directory); #ifdef DOS_NT /* Note if special escape prefix is present, but remove for now. */ if (newdir[0] == '/' && newdir[1] == ':') { is_escaped = 1; - newdirlen -= 2; newdir += 2; } #endif @@ -1327,18 +1313,19 @@ if (IS_DRIVE (newdir[0]) && IS_DEVICE_SEP (newdir[1])) { drive = (unsigned char) newdir[0]; - newdirlen -= 2; newdir += 2; } if (!IS_DIRECTORY_SEP (nm[0])) { + ptrdiff_t nmlen = nmlim - nm; + ptrdiff_t newdirlen = newdirlim - newdir; char *tmp = alloca (newdirlen + file_name_as_directory_slop - + CHECK_LENGTH (nm, nmlen) + 1); - nbytes = file_name_as_directory (tmp, newdir, newdirlen, - multibyte); - memcpy (tmp + nbytes, nm, nmlen + 1); - nmlen += nbytes; + + nmlen + 1); + ptrdiff_t dlen = file_name_as_directory (tmp, newdir, newdirlen, + multibyte); + memcpy (tmp + dlen, nm, nmlen + 1); nm = tmp; + nmlim = nm + dlen + nmlen; } adir = alloca (adir_size); if (drive) @@ -1353,11 +1340,11 @@ Lisp_Object tem = build_string (adir); tem = DECODE_FILE (tem); - newdirlen = SBYTES (tem); - memcpy (adir, SSDATA (tem), newdirlen + 1); + newdirlim = adir + SBYTES (tem); + memcpy (adir, SSDATA (tem), SBYTES (tem) + 1); } else - newdirlen = strlen (adir); + newdirlim = adir + strlen (adir); newdir = adir; } @@ -1365,7 +1352,6 @@ if (IS_DRIVE (newdir[0]) && IS_DEVICE_SEP (newdir[1])) { drive = newdir[0]; - newdirlen -= 2; newdir += 2; } @@ -1377,36 +1363,31 @@ if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1]) && !IS_DIRECTORY_SEP (newdir[2])) { - char *adir = strcpy (alloca (newdirlen + 1), newdir); + char *adir = strcpy (alloca (newdirlim - newdir + 1), newdir); char *p = adir + 2; while (*p && !IS_DIRECTORY_SEP (*p)) p++; p++; while (*p && !IS_DIRECTORY_SEP (*p)) p++; *p = 0; newdir = adir; - newdirlen = strlen (adir); + newdirlim = newdir + strlen (adir); } else #endif - newdirlen = 0, newdir = ""; + newdir = newdirlim = ""; } } #endif /* DOS_NT */ - if (newdir) - { - /* Ignore any slash at the end of newdir, unless newdir is - just "/" or "//". */ - length = CHECK_LENGTH (newdir, newdirlen); - while (length > 1 && IS_DIRECTORY_SEP (newdir[length - 1]) - && ! (length == 2 && IS_DIRECTORY_SEP (newdir[0]))) - length--; - } - else - length = 0; + /* Ignore any slash at the end of newdir, unless newdir is + just "/" or "//". */ + length = newdirlim - newdir; + while (length > 1 && IS_DIRECTORY_SEP (newdir[length - 1]) + && ! (length == 2 && IS_DIRECTORY_SEP (newdir[0]))) + length--; /* Now concatenate the directory and name to new space in the stack frame. */ - tlen = length + file_name_as_directory_slop + CHECK_LENGTH (nm, nmlen) + 1; + tlen = length + file_name_as_directory_slop + (nmlim - nm) + 1; #ifdef DOS_NT /* Reserve space for drive specifier and escape prefix, since either or both may need to be inserted. (The Microsoft x86 compiler @@ -1442,7 +1423,7 @@ nbytes = file_name_as_directory (target, newdir, length, multibyte); } - memcpy (target + nbytes, nm, nmlen + 1); + memcpy (target + nbytes, nm, nmlim - nm + 1); /* Now canonicalize by removing `//', `/.' and `/foo/..' if they appear. */ === modified file 'src/lisp.h' --- src/lisp.h 2014-09-02 06:49:40 +0000 +++ src/lisp.h 2014-09-02 18:05:00 +0000 @@ -4444,12 +4444,10 @@ extern char *egetenv_internal (const char *, ptrdiff_t); -/* VAR is usually a compile-time constant, so the - call to strlen is likely to be optimized away. */ - INLINE char * -egetenv(const char *var) +egetenv (const char *var) { + /* When VAR is a string literal, strlen can be optimized away. */ return egetenv_internal (var, strlen (var)); } ------------------------------------------------------------ revno: 117805 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-09-02 15:41:22 +0400 message: * buffer.h (decode_buffer): New function. * buffer.c (Fbuffer_name, Fbuffer_file_name, Fbuffer_base_buffer) (Fbuffer_local_variables, Fbuffer_modified_p, Fbuffer_modified_tick) (Fbuffer_chars_modified_tick, Fdelete_all_overlays): * data.c (Flocal_variables_p): * fileio.c (Fverify_visited_file_modtime): * marker.c (live_buffer): Use it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-02 06:49:40 +0000 +++ src/ChangeLog 2014-09-02 11:41:22 +0000 @@ -7,6 +7,14 @@ * lisp.h (egetenv): ... because of a new inline function used to avoid calls to strlen for a compile-time constants. + * buffer.h (decode_buffer): New function. + * buffer.c (Fbuffer_name, Fbuffer_file_name, Fbuffer_base_buffer) + (Fbuffer_local_variables, Fbuffer_modified_p, Fbuffer_modified_tick) + (Fbuffer_chars_modified_tick, Fdelete_all_overlays): + * data.c (Flocal_variables_p): + * fileio.c (Fverify_visited_file_modtime): + * marker.c (live_buffer): Use it. + 2014-09-01 Dmitry Antipov Avoid extra calls to strlen in filesystem I/O routines. === modified file 'src/buffer.c' --- src/buffer.c 2014-08-11 00:59:34 +0000 +++ src/buffer.c 2014-09-02 11:41:22 +0000 @@ -1134,10 +1134,7 @@ Return nil if BUFFER has been killed. */) (register Lisp_Object buffer) { - if (NILP (buffer)) - return BVAR (current_buffer, name); - CHECK_BUFFER (buffer); - return BVAR (XBUFFER (buffer), name); + return BVAR (decode_buffer (buffer), name); } DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, @@ -1145,10 +1142,7 @@ No argument or nil as argument means use the current buffer. */) (register Lisp_Object buffer) { - if (NILP (buffer)) - return BVAR (current_buffer, filename); - CHECK_BUFFER (buffer); - return BVAR (XBUFFER (buffer), filename); + return BVAR (decode_buffer (buffer), filename); } DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer, @@ -1158,21 +1152,8 @@ BUFFER defaults to the current buffer. */) (register Lisp_Object buffer) { - struct buffer *base; - Lisp_Object base_buffer; - - if (NILP (buffer)) - base = current_buffer->base_buffer; - else - { - CHECK_BUFFER (buffer); - base = XBUFFER (buffer)->base_buffer; - } - - if (! base) - return Qnil; - XSETBUFFER (base_buffer, base); - return base_buffer; + struct buffer *base = decode_buffer (buffer)->base_buffer; + return base ? (XSETBUFFER (buffer, base), buffer) : Qnil; } DEFUN ("buffer-local-value", Fbuffer_local_value, @@ -1297,18 +1278,8 @@ No argument or nil as argument means use current buffer as BUFFER. */) (register Lisp_Object buffer) { - register struct buffer *buf; - register Lisp_Object result; - - if (NILP (buffer)) - buf = current_buffer; - else - { - CHECK_BUFFER (buffer); - buf = XBUFFER (buffer); - } - - result = buffer_lisp_local_variables (buf, 0); + register struct buffer *buf = decode_buffer (buffer); + register Lisp_Object result = buffer_lisp_local_variables (buf, 0); /* Add on all the variables stored in special slots. */ { @@ -1337,15 +1308,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) (register Lisp_Object buffer) { - register struct buffer *buf; - if (NILP (buffer)) - buf = current_buffer; - else - { - CHECK_BUFFER (buffer); - buf = XBUFFER (buffer); - } - + register struct buffer *buf = decode_buffer (buffer); return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; } @@ -1451,16 +1414,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) (register Lisp_Object buffer) { - register struct buffer *buf; - if (NILP (buffer)) - buf = current_buffer; - else - { - CHECK_BUFFER (buffer); - buf = XBUFFER (buffer); - } - - return make_number (BUF_MODIFF (buf)); + return make_number (BUF_MODIFF (decode_buffer (buffer))); } DEFUN ("buffer-chars-modified-tick", Fbuffer_chars_modified_tick, @@ -1475,16 +1429,7 @@ buffer as BUFFER. */) (register Lisp_Object buffer) { - register struct buffer *buf; - if (NILP (buffer)) - buf = current_buffer; - else - { - CHECK_BUFFER (buffer); - buf = XBUFFER (buffer); - } - - return make_number (BUF_CHARS_MODIFF (buf)); + return make_number (BUF_CHARS_MODIFF (decode_buffer (buffer))); } DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2, @@ -4137,17 +4082,7 @@ buffer. */) (Lisp_Object buffer) { - register struct buffer *buf; - - if (NILP (buffer)) - buf = current_buffer; - else - { - CHECK_BUFFER (buffer); - buf = XBUFFER (buffer); - } - - delete_all_overlays (buf); + delete_all_overlays (decode_buffer (buffer)); return Qnil; } === modified file 'src/buffer.h' --- src/buffer.h 2014-07-27 13:21:30 +0000 +++ src/buffer.h 2014-09-02 11:41:22 +0000 @@ -1088,6 +1088,13 @@ extern void restore_buffer (Lisp_Object); extern void set_buffer_if_live (Lisp_Object); +INLINE +struct buffer * +decode_buffer (Lisp_Object b) +{ + return NILP (b) ? current_buffer : (CHECK_BUFFER (b), XBUFFER (b)); +} + /* Set the current buffer to B. We previously set windows_or_buffers_changed here to invalidate === modified file 'src/data.c' --- src/data.c 2014-07-26 13:17:25 +0000 +++ src/data.c 2014-09-02 11:41:22 +0000 @@ -1954,17 +1954,9 @@ BUFFER defaults to the current buffer. */) (register Lisp_Object variable, Lisp_Object buffer) { - register struct buffer *buf; + register struct buffer *buf = decode_buffer (buffer); struct Lisp_Symbol *sym; - if (NILP (buffer)) - buf = current_buffer; - else - { - CHECK_BUFFER (buffer); - buf = XBUFFER (buffer); - } - CHECK_SYMBOL (variable); sym = XSYMBOL (variable); === modified file 'src/fileio.c' --- src/fileio.c 2014-09-02 05:44:38 +0000 +++ src/fileio.c 2014-09-02 11:41:22 +0000 @@ -5324,20 +5324,12 @@ See Info node `(elisp)Modification Time' for more details. */) (Lisp_Object buf) { - struct buffer *b; + struct buffer *b = decode_buffer (buf); struct stat st; Lisp_Object handler; Lisp_Object filename; struct timespec mtime; - if (NILP (buf)) - b = current_buffer; - else - { - CHECK_BUFFER (buf); - b = XBUFFER (buf); - } - if (!STRINGP (BVAR (b, filename))) return Qt; if (b->modtime.tv_nsec == UNKNOWN_MODTIME_NSECS) return Qt; === modified file 'src/marker.c' --- src/marker.c 2014-01-01 07:43:34 +0000 +++ src/marker.c 2014-09-02 11:41:22 +0000 @@ -455,21 +455,8 @@ static struct buffer * live_buffer (Lisp_Object buffer) { - struct buffer *b; - - if (NILP (buffer)) - { - b = current_buffer; - eassert (BUFFER_LIVE_P (b)); - } - else - { - CHECK_BUFFER (buffer); - b = XBUFFER (buffer); - if (!BUFFER_LIVE_P (b)) - b = NULL; - } - return b; + struct buffer *b = decode_buffer (buffer); + return BUFFER_LIVE_P (b) ? b : NULL; } /* Internal function to set MARKER in BUFFER at POSITION. Non-zero ------------------------------------------------------------ revno: 117804 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-09-02 10:49:40 +0400 message: * callproc.c (egetenv_internal): Add arg and rename from egetenv ... * lisp.h (egetenv): ... because of a new inline function used to avoid calls to strlen for a compile-time constants. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-02 05:44:38 +0000 +++ src/ChangeLog 2014-09-02 06:49:40 +0000 @@ -3,6 +3,9 @@ * fileio.c (CHECK_LENGTH): New macro. (Fexpand_file_name): Use it and get rid of a few more calls to strlen and strcat. + * callproc.c (egetenv_internal): Add arg and rename from egetenv ... + * lisp.h (egetenv): ... because of a new inline function used to + avoid calls to strlen for a compile-time constants. 2014-09-01 Dmitry Antipov === modified file 'src/callproc.c' --- src/callproc.c 2014-09-01 16:05:43 +0000 +++ src/callproc.c 2014-09-02 06:49:40 +0000 @@ -1488,14 +1488,14 @@ } /* A version of getenv that consults the Lisp environment lists, - easily callable from C. */ + easily callable from C. This is usually called from egetenv. */ char * -egetenv (const char *var) +egetenv_internal (const char *var, ptrdiff_t len) { char *value; ptrdiff_t valuelen; - if (getenv_internal (var, strlen (var), &value, &valuelen, Qnil)) + if (getenv_internal (var, len, &value, &valuelen, Qnil)) return value; else return 0; === modified file 'src/lisp.h' --- src/lisp.h 2014-09-01 16:05:43 +0000 +++ src/lisp.h 2014-09-02 06:49:40 +0000 @@ -4442,7 +4442,16 @@ extern void dupstring (char **, char const *); extern void xputenv (const char *); -extern char *egetenv (const char *); +extern char *egetenv_internal (const char *, ptrdiff_t); + +/* VAR is usually a compile-time constant, so the + call to strlen is likely to be optimized away. */ + +INLINE char * +egetenv(const char *var) +{ + return egetenv_internal (var, strlen (var)); +} /* Copy Lisp string to temporary (allocated on stack) C string. */ ------------------------------------------------------------ revno: 117803 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-09-02 09:44:38 +0400 message: * fileio.c (CHECK_LENGTH): New macro. (Fexpand_file_name): Use it and get rid of a few more calls to strlen and strcat. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-01 16:05:43 +0000 +++ src/ChangeLog 2014-09-02 05:44:38 +0000 @@ -1,3 +1,9 @@ +2014-09-02 Dmitry Antipov + + * fileio.c (CHECK_LENGTH): New macro. + (Fexpand_file_name): Use it and get rid of a few more calls + to strlen and strcat. + 2014-09-01 Dmitry Antipov Avoid extra calls to strlen in filesystem I/O routines. === modified file 'src/fileio.c' --- src/fileio.c 2014-09-02 03:47:54 +0000 +++ src/fileio.c 2014-09-02 05:44:38 +0000 @@ -847,8 +847,15 @@ return make_temp_name (prefix, 0); } +/* The following function does a lot of work with \0-terminated strings. + To avoid extra calls to strlen and strcat, we maintain an important + lengths explicitly. This macro is used to check whether we're in sync. */ +#ifdef ENABLE_CHECKING +#define CHECK_LENGTH(str, len) (eassert (strlen (str) == len), len) +#else +#define CHECK_LENGTH(str, len) (len) +#endif /* ENABLE_CHECKING */ - DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0, doc: /* Convert filename NAME to absolute, and canonicalize it. Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative @@ -889,7 +896,7 @@ bool collapse_newdir = 1; bool is_escaped = 0; #endif /* DOS_NT */ - ptrdiff_t length, newdirlen; + ptrdiff_t length, newdirlen, nmlen, nbytes; Lisp_Object handler, result, handled_name; bool multibyte; Lisp_Object hdir; @@ -1018,14 +1025,16 @@ default_directory = Fdowncase (default_directory); #endif - /* Make a local copy of nm[] to protect it from GC in DECODE_FILE below. */ + /* Make a local copy of NAME to protect it from GC in DECODE_FILE below. */ nm = xlispstrdupa (name); + nmlen = SBYTES (name); #ifdef DOS_NT /* Note if special escape prefix is present, but remove for now. */ if (nm[0] == '/' && nm[1] == ':') { is_escaped = 1; + nmlen -= 2; nm += 2; } @@ -1035,6 +1044,7 @@ if (IS_DRIVE (nm[0]) && IS_DEVICE_SEP (nm[1])) { drive = (unsigned char) nm[0]; + nmlen -= 2; nm += 2; } @@ -1043,7 +1053,7 @@ colon when stripping the drive letter. Otherwise, this expands to "//somedir". */ if (drive && IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) - nm++; + nmlen--, nm++; /* Discard any previous drive specifier if nm is now in UNC format. */ if (IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1]) @@ -1104,7 +1114,8 @@ if (IS_DIRECTORY_SEP (nm[1])) { if (strcmp (nm, SSDATA (name)) != 0) - name = make_specified_string (nm, -1, strlen (nm), multibyte); + name = make_specified_string + (nm, -1, CHECK_LENGTH (nm, nmlen), multibyte); } else #endif @@ -1125,7 +1136,8 @@ #else /* not DOS_NT */ if (strcmp (nm, SSDATA (name)) == 0) return name; - return make_specified_string (nm, -1, strlen (nm), multibyte); + return make_specified_string + (nm, -1, CHECK_LENGTH (nm, nmlen), multibyte); #endif /* not DOS_NT */ } } @@ -1158,7 +1170,7 @@ if (!(newdir = egetenv ("HOME"))) newdir = ""; - nm++; + nmlen--, nm++; /* `egetenv' may return a unibyte string, which will bite us since we expect the directory to be multibyte. */ #ifdef WINDOWSNT @@ -1211,6 +1223,7 @@ newdir = SSDATA (hdir); newdirlen = SBYTES (hdir); } + nmlen -= (p - nm); nm = p; #ifdef DOS_NT collapse_newdir = 0; @@ -1320,9 +1333,11 @@ if (!IS_DIRECTORY_SEP (nm[0])) { char *tmp = alloca (newdirlen + file_name_as_directory_slop - + strlen (nm) + 1); - file_name_as_directory (tmp, newdir, newdirlen, multibyte); - strcat (tmp, nm); + + CHECK_LENGTH (nm, nmlen) + 1); + nbytes = file_name_as_directory (tmp, newdir, newdirlen, + multibyte); + memcpy (tmp + nbytes, nm, nmlen + 1); + nmlen += nbytes; nm = tmp; } adir = alloca (adir_size); @@ -1382,8 +1397,7 @@ { /* Ignore any slash at the end of newdir, unless newdir is just "/" or "//". */ - length = newdirlen; - eassert (length == strlen (newdir)); + length = CHECK_LENGTH (newdir, newdirlen); while (length > 1 && IS_DIRECTORY_SEP (newdir[length - 1]) && ! (length == 2 && IS_DIRECTORY_SEP (newdir[0]))) length--; @@ -1392,7 +1406,7 @@ length = 0; /* Now concatenate the directory and name to new space in the stack frame. */ - tlen = length + file_name_as_directory_slop + strlen (nm) + 1; + tlen = length + file_name_as_directory_slop + CHECK_LENGTH (nm, nmlen) + 1; #ifdef DOS_NT /* Reserve space for drive specifier and escape prefix, since either or both may need to be inserted. (The Microsoft x86 compiler @@ -1403,6 +1417,7 @@ target = SAFE_ALLOCA (tlen); #endif /* not DOS_NT */ *target = 0; + nbytes = 0; if (newdir) { @@ -1420,13 +1435,14 @@ { memcpy (target, newdir, length); target[length] = 0; + nbytes = length; } } else - file_name_as_directory (target, newdir, length, multibyte); + nbytes = file_name_as_directory (target, newdir, length, multibyte); } - strcat (target, nm); + memcpy (target + nbytes, nm, nmlen + 1); /* Now canonicalize by removing `//', `/.' and `/foo/..' if they appear. */ ------------------------------------------------------------ revno: 117802 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-09-02 07:47:54 +0400 message: * fileio.c (Fexpand_file_name): Fix MS-Windows build failure. diff: === modified file 'src/fileio.c' --- src/fileio.c 2014-09-01 16:05:43 +0000 +++ src/fileio.c 2014-09-02 03:47:54 +0000 @@ -1342,7 +1342,7 @@ memcpy (adir, SSDATA (tem), newdirlen + 1); } else - newdirlen = strlen (aidr); + newdirlen = strlen (adir); newdir = adir; } ------------------------------------------------------------ revno: 117801 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2014-09-01 20:05:43 +0400 message: Avoid extra calls to strlen in filesystem I/O routines. * fileio.c (Fexpand_file_name): Avoid calls to strlen if the length of 'newdir' is known or may be precalculated. (file_accessible_directory_p): Prefer to pass Lisp_Object, not 'char *', and so use precalculated length. (Ffile_accessible_directory_p): * callproc.c (encode_current_directory, init_callproc): * charset.c (init_charset): * lread.c (load_path_check, load_path_default): Adjust users. * lisp.h (file_accessible_directory_p): Tweak prototype. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-01 15:07:17 +0000 +++ src/ChangeLog 2014-09-01 16:05:43 +0000 @@ -1,3 +1,16 @@ +2014-09-01 Dmitry Antipov + + Avoid extra calls to strlen in filesystem I/O routines. + * fileio.c (Fexpand_file_name): Avoid calls to strlen if + the length of 'newdir' is known or may be precalculated. + (file_accessible_directory_p): Prefer to pass Lisp_Object, + not 'char *', and so use precalculated length. + (Ffile_accessible_directory_p): + * callproc.c (encode_current_directory, init_callproc): + * charset.c (init_charset): + * lread.c (load_path_check, load_path_default): Adjust users. + * lisp.h (file_accessible_directory_p): Tweak prototype. + 2014-09-01 Eli Zaretskii * w32proc.c (w32_compare_strings): Support "C" and "POSIX" === modified file 'src/callproc.c' --- src/callproc.c 2014-07-14 19:23:18 +0000 +++ src/callproc.c 2014-09-01 16:05:43 +0000 @@ -129,7 +129,7 @@ if (STRING_MULTIBYTE (dir)) dir = ENCODE_FILE (dir); - if (! file_accessible_directory_p (SSDATA (dir))) + if (! file_accessible_directory_p (dir)) report_file_error ("Setting current directory", BVAR (current_buffer, directory)); @@ -1625,12 +1625,12 @@ #endif { tempdir = Fdirectory_file_name (Vexec_directory); - if (! file_accessible_directory_p (SSDATA (tempdir))) + if (! file_accessible_directory_p (tempdir)) dir_warning ("arch-dependent data dir", Vexec_directory); } tempdir = Fdirectory_file_name (Vdata_directory); - if (! file_accessible_directory_p (SSDATA (tempdir))) + if (! file_accessible_directory_p (tempdir)) dir_warning ("arch-independent data dir", Vdata_directory); sh = getenv ("SHELL"); === modified file 'src/charset.c' --- src/charset.c 2014-06-23 04:11:29 +0000 +++ src/charset.c 2014-09-01 16:05:43 +0000 @@ -2298,7 +2298,7 @@ { Lisp_Object tempdir; tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); - if (! file_accessible_directory_p (SSDATA (tempdir))) + if (! file_accessible_directory_p (tempdir)) { /* This used to be non-fatal (dir_warning), but it should not happen, and if it does sooner or later it will cause some === modified file 'src/fileio.c' --- src/fileio.c 2014-08-11 00:59:34 +0000 +++ src/fileio.c 2014-09-01 16:05:43 +0000 @@ -889,7 +889,7 @@ bool collapse_newdir = 1; bool is_escaped = 0; #endif /* DOS_NT */ - ptrdiff_t length; + ptrdiff_t length, newdirlen; Lisp_Object handler, result, handled_name; bool multibyte; Lisp_Object hdir; @@ -1147,6 +1147,7 @@ append it to the current working directory. */ newdir = 0; + newdirlen = -1; if (nm[0] == '~') /* prefix ~ */ { @@ -1171,10 +1172,12 @@ else #endif tem = build_string (newdir); + newdirlen = SBYTES (tem); if (multibyte && !STRING_MULTIBYTE (tem)) { hdir = DECODE_FILE (tem); newdir = SSDATA (hdir); + newdirlen = SBYTES (hdir); } #ifdef DOS_NT collapse_newdir = 0; @@ -1201,10 +1204,12 @@ bite us since we expect the directory to be multibyte. */ tem = build_string (newdir); + newdirlen = SBYTES (tem); if (multibyte && !STRING_MULTIBYTE (tem)) { hdir = DECODE_FILE (tem); newdir = SSDATA (hdir); + newdirlen = SBYTES (hdir); } nm = p; #ifdef DOS_NT @@ -1234,7 +1239,8 @@ Lisp_Object tem = build_string (adir); tem = DECODE_FILE (tem); - memcpy (adir, SSDATA (tem), SBYTES (tem) + 1); + newdirlen = SBYTES (tem); + memcpy (adir, SSDATA (tem), newdirlen + 1); } } if (!adir) @@ -1245,6 +1251,7 @@ adir[1] = ':'; adir[2] = '/'; adir[3] = 0; + newdirlen = 3; } newdir = adir; } @@ -1265,11 +1272,13 @@ && !newdir) { newdir = SSDATA (default_directory); + newdirlen = SBYTES (default_directory); #ifdef DOS_NT /* Note if special escape prefix is present, but remove for now. */ if (newdir[0] == '/' && newdir[1] == ':') { is_escaped = 1; + newdirlen -= 2; newdir += 2; } #endif @@ -1305,14 +1314,14 @@ if (IS_DRIVE (newdir[0]) && IS_DEVICE_SEP (newdir[1])) { drive = (unsigned char) newdir[0]; + newdirlen -= 2; newdir += 2; } if (!IS_DIRECTORY_SEP (nm[0])) { - ptrdiff_t newlen = strlen (newdir); - char *tmp = alloca (newlen + file_name_as_directory_slop + char *tmp = alloca (newdirlen + file_name_as_directory_slop + strlen (nm) + 1); - file_name_as_directory (tmp, newdir, newlen, multibyte); + file_name_as_directory (tmp, newdir, newdirlen, multibyte); strcat (tmp, nm); nm = tmp; } @@ -1329,8 +1338,11 @@ Lisp_Object tem = build_string (adir); tem = DECODE_FILE (tem); - memcpy (adir, SSDATA (tem), SBYTES (tem) + 1); + newdirlen = SBYTES (tem); + memcpy (adir, SSDATA (tem), newdirlen + 1); } + else + newdirlen = strlen (aidr); newdir = adir; } @@ -1338,6 +1350,7 @@ if (IS_DRIVE (newdir[0]) && IS_DEVICE_SEP (newdir[1])) { drive = newdir[0]; + newdirlen -= 2; newdir += 2; } @@ -1349,17 +1362,18 @@ if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1]) && !IS_DIRECTORY_SEP (newdir[2])) { - char *adir = strcpy (alloca (strlen (newdir) + 1), newdir); + char *adir = strcpy (alloca (newdirlen + 1), newdir); char *p = adir + 2; while (*p && !IS_DIRECTORY_SEP (*p)) p++; p++; while (*p && !IS_DIRECTORY_SEP (*p)) p++; *p = 0; newdir = adir; + newdirlen = strlen (adir); } else #endif - newdir = ""; + newdirlen = 0, newdir = ""; } } #endif /* DOS_NT */ @@ -1368,7 +1382,8 @@ { /* Ignore any slash at the end of newdir, unless newdir is just "/" or "//". */ - length = strlen (newdir); + length = newdirlen; + eassert (length == strlen (newdir)); while (length > 1 && IS_DIRECTORY_SEP (newdir[length - 1]) && ! (length == 2 && IS_DIRECTORY_SEP (newdir[0]))) length--; @@ -2765,23 +2780,24 @@ } absname = ENCODE_FILE (absname); - return file_accessible_directory_p (SSDATA (absname)) ? Qt : Qnil; + return file_accessible_directory_p (absname) ? Qt : Qnil; } /* If FILE is a searchable directory or a symlink to a searchable directory, return true. Otherwise return false and set errno to an error number. */ bool -file_accessible_directory_p (char const *file) +file_accessible_directory_p (Lisp_Object file) { #ifdef DOS_NT /* There's no need to test whether FILE is searchable, as the searchable/executable bit is invented on DOS_NT platforms. */ - return file_directory_p (file); + return file_directory_p (SSDATA (file)); #else /* On POSIXish platforms, use just one system call; this avoids a race and is typically faster. */ - ptrdiff_t len = strlen (file); + const char *data = SSDATA (file); + ptrdiff_t len = SBYTES (file); char const *dir; bool ok; int saved_errno; @@ -2793,15 +2809,15 @@ "/" and "//" are distinct on some platforms, whereas "/", "///", "////", etc. are all equivalent. */ if (! len) - dir = file; + dir = data; else { /* Just check for trailing '/' when deciding whether to append '/'. That's simpler than testing the two special cases "/" and "//", and it's a safe optimization here. */ char *buf = SAFE_ALLOCA (len + 3); - memcpy (buf, file, len); - strcpy (buf + len, &"/."[file[len - 1] == '/']); + memcpy (buf, data, len); + strcpy (buf + len, &"/."[data[len - 1] == '/']); dir = buf; } === modified file 'src/lisp.h' --- src/lisp.h 2014-09-01 02:37:22 +0000 +++ src/lisp.h 2014-09-01 16:05:43 +0000 @@ -4029,7 +4029,7 @@ extern bool internal_delete_file (Lisp_Object); extern Lisp_Object emacs_readlinkat (int, const char *); extern bool file_directory_p (const char *); -extern bool file_accessible_directory_p (const char *); +extern bool file_accessible_directory_p (Lisp_Object); extern void init_fileio (void); extern void syms_of_fileio (void); extern Lisp_Object make_temp_name (Lisp_Object, bool); === modified file 'src/lread.c' --- src/lread.c 2014-07-26 13:17:25 +0000 +++ src/lread.c 2014-09-01 16:05:43 +0000 @@ -4213,7 +4213,7 @@ if (STRINGP (dirfile)) { dirfile = Fdirectory_file_name (dirfile); - if (! file_accessible_directory_p (SSDATA (dirfile))) + if (! file_accessible_directory_p (dirfile)) dir_warning ("Lisp directory", XCAR (path_tail)); } } ------------------------------------------------------------ revno: 117800 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-09-01 18:11:25 +0300 message: nt/gnulib.mk: Synchronize with lib/gnulib.mk. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2014-08-26 17:55:07 +0000 +++ nt/ChangeLog 2014-09-01 15:11:25 +0000 @@ -1,3 +1,7 @@ +2014-09-01 Eli Zaretskii + + * gnulib.mk: Synchronize with lib/gnulib.mk. + 2014-06-15 Glenn Morris * Makefile.in (LDFLAGS): Explicitly set via configure. === modified file 'nt/gnulib.mk' --- nt/gnulib.mk 2014-05-17 08:11:31 +0000 +++ nt/gnulib.mk 2014-09-01 15:11:25 +0000 @@ -43,7 +43,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings MOSTLYCLEANFILES += core *.stackdump @@ -55,6 +55,15 @@ libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = +## begin gnulib module absolute-header + +# Use this preprocessor expression to decide whether #include_next works. +# Do not rely on a 'configure'-time test for this, since the expression +# might appear in an installed header, which is used by some other compiler. +HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) + +## end gnulib module absolute-header + ## begin gnulib module alloca-opt BUILT_SOURCES += $(ALLOCA_H) @@ -78,6 +87,12 @@ ## end gnulib module alloca-opt +## begin gnulib module binary-io + +libgnu_a_SOURCES += binary-io.h binary-io.c + +## end gnulib module binary-io + ## begin gnulib module byteswap BUILT_SOURCES += $(BYTESWAP_H) @@ -141,7 +156,7 @@ libgnu_a_SOURCES += md5.c -EXTRA_DIST += md5.h +EXTRA_DIST += gl_openssl.h md5.h ## end gnulib module crypto/md5 @@ -149,7 +164,7 @@ libgnu_a_SOURCES += sha1.c -EXTRA_DIST += sha1.h +EXTRA_DIST += gl_openssl.h sha1.h ## end gnulib module crypto/sha1 @@ -157,7 +172,7 @@ libgnu_a_SOURCES += sha256.c -EXTRA_DIST += sha256.h +EXTRA_DIST += gl_openssl.h sha256.h ## end gnulib module crypto/sha256 @@ -165,7 +180,7 @@ libgnu_a_SOURCES += sha512.c -EXTRA_DIST += sha512.h +EXTRA_DIST += gl_openssl.h sha512.h ## end gnulib module crypto/sha512 @@ -335,6 +350,17 @@ ## end gnulib module fsync +## begin gnulib module getdtablesize + +if gl_GNULIB_ENABLED_getdtablesize + +endif +EXTRA_DIST += getdtablesize.c + +EXTRA_libgnu_a_SOURCES += getdtablesize.c + +## end gnulib module getdtablesize + ## begin gnulib module getgroups if gl_GNULIB_ENABLED_getgroups @@ -416,13 +442,6 @@ ## end gnulib module group-member -## begin gnulib module ignore-value - - -EXTRA_DIST += ignore-value.h - -## end gnulib module ignore-value - ## begin gnulib module intprops @@ -854,6 +873,13 @@ ## end gnulib module unsetenv +## begin gnulib module update-copyright + + +EXTRA_DIST += $(top_srcdir)/build-aux/update-copyright + +## end gnulib module update-copyright + ## begin gnulib module utimens libgnu_a_SOURCES += utimens.c @@ -868,6 +894,13 @@ ## end gnulib module verify +## begin gnulib module vla + + +EXTRA_DIST += vla.h + +## end gnulib module vla + ## begin gnulib module xalloc-oversized if gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec ------------------------------------------------------------ revno: 117799 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-09-01 18:07:17 +0300 message: src/w32proc.c (w32_compare_strings): Support "C" and "POSIX" locales. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-01 09:54:12 +0000 +++ src/ChangeLog 2014-09-01 15:07:17 +0000 @@ -1,3 +1,8 @@ +2014-09-01 Eli Zaretskii + + * w32proc.c (w32_compare_strings): Support "C" and "POSIX" + locales. + 2014-09-01 Paul Eggert --enable-silent-rules now suppresses more chatter. === modified file 'src/w32proc.c' --- src/w32proc.c 2014-08-30 08:19:24 +0000 +++ src/w32proc.c 2014-09-01 15:07:17 +0000 @@ -3236,6 +3236,13 @@ USE_SAFE_ALLOCA; + /* The LCID machinery doesn't seem to support the "C" locale, so we + need to do that by hand. */ + if (locname + && ((locname[0] == 'C' && (locname[1] == '\0' || locname[1] == '.')) + || strcmp (locname, "POSIX") == 0)) + return (ignore_case ? stricmp (s1, s2) : strcmp (s1, s2)); + if (!g_b_init_compare_string_w) { if (os_subtype == OS_9X) ------------------------------------------------------------ revno: 117798 fixes bug: http://debbugs.gnu.org/18051 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-09-01 18:03:45 +0300 message: Implement the GNU ls -v switch in ls-lisp.el. lisp/ls-lisp.el (ls-lisp-version-lessp): New function. (ls-lisp-handle-switches): Use it to implement the -v switch of GNU ls. (ls-lisp--insert-directory): Mention the -v switch in the doc string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-09-01 14:57:21 +0000 +++ lisp/ChangeLog 2014-09-01 15:03:45 +0000 @@ -4,6 +4,11 @@ (ls-lisp-UCA-like-collation): New defcustoms. (ls-lisp-string-lessp): Use them to control sorting by file names. (Bug#18051) + (ls-lisp-version-lessp): New function. + (ls-lisp-handle-switches): Use it to implement the -v switch of + GNU ls. + (ls-lisp--insert-directory): Mention the -v switch in the doc + string. 2014-08-31 Christoph Scholtes === modified file 'lisp/ls-lisp.el' --- lisp/ls-lisp.el 2014-09-01 14:57:21 +0000 +++ lisp/ls-lisp.el 2014-09-01 15:03:45 +0000 @@ -273,7 +273,7 @@ supports ordinary shell wildcards if `ls-lisp-support-shell-wildcards' is non-nil; otherwise, it interprets wildcards as regular expressions to match file names. It does not support all `ls' switches -- those -that work are: A a B C c F G g h i n R r S s t U u X. The l switch +that work are: A a B C c F G g h i n R r S s t U u v X. The l switch is assumed to be always present and cannot be turned off." (if ls-lisp-use-insert-directory-program (funcall orig-fun @@ -551,6 +551,67 @@ (let ((u (compare-strings s1 0 nil s2 0 nil ls-lisp-ignore-case))) (and (numberp u) (< u 0)))))) +(defun ls-lisp-version-lessp (s1 s2) + "Return t if versioned string S1 should sort before versioned string S2. + +Case is significant if `ls-lisp-ignore-case' is nil. +This is the same as string-lessp (with the exception of case +insensitivity), but sequences of digits are compared numerically, +as a whole, in the same manner as the `strverscmp' function available +in some standard C libraries does." + (let ((i1 0) + (i2 0) + (len1 (length s1)) + (len2 (length s2)) + (val 0) + ni1 ni2 e1 e2 found-2-numbers-p) + (while (and (< i1 len1) (< i2 len2) (zerop val)) + (unless found-2-numbers-p + (setq ni1 (string-match "[0-9]+" s1 i1) + e1 (match-end 0)) + (setq ni2 (string-match "[0-9]+" s2 i2) + e2 (match-end 0))) + (cond + ((and ni1 ni2) + (cond + ((and (> ni1 i1) (> ni2 i2)) + ;; Compare non-numerical part as strings. + (setq val (compare-strings s1 i1 ni1 s2 i2 ni2 ls-lisp-ignore-case) + i1 ni1 + i2 ni2 + found-2-numbers-p t)) + ((and (= ni1 i1) (= ni2 i2)) + (setq found-2-numbers-p nil) + ;; Compare numerical parts as integral and/or fractional parts. + (let* ((sub1 (substring s1 ni1 e1)) + (sub2 (substring s2 ni2 e2)) + ;; "Fraction" is a numerical sequence with leading zeros. + (fr1 (string-match "\\`0+" sub1)) + (fr2 (string-match "\\`0+" sub2))) + (cond + ((and fr1 fr2) ; two fractions, the shortest wins + (setq val (- val (- (length sub1) (length sub2))))) + (fr1 ; a fraction is always less than an integral + (setq val (- ni1))) + (fr2 + (setq val ni2))) + (if (zerop val) ; fall back on numerical comparison + (setq val (- (string-to-number sub1) + (string-to-number sub2)))) + (setq i1 e1 + i2 e2))) + (t + (setq val (compare-strings s1 i1 nil s2 i2 nil ls-lisp-ignore-case) + i1 len1 + i2 len2)))) + (t (setq val (compare-strings s1 i1 nil s2 i2 nil ls-lisp-ignore-case) + i1 len1 + i2 len2))) + (and (eq val t) (setq val 0))) + (if (zerop val) + (setq val (- len1 len2))) + (< val 0))) + (defun ls-lisp-handle-switches (file-alist switches) "Return new FILE-ALIST sorted according to SWITCHES. SWITCHES is a list of characters. Default sorting is alphabetic." @@ -577,6 +638,9 @@ (ls-lisp-string-lessp (ls-lisp-extension (car x)) (ls-lisp-extension (car y))))) + ((memq ?v switches) + (lambda (x y) ; sorted by version number + (ls-lisp-version-lessp (car x) (car y)))) (t (lambda (x y) ; sorted alphabetically (ls-lisp-string-lessp (car x) (car y)))))))) ------------------------------------------------------------ revno: 117797 fixes bug: http://debbugs.gnu.org/18051 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-09-01 17:57:21 +0300 message: Use the new string-collate-lessp function in ls-lisp.el. lisp/ls-lisp.el (ls-lisp-use-string-collate) (ls-lisp-UCA-like-collation): New defcustoms. (ls-lisp-string-lessp): Use them to control sorting by file names. etc/NEWS: Mention that ls-lisp uses string-collate-lessp. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-09-01 09:54:12 +0000 +++ etc/ChangeLog 2014-09-01 14:57:21 +0000 @@ -1,3 +1,7 @@ +2014-09-01 Eli Zaretskii + + * NEWS: Mention that ls-lisp uses string-collate-lessp. + 2014-09-01 Paul Eggert --enable-silent-rules now suppresses more chatter. === modified file 'etc/NEWS' --- etc/NEWS 2014-09-01 09:49:51 +0000 +++ etc/NEWS 2014-09-01 14:57:21 +0000 @@ -75,6 +75,10 @@ systems and for MS-Windows, for other systems they fall back to their counterparts `string-lessp' and `string-equal'. +*** The ls-lisp package uses `string-collate-lessp' to sort file names. +If you want the old, locale-independent sorting, customize the new +option `ls-lisp-use-string-collate' to a nil value. + *** The MS-Windows specific variable `w32-collate-ignore-punctuation', if set to a non-nil value, causes the above 2 functions to ignore symbol and punctuation characters when collating strings. This === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-31 20:44:36 +0000 +++ lisp/ChangeLog 2014-09-01 14:57:21 +0000 @@ -1,3 +1,10 @@ +2014-09-01 Eli Zaretskii + + * ls-lisp.el (ls-lisp-use-string-collate) + (ls-lisp-UCA-like-collation): New defcustoms. + (ls-lisp-string-lessp): Use them to control sorting by file + names. (Bug#18051) + 2014-08-31 Christoph Scholtes * ibuffer.el: Replace mode-specific quit function with === modified file 'lisp/ls-lisp.el' --- lisp/ls-lisp.el 2014-02-10 01:34:22 +0000 +++ lisp/ls-lisp.el 2014-09-01 14:57:21 +0000 @@ -113,6 +113,47 @@ :type 'boolean :group 'ls-lisp) +(defcustom ls-lisp-use-string-collate + (cond ((memq ls-lisp-emulation '(MacOS UNIX)) nil) + (t t)) ; GNU/Linux or MS-Windows emulate GNU ls + "Non-nil causes ls-lisp to sort files in locale-dependent collation order. + +A value of nil means use ordinary string comparison (see `compare-strings') +for sorting files. A non-nil value uses `string-collate-lessp' instead, +which more closely emulates what GNU `ls' does. + +On GNU/Linux systems, if the locale's codeset specifies UTF-8, as +in \"en_US.UTF-8\", the collation order follows the Unicode +Collation Algorithm (UCA), which places together file names that +differ only in punctuation characters. On MS-Windows, customize +the option `ls-lisp-UCA-like-collation' to a non-nil value to get +similar behavior." + :version "24.5" + :set-after '(ls-lisp-emulation) + :type 'boolean + :group 'ls-lisp) + +(defcustom ls-lisp-UCA-like-collation t + "Non-nil means force ls-lisp use a collation order compatible with UCA. + +UCA is the Unicode Collation Algorithm. GNU/Linux systems automatically +follow it in their string-collation routines if the locale specifies +UTF-8 as its codeset. On MS-Windows, customize this option to a non-nil +value to get similar behavior. + +When this option is non-nil, and `ls-lisp-use-string-collate' is also +non-nil, the collation order produced on MS-Windows will ignore +punctuation and symbol characters, which will, for example, place +\`.foo' near `foo'. See the documentation of `string-collate-lessp' +and `w32-collate-ignore-punctuation' for more details. + +This option is ignored on platforms other than MS-Windows; to +control the collation ordering of the file names on those other +systems, set your locale instead." + :version "24.5" + :type 'boolean + :group 'ls-lisp) + (defcustom ls-lisp-dirs-first (eq ls-lisp-emulation 'MS-Windows) "Non-nil causes ls-lisp to sort directories first in any ordering. \(Or last if it is reversed.) Follows Microsoft Windows Explorer." @@ -495,11 +536,20 @@ result)) (defsubst ls-lisp-string-lessp (s1 s2) - "Return t if string S1 is less than string S2 in lexicographic order. + "Return t if string S1 should sort before string S2. Case is significant if `ls-lisp-ignore-case' is nil. -Unibyte strings are converted to multibyte for comparison." - (let ((u (compare-strings s1 0 nil s2 0 nil ls-lisp-ignore-case))) - (and (numberp u) (< u 0)))) +Uses `string-collate-lessp' if `ls-lisp-use-string-collate' is non-nil, +\`compare-strings' otherwise. +On GNU/Linux systems, if the locale specifies UTF-8 as the codeset, +the sorting order will place together file names that differ only +by punctuation characters, like `.emacs' and `emacs'. To have a +similar behavior on MS-Widnows, customize `ls-lisp-UCA-like-collation' +to a non-nil value." + (let ((w32-collate-ignore-punctuation ls-lisp-UCA-like-collation)) + (if ls-lisp-use-string-collate + (string-collate-lessp s1 s2 nil ls-lisp-ignore-case) + (let ((u (compare-strings s1 0 nil s2 0 nil ls-lisp-ignore-case))) + (and (numberp u) (< u 0)))))) (defun ls-lisp-handle-switches (file-alist switches) "Return new FILE-ALIST sorted according to SWITCHES. ------------------------------------------------------------ revno: 117796 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-09-01 17:44:33 +0300 message: src/lastfile.c: Fix last change. diff: === modified file 'src/lastfile.c' --- src/lastfile.c 2014-09-01 02:37:22 +0000 +++ src/lastfile.c 2014-09-01 14:44:33 +0000 @@ -36,7 +36,7 @@ #include -#include +#include "lisp.h" char my_edata[] = "End of Emacs initialized data"; ------------------------------------------------------------ revno: 117795 committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-09-01 06:21:26 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2014-08-15 04:34:06 +0000 +++ lisp/ldefs-boot.el 2014-09-01 10:21:26 +0000 @@ -65,8 +65,8 @@ ;;;*** -;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21220 61111 -;;;;;; 156047 0)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21476 41895 +;;;;;; 55661 0)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -96,8 +96,8 @@ ;;;*** -;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21187 63826 -;;;;;; 213216 0)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21476 41895 +;;;;;; 55661 0)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -1153,7 +1153,7 @@ ;;;*** -;;;### (autoloads nil "arc-mode" "arc-mode.el" (21207 49087 974317 +;;;### (autoloads nil "arc-mode" "arc-mode.el" (21476 41895 55661 ;;;;;; 0)) ;;; Generated autoloads from arc-mode.el @@ -2981,8 +2981,8 @@ ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21403 21198 -;;;;;; 190145 203000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21493 50983 +;;;;;; 112694 0)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3050,8 +3050,8 @@ ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21425 -;;;;;; 14635 268306 0)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21499 +;;;;;; 3372 630891 0)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -4313,8 +4313,8 @@ ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21383 2343 -;;;;;; 498187 0)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21484 36010 +;;;;;; 707226 0)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -5044,8 +5044,8 @@ ;;;*** -;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21437 5802 -;;;;;; 125919 0)) +;;;### (autoloads nil "cua-rect" "emulation/cua-rect.el" (21503 425 +;;;;;; 992235 0)) ;;; Generated autoloads from emulation/cua-rect.el (autoload 'cua-rectangle-mark-mode "cua-rect" "\ @@ -6245,8 +6245,8 @@ ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21409 26408 -;;;;;; 607647 0)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21488 33062 +;;;;;; 959598 0)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6724,8 +6724,8 @@ ;;;*** -;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21259 -;;;;;; 10807 217062 0)) +;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21505 +;;;;;; 42150 427725 0)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -8009,8 +8009,8 @@ ;;;*** -;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21305 16557 -;;;;;; 836987 0)) +;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21491 9262 4301 +;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8658,7 +8658,7 @@ ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21437 5802 125919 0)) +;;;### (autoloads nil "erc" "erc/erc.el" (21484 36010 707226 0)) ;;; Generated autoloads from erc/erc.el (push (purecopy '(erc 5 3)) package--builtin-versions) @@ -9100,8 +9100,8 @@ ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21240 46395 -;;;;;; 727291 0)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (21481 59815 +;;;;;; 980216 0)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) @@ -9914,7 +9914,7 @@ ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21423 59302 489365 0)) +;;;### (autoloads nil "eww" "net/eww.el" (21474 169 693017 0)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -11840,8 +11840,8 @@ ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21393 38187 -;;;;;; 675040 0)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21481 59815 +;;;;;; 980216 0)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -12450,8 +12450,8 @@ ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21414 44327 -;;;;;; 790846 0)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21485 56871 +;;;;;; 932720 0)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12770,7 +12770,7 @@ ;;;*** -;;;### (autoloads nil "gud" "progmodes/gud.el" (21240 46395 727291 +;;;### (autoloads nil "gud" "progmodes/gud.el" (21484 36010 707226 ;;;;;; 0)) ;;; Generated autoloads from progmodes/gud.el @@ -12819,6 +12819,13 @@ \(fn COMMAND-LINE)" t nil) +(autoload 'guiler "gud" "\ +Run guiler on program FILE in buffer `*gud-FILE*'. +The directory containing FILE becomes the initial working directory +and source-file directory for your debugger. + +\(fn COMMAND-LINE)" t nil) + (autoload 'jdb "gud" "\ Run jdb with command line COMMAND-LINE in a buffer. The buffer is named \"*gud*\" if no initial class is given or @@ -14260,8 +14267,7 @@ ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21187 63826 213216 -;;;;;; 0)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21508 18343 5038 0)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14300,8 +14306,8 @@ ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21466 -;;;;;; 6053 9002 0)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21480 +;;;;;; 38952 540043 0)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -15271,7 +15277,7 @@ ;;;*** -;;;### (autoloads nil "image-mode" "image-mode.el" (21334 16805 699731 +;;;### (autoloads nil "image-mode" "image-mode.el" (21483 15143 105233 ;;;;;; 0)) ;;; Generated autoloads from image-mode.el @@ -15507,7 +15513,7 @@ ;;;*** -;;;### (autoloads nil "info" "info.el" (21419 7843 195974 0)) +;;;### (autoloads nil "info" "info.el" (21480 38952 540043 0)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15549,8 +15555,7 @@ In interactive use, a non-numeric prefix argument directs this command to read a file name from the minibuffer. -A numeric prefix argument N selects an Info buffer named -\"*info*<%s>\". +A numeric prefix argument of N selects an Info buffer named \"*info*\". The search path for Info files is in the variable `Info-directory-list'. The top-level Info directory is made by combining all the files named `dir' @@ -18580,7 +18585,7 @@ ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21361 61732 646433 0)) +;;;### (autoloads nil "mpc" "mpc.el" (21483 15143 105233 0)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -19157,8 +19162,8 @@ ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21187 -;;;;;; 63826 213216 0)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21481 +;;;;;; 59815 980216 0)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -20240,8 +20245,8 @@ ;;;*** -;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21296 -;;;;;; 1575 438327 0)) +;;;### (autoloads nil "parse-time" "calendar/parse-time.el" (21471 +;;;;;; 23976 844614 0)) ;;; Generated autoloads from calendar/parse-time.el (put 'parse-time-rules 'risky-local-variable t) @@ -21864,8 +21869,8 @@ ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21467 26920 -;;;;;; 243336 0)) +;;;### (autoloads nil "python" "progmodes/python.el" (21503 425 992235 +;;;;;; 0)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 4)) package--builtin-versions) @@ -22334,7 +22339,7 @@ ;;;*** -;;;### (autoloads nil "rect" "rect.el" (21450 17830 135996 0)) +;;;### (autoloads nil "rect" "rect.el" (21471 23976 844614 0)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -24244,8 +24249,8 @@ ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21240 -;;;;;; 46395 727291 0)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21481 +;;;;;; 59815 980216 0)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24512,7 +24517,7 @@ ;;;*** -;;;### (autoloads nil "shr" "net/shr.el" (21327 43559 923043 0)) +;;;### (autoloads nil "shr" "net/shr.el" (21503 425 992235 0)) ;;; Generated autoloads from net/shr.el (autoload 'shr-render-region "shr" "\ @@ -25179,7 +25184,7 @@ ;;;*** -;;;### (autoloads nil "speedbar" "speedbar.el" (21335 37672 97862 +;;;### (autoloads nil "speedbar" "speedbar.el" (21485 56871 932720 ;;;;;; 0)) ;;; Generated autoloads from speedbar.el @@ -27549,8 +27554,8 @@ ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21361 -;;;;;; 61732 646433 0)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21471 +;;;;;; 23976 844614 0)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27882,8 +27887,8 @@ ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21462 -;;;;;; 9001 456449 0)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21471 +;;;;;; 23976 844614 0)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -28081,7 +28086,8 @@ ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21429 11690 49391 0)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21504 21288 950856 +;;;;;; 0)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28196,8 +28202,8 @@ ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21406 50214 -;;;;;; 284651 0)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21476 41895 +;;;;;; 55661 0)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28207,7 +28213,7 @@ ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21240 46395 727291 +;;;### (autoloads nil "tutorial" "tutorial.el" (21468 47783 238320 ;;;;;; 0)) ;;; Generated autoloads from tutorial.el @@ -28745,8 +28751,8 @@ ;;;*** -;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21419 -;;;;;; 62246 751914 0)) +;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21476 +;;;;;; 41895 55661 0)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -29586,8 +29592,8 @@ ;;;*** -;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21435 50471 -;;;;;; 547961 0)) +;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21481 59815 +;;;;;; 980216 0)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -29715,8 +29721,8 @@ ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21429 11690 49391 -;;;;;; 0)) +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21499 26793 739924 +;;;;;; 529000)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." @@ -31947,8 +31953,8 @@ ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21467 27179 976956 -;;;;;; 799000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (21508 18595 492383 +;;;;;; 362000)) ;;;*** ------------------------------------------------------------ revno: 117794 committer: Paul Eggert branch nick: trunk timestamp: Mon 2014-09-01 02:54:12 -0700 message: Fix typo in previous change's ChangeLog. diff: === modified file 'ChangeLog' --- ChangeLog 2014-09-01 09:49:51 +0000 +++ ChangeLog 2014-09-01 09:54:12 +0000 @@ -1,6 +1,6 @@ 2014-09-01 Paul Eggert - --enable-silent-warnings now suppresses more chatter. + --enable-silent-rules now suppresses more chatter. * INSTALL: Document this. Clean up extern decls a bit. === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-09-01 09:49:51 +0000 +++ etc/ChangeLog 2014-09-01 09:54:12 +0000 @@ -1,6 +1,6 @@ 2014-09-01 Paul Eggert - --enable-silent-warnings now suppresses more chatter. + --enable-silent-rules now suppresses more chatter. * NEWS: Document this. 2014-08-29 Leo Liu === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2014-09-01 09:49:51 +0000 +++ lib-src/ChangeLog 2014-09-01 09:54:12 +0000 @@ -1,6 +1,6 @@ 2014-09-01 Paul Eggert - --enable-silent-warnings now suppresses more chatter. + --enable-silent-rules now suppresses more chatter. * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) (am__v_CCLD_1): New macros, taken from Automake. === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2014-09-01 09:49:51 +0000 +++ lwlib/ChangeLog 2014-09-01 09:54:12 +0000 @@ -1,6 +1,6 @@ 2014-09-01 Paul Eggert - --enable-silent-warnings now suppresses more chatter. + --enable-silent-rules now suppresses more chatter. * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. (.c.o): Use them. === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2014-09-01 09:49:51 +0000 +++ oldXMenu/ChangeLog 2014-09-01 09:54:12 +0000 @@ -1,6 +1,6 @@ 2014-09-01 Paul Eggert - --enable-silent-warnings now suppresses more chatter. + --enable-silent-rules now suppresses more chatter. * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. (.c.o): Use them. === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-01 09:49:51 +0000 +++ src/ChangeLog 2014-09-01 09:54:12 +0000 @@ -1,6 +1,6 @@ 2014-09-01 Paul Eggert - --enable-silent-warnings now suppresses more chatter. + --enable-silent-rules now suppresses more chatter. * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) (am__v_CCLD_1): New macros, taken from Automake. ------------------------------------------------------------ revno: 117793 committer: Paul Eggert branch nick: trunk timestamp: Mon 2014-09-01 02:49:51 -0700 message: --enable-silent-warnings now suppresses more chatter. * INSTALL, etc/NEWS: Document this. * lib-src/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) (am__v_CCLD_1): New macros, taken from Automake. (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT}) (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT}) (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT}) (emacsclientw${EXEEXT}, ntlib.o, hexl${EXEEXT}) (update-game-score${EXEEXT}): Use them. * lwlib/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. (.c.o): Use them. * oldXMenu/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. (.c.o): Use them. * src/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) (am__v_CCLD_1): New macros, taken from Automake. (.c.o, .m.o, temacs$(EXEEXT)): Use them. diff: === modified file 'ChangeLog' --- ChangeLog 2014-09-01 02:37:22 +0000 +++ ChangeLog 2014-09-01 09:49:51 +0000 @@ -1,5 +1,8 @@ 2014-09-01 Paul Eggert + --enable-silent-warnings now suppresses more chatter. + * INSTALL: Document this. + Clean up extern decls a bit. * configure.ac (WERROR_CFLAGS): Don't disable -Wnested-externs. While we're at it, don't disable -Wlogical-op either. === modified file 'INSTALL' --- INSTALL 2014-06-05 17:31:41 +0000 +++ INSTALL 2014-09-01 09:49:51 +0000 @@ -328,6 +328,11 @@ there should be no warnings; on older and on non-GNU systems the generated warnings may still be useful. +Use --enable-silent-rules to cause 'make' to chatter less. This is +helpful when combined with options like --enable-gcc-warnings that +generate long shell-command lines. 'make V=0' also suppresses the +chatter. + Use --enable-link-time-optimization to enable link-time optimizer. If you're using GNU compiler, this feature is supported since version 4.5.0. If `configure' can determine number of online CPUS on your system, final === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-08-29 23:30:50 +0000 +++ etc/ChangeLog 2014-09-01 09:49:51 +0000 @@ -1,3 +1,8 @@ +2014-09-01 Paul Eggert + + --enable-silent-warnings now suppresses more chatter. + * NEWS: Document this. + 2014-08-29 Leo Liu * NEWS: Mention (:append FUN) to minibuffer-with-setup-hook. === modified file 'etc/NEWS' --- etc/NEWS 2014-08-29 23:30:50 +0000 +++ etc/NEWS 2014-09-01 09:49:51 +0000 @@ -40,6 +40,9 @@ ** The configure option `--with-pkg-config-prog' has been removed. Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. +** The configure option '--enable-silent-rules' and the command +'make V=0' now do a better job of suppressing chatter. + * Startup Changes in Emacs 24.5 === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2014-09-01 00:06:11 +0000 +++ lib-src/ChangeLog 2014-09-01 09:49:51 +0000 @@ -1,5 +1,15 @@ 2014-09-01 Paul Eggert + --enable-silent-warnings now suppresses more chatter. + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) + (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) + (am__v_CCLD_1): New macros, taken from Automake. + (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT}) + (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT}) + (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT}) + (emacsclientw${EXEEXT}, ntlib.o, hexl${EXEEXT}) + (update-game-score${EXEEXT}): Use them. + * etags.c (emacs_strchr, emacs_strrchr): Remove. All uses replaced by strchr and strrchr, which are on all target platforms now. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2014-06-26 06:18:53 +0000 +++ lib-src/Makefile.in 2014-09-01 09:49:51 +0000 @@ -45,6 +45,19 @@ # Program name transformation. TRANSFORM = @program_transform_name@ +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = + +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = + # ==================== Where To Install Things ==================== # Location to install Emacs.app under GNUstep / Mac OS X. @@ -311,7 +324,7 @@ $(MAKE) -C ../lib libgnu.a regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) - ${CC} -c ${CPP_CFLAGS} $< + $(AM_V_CC)$(CC) -c $(CPP_CFLAGS) $< etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h) @@ -319,41 +332,41 @@ etags_libs = regex.o $(LOADLIBES) $(NTLIB) etags${EXEEXT}: ${etags_deps} - $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs) + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs) ## ctags.c is distinct from etags.c so that parallel makes do not write two ## etags.o files on top of each other. ## FIXME? ## Can't we use a wrapper that calls 'etags --ctags'? ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps} - $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs) + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs) ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ $(config_h) - $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ $< $(LOADLIBES) $(NTLIB) -o $@ profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h) - $(CC) ${ALL_CFLAGS} $< \ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \ $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@ make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h) - $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@ movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h) - $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \ $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@ pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) - $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $< + $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $< emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) - $(CC) ${ALL_CFLAGS} $< \ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \ -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \ $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@ emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) - $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \ -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \ $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@ @@ -365,13 +378,14 @@ # The dependency on $(NTDEPS) is a trick intended to cause recompile of # programs on MinGW whenever some private header in nt/inc is modified. ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS) - $(CC) -c ${CPP_CFLAGS} $< + $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} $< hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h) - $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) - $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ + $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} \ + -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ $< $(LOADLIBES) $(NTLIB) -o $@ emacsclient.res: $(NTINC)/../emacsclient.rc === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2014-07-15 09:59:05 +0000 +++ lwlib/ChangeLog 2014-09-01 09:49:51 +0000 @@ -1,3 +1,10 @@ +2014-09-01 Paul Eggert + + --enable-silent-warnings now suppresses more chatter. + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) + (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. + (.c.o): Use them. + 2014-07-15 Dmitry Antipov * lwlib.h (toplevel): Use unsigned int for LWLIB_ID. === modified file 'lwlib/Makefile.in' --- lwlib/Makefile.in 2014-06-28 22:57:23 +0000 +++ lwlib/Makefile.in 2014-09-01 09:49:51 +0000 @@ -51,6 +51,14 @@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = + DEPDIR = deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS = @DEPFLAGS@ @@ -73,7 +81,7 @@ .c.o: @$(MKDEPDIR) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< + $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< liblw.a: $(OBJS) rm -f $@ === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2014-07-12 04:06:32 +0000 +++ oldXMenu/ChangeLog 2014-09-01 09:49:51 +0000 @@ -1,3 +1,10 @@ +2014-09-01 Paul Eggert + + --enable-silent-warnings now suppresses more chatter. + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) + (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. + (.c.o): Use them. + 2014-07-12 Dmitry Antipov * XMenuInt.h (XDeleteAssoc): Remove duplicated prototype to === modified file 'oldXMenu/Makefile.in' --- oldXMenu/Makefile.in 2014-06-28 22:57:23 +0000 +++ oldXMenu/Makefile.in 2014-09-01 09:49:51 +0000 @@ -93,6 +93,14 @@ all: libXMenu11.a .PHONY: all +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = + DEPDIR = deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS = @DEPFLAGS@ @@ -107,7 +115,7 @@ .c.o: @$(MKDEPDIR) - $(CC) -c ${ALL_CFLAGS} $< + $(AM_V_CC)$(CC) -c ${ALL_CFLAGS} $< libXMenu11.a: $(OBJS) $(EXTRA) $(RM) $@ === modified file 'src/ChangeLog' --- src/ChangeLog 2014-09-01 02:37:22 +0000 +++ src/ChangeLog 2014-09-01 09:49:51 +0000 @@ -1,5 +1,11 @@ 2014-09-01 Paul Eggert + --enable-silent-warnings now suppresses more chatter. + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) + (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) + (am__v_CCLD_1): New macros, taken from Automake. + (.c.o, .m.o, temacs$(EXEEXT)): Use them. + Clean up extern decls a bit. * bytecode.c: Include blockinput.h and keyboard.h rather than rolling their APIs by hand. === modified file 'src/Makefile.in' --- src/Makefile.in 2014-08-23 08:48:30 +0000 +++ src/Makefile.in 2014-09-01 09:49:51 +0000 @@ -304,6 +304,19 @@ CANNOT_DUMP=@CANNOT_DUMP@ +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = + +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = + DEPDIR=deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS=@DEPFLAGS@ @@ -334,10 +347,10 @@ .SUFFIXES: .m .c.o: @$(MKDEPDIR) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(PROFILING_CFLAGS) $< + $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(PROFILING_CFLAGS) $< .m.o: @$(MKDEPDIR) - $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $(PROFILING_CFLAGS) $< + $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $(PROFILING_CFLAGS) $< ## lastfile must follow all files whose initialized data areas should ## be dumped as pure by dump-emacs. @@ -491,7 +504,7 @@ ## to start if Vinstallation_directory has the wrong value. temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \ $(lib)/libgnu.a $(EMACSRES) - $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ + $(AM_V_CCLD)$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES) $(MKDIR_P) $(etc) test "$(CANNOT_DUMP)" = "yes" || \ ------------------------------------------------------------ revno: 117792 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-08-31 19:37:22 -0700 message: Clean up extern decls a bit. * configure.ac (WERROR_CFLAGS): Don't disable -Wnested-externs. While we're at it, don't disable -Wlogical-op either. * src/bytecode.c: Include blockinput.h and keyboard.h rather than rolling their APIs by hand. * src/emacs.c: Include regex.h and rely on its and lisp.h's API rather than rolling them by hand. * src/lastfile.c: Include lisp.h, to check this file's API. * src/lisp.h (lisp_eval_depth, my_edata, my_endbss, my_endbss_static): New decls. * src/regex.h (re_max_failures): New decl. * src/unexcw.c, src/unexmacosx.c, src/unexw32.c: Rely on lisp.h's API rather than rolling it by hand. * src/vm-limit.c (__after_morecore_hook, __morecore, real_morecore): Declare at top level, to pacify GCC -Wnested-externs. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-31 02:50:10 +0000 +++ ChangeLog 2014-09-01 02:37:22 +0000 @@ -1,3 +1,9 @@ +2014-09-01 Paul Eggert + + Clean up extern decls a bit. + * configure.ac (WERROR_CFLAGS): Don't disable -Wnested-externs. + While we're at it, don't disable -Wlogical-op either. + 2014-08-31 Paul Eggert * configure.ac (MAKE): Export it, for config.status. === modified file 'configure.ac' --- configure.ac 2014-08-31 02:50:10 +0000 +++ configure.ac 2014-09-01 02:37:22 +0000 @@ -844,10 +844,8 @@ nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings nw="$nw -Woverlength-strings" # Not a problem these days - nw="$nw -Wlogical-op" # any use of fwrite provokes this nw="$nw -Wformat-nonliteral" # we do this a lot - nw="$nw -Wvla" # warnings in gettext.h - nw="$nw -Wnested-externs" # use of XARGMATCH/verify_function__ + nw="$nw -Wvla" # Emacs uses . nw="$nw -Wswitch-default" # Too many warnings for now nw="$nw -Winline" # OK to ignore 'inline' nw="$nw -Wjump-misses-init" # We sometimes safely jump over init. @@ -864,7 +862,8 @@ # Emacs's use of alloca inhibits protecting the stack. nw="$nw -Wstack-protector" - # The following line should be removable at some point. + # Emacs's use of partly-pure functions such as CHECK_TYPE make this + # option problematic. nw="$nw -Wsuggest-attribute=pure" # This part is merely for shortening the command line, @@ -891,10 +890,6 @@ gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now gl_WARN_ADD([-Wno-format-nonliteral]) - # In spite of excluding -Wlogical-op above, it is enabled, as of - # gcc 4.5.0 20090517. - gl_WARN_ADD([-Wno-logical-op]) - # More things that clang is unduly picky about. if test $emacs_cv_clang = yes; then gl_WARN_ADD([-Wno-format-extra-args]) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-31 15:46:47 +0000 +++ src/ChangeLog 2014-09-01 02:37:22 +0000 @@ -1,3 +1,19 @@ +2014-09-01 Paul Eggert + + Clean up extern decls a bit. + * bytecode.c: Include blockinput.h and keyboard.h rather + than rolling their APIs by hand. + * emacs.c: Include regex.h and rely on its and lisp.h's API + rather than rolling them by hand. + * lastfile.c: Include lisp.h, to check this file's API. + * lisp.h (lisp_eval_depth, my_edata, my_endbss, my_endbss_static): + New decls. + * regex.h (re_max_failures): New decl. + * unexcw.c, unexmacosx.c, unexw32.c: + Rely on lisp.h's API rather than rolling it by hand. + * vm-limit.c (__after_morecore_hook, __morecore, real_morecore): + Declare at top level, to pacify GCC -Wnested-externs. + 2014-08-31 Eli Zaretskii * xdisp.c (get_glyph_string_clip_rects): Don't let the width of a === modified file 'src/bytecode.c' --- src/bytecode.c 2014-05-27 23:48:35 +0000 +++ src/bytecode.c 2014-09-01 02:37:22 +0000 @@ -36,8 +36,10 @@ #include #include "lisp.h" +#include "blockinput.h" #include "character.h" #include "buffer.h" +#include "keyboard.h" #include "syntax.h" #include "window.h" @@ -1106,9 +1108,6 @@ goto pushhandler; CASE (Bpushconditioncase): /* New in 24.4. */ { - extern EMACS_INT lisp_eval_depth; - extern int poll_suppress_count; - extern int interrupt_input_blocked; struct handler *c; Lisp_Object tag; int dest; === modified file 'src/emacs.c' --- src/emacs.c 2014-08-28 14:48:02 +0000 +++ src/emacs.c 2014-09-01 02:37:22 +0000 @@ -83,6 +83,7 @@ #include "charset.h" #include "composite.h" #include "dispextern.h" +#include "regex.h" #include "syntax.h" #include "sysselect.h" #include "systime.h" @@ -741,9 +742,6 @@ #ifdef GNU_LINUX if (!initialized) { - extern char my_endbss[]; - extern char *my_endbss_static; - if (my_heap_start == 0) my_heap_start = sbrk (0); @@ -872,7 +870,6 @@ && !getrlimit (RLIMIT_STACK, &rlim)) { long newlim; - extern size_t re_max_failures; /* Approximate the amount regex.c needs per unit of re_max_failures. */ int ratio = 20 * sizeof (char *); /* Then add 33% to cover the size of the smaller stacks that regex.c @@ -2136,10 +2133,7 @@ #ifndef WINDOWSNT /* On Windows, this was done before dumping, and that once suffices. Meanwhile, my_edata is not valid on Windows. */ - { - extern char my_edata[]; - memory_warnings (my_edata, malloc_warning); - } + memory_warnings (my_edata, malloc_warning); #endif /* not WINDOWSNT */ #endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */ #ifdef DOUG_LEA_MALLOC === modified file 'src/lastfile.c' --- src/lastfile.c 2014-01-01 07:43:34 +0000 +++ src/lastfile.c 2014-09-01 02:37:22 +0000 @@ -36,6 +36,8 @@ #include +#include + char my_edata[] = "End of Emacs initialized data"; /* Help unexec locate the end of the .bss area used by Emacs (which === modified file 'src/lisp.h' --- src/lisp.h 2014-08-29 17:57:36 +0000 +++ src/lisp.h 2014-09-01 02:37:22 +0000 @@ -3885,6 +3885,7 @@ } /* Defined in eval.c. */ +extern EMACS_INT lisp_eval_depth; extern Lisp_Object Qexit, Qinteractive, Qcommandp, Qmacro; extern Lisp_Object Qinhibit_quit, Qinternal_interpreter_environment, Qclosure; extern Lisp_Object Qand_rest; @@ -4419,6 +4420,11 @@ extern char *emacs_root_dir (void); #endif /* DOS_NT */ +/* Defined in lastfile.c. */ +extern char my_edata[]; +extern char my_endbss[]; +extern char *my_endbss_static; + /* True means ^G can quit instantly. */ extern bool immediate_quit; === modified file 'src/regex.h' --- src/regex.h 2014-01-01 07:43:34 +0000 +++ src/regex.h 2014-09-01 02:37:22 +0000 @@ -172,6 +172,9 @@ extern Lisp_Object re_match_object; #endif +/* Roughly the maximum number of failure points on the stack. */ +extern size_t re_max_failures; + /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so === modified file 'src/unexcw.c' --- src/unexcw.c 2014-08-28 14:48:02 +0000 +++ src/unexcw.c 2014-09-01 02:37:22 +0000 @@ -34,10 +34,6 @@ extern int bss_sbrk_did_unexec; -/* emacs symbols that indicate where bss and data end for emacs internals */ -extern char my_endbss[]; -extern char my_edata[]; - /* ** header for Windows executable files */ === modified file 'src/unexmacosx.c' --- src/unexmacosx.c 2014-01-01 07:43:34 +0000 +++ src/unexmacosx.c 2014-09-01 02:37:22 +0000 @@ -826,7 +826,6 @@ file. */ if (strncmp (sectp->sectname, SECT_DATA, 16) == 0) { - extern char my_edata[]; unsigned long my_size; /* The __data section is basically dumped from memory. But @@ -857,7 +856,6 @@ } else if (strncmp (sectp->sectname, SECT_BSS, 16) == 0) { - extern char *my_endbss_static; unsigned long my_size; sectp->flags = S_REGULAR; === modified file 'src/unexw32.c' --- src/unexw32.c 2014-05-29 15:21:08 +0000 +++ src/unexw32.c 2014-09-01 02:37:22 +0000 @@ -43,11 +43,8 @@ extern BOOL ctrl_c_handler (unsigned long type); extern char my_begdata[]; -extern char my_edata[]; extern char my_begbss[]; -extern char my_endbss[]; extern char *my_begbss_static; -extern char *my_endbss_static; #include "w32heap.h" === modified file 'src/vm-limit.c' --- src/vm-limit.c 2014-07-11 10:09:51 +0000 +++ src/vm-limit.c 2014-09-01 02:37:22 +0000 @@ -51,6 +51,15 @@ # endif #endif +/* From gmalloc.c. */ +extern void (* __after_morecore_hook) (void); +extern void *(*__morecore) (ptrdiff_t); + +/* From ralloc.c. */ +#ifdef REL_ALLOC +extern void *(*real_morecore) (ptrdiff_t); +#endif + /* Level number of warnings already issued. 0 -- no warnings issued. @@ -130,12 +139,9 @@ static void check_memory_limits (void) { -#ifdef REL_ALLOC - extern void *(*real_morecore) (ptrdiff_t); -#else +#ifndef REL_ALLOC void *(*real_morecore) (ptrdiff_t) = 0; #endif - extern void *(*__morecore) (ptrdiff_t); char *cp; size_t five_percent; @@ -203,8 +209,6 @@ void memory_warnings (void *start, void (*warnfun) (const char *)) { - extern void (* __after_morecore_hook) (void); /* From gmalloc.c */ - data_space_start = start ? start : data_start; warn_function = warnfun; ------------------------------------------------------------ revno: 117791 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-08-31 17:06:11 -0700 message: * etags.c (emacs_strchr, emacs_strrchr): Remove. All uses replaced by strchr and strrchr, which are on all target platforms now. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2014-07-15 19:28:25 +0000 +++ lib-src/ChangeLog 2014-09-01 00:06:11 +0000 @@ -1,3 +1,9 @@ +2014-09-01 Paul Eggert + + * etags.c (emacs_strchr, emacs_strrchr): Remove. + All uses replaced by strchr and strrchr, which are on all + target platforms now. + 2014-07-15 Paul Eggert Use "b" flag more consistently; avoid "t" (Bug#18006). === modified file 'lib-src/etags.c' --- lib-src/etags.c 2014-07-14 19:23:18 +0000 +++ lib-src/etags.c 2014-09-01 00:06:11 +0000 @@ -339,8 +339,6 @@ static char *skip_name (char *); static char *savenstr (const char *, int); static char *savestr (const char *); -static char *etags_strchr (const char *, int); -static char *etags_strrchr (const char *, int); static char *etags_getcwd (void); static char *relative_filename (char *, char *); static char *absolute_filename (char *, char *); @@ -1334,8 +1332,8 @@ /* File has been processed by canonicalize_filename, so we don't need to consider backslashes on DOS_NT. */ - slash = etags_strrchr (file, '/'); - suffix = etags_strrchr (file, '.'); + slash = strrchr (file, '/'); + suffix = strrchr (file, '.'); if (suffix == NULL || suffix < slash) return NULL; if (extptr != NULL) @@ -1422,7 +1420,7 @@ return lang; /* If not found, try suffix after last dot. */ - suffix = etags_strrchr (file, '.'); + suffix = strrchr (file, '.'); if (suffix == NULL) return NULL; suffix += 1; @@ -1699,7 +1697,7 @@ /* Set lp to point at the first char after the last slash in the line or, if no slashes, at the first nonblank. Then set cp to the first successive blank and terminate the string. */ - lp = etags_strrchr (lb.buffer+2, '/'); + lp = strrchr (lb.buffer+2, '/'); if (lp != NULL) lp += 1; else @@ -1884,9 +1882,9 @@ /* If ctags mode, change name "main" to M. */ if (CTAGS && !cxref_style && streq (name, "main")) { - register char *fp = etags_strrchr (curfdp->taggedfname, '/'); + char *fp = strrchr (curfdp->taggedfname, '/'); np->name = concat ("M", fp == NULL ? curfdp->taggedfname : fp + 1, ""); - fp = etags_strrchr (np->name, '.'); + fp = strrchr (np->name, '.'); if (fp != NULL && fp[1] != '\0' && fp[2] == '\0') fp[0] = '\0'; } @@ -4116,7 +4114,7 @@ /* Skip a string i.e. "abcd". */ if (inquote || (*dbp == '"')) { - dbp = etags_strchr (dbp + !inquote, '"'); + dbp = strchr (dbp + !inquote, '"'); if (dbp != NULL) { inquote = false; @@ -4274,7 +4272,7 @@ cp++; if (cp == sp) continue; /* nothing found */ - if ((pos = etags_strchr (sp, ':')) != NULL + if ((pos = strchr (sp, ':')) != NULL && pos < cp && pos[1] == ':') /* The name is already qualified. */ make_tag (sp, cp - sp, true, @@ -5029,7 +5027,7 @@ /* Allocate a token table */ for (len = 1, p = env; p;) - if ((p = etags_strchr (p, ':')) && *++p != '\0') + if ((p = strchr (p, ':')) && *++p != '\0') len++; TEX_toktab = xnew (len, linebuffer); @@ -5037,7 +5035,7 @@ /* zero-length strings (leading ':', "::" and trailing ':') */ for (i = 0; *env != '\0';) { - p = etags_strchr (env, ':'); + p = strchr (env, ':'); if (!p) /* End of environment string. */ p = env + strlen (env); if (p - env > 0) @@ -5767,9 +5765,9 @@ /* Pass 1: figure out how much to allocate by finding all \N strings. */ if (out[size - 1] == '\\') fatal ("pattern error in \"%s\"", out); - for (t = etags_strchr (out, '\\'); + for (t = strchr (out, '\\'); t != NULL; - t = etags_strchr (t + 2, '\\')) + t = strchr (t + 2, '\\')) if (ISDIGIT (t[1])) { dig = t[1] - '0'; @@ -6051,7 +6049,7 @@ { char *endp = lbp->buffer + start; - while ((endp = etags_strchr (endp, '"')) != NULL + while ((endp = strchr (endp, '"')) != NULL && endp[-1] == '\\') endp++; if (endp != NULL) @@ -6236,43 +6234,6 @@ return memcpy (dp, cp, len); } -/* - * Return the ptr in sp at which the character c last - * appears; NULL if not found - * - * Identical to POSIX strrchr, included for portability. - */ -static char * -etags_strrchr (register const char *sp, register int c) -{ - register const char *r; - - r = NULL; - do - { - if (*sp == c) - r = sp; - } while (*sp++); - return (char *)r; -} - -/* - * Return the ptr in sp at which the character c first - * appears; NULL if not found - * - * Identical to POSIX strchr, included for portability. - */ -static char * -etags_strchr (register const char *sp, register int c) -{ - do - { - if (*sp == c) - return (char *)sp; - } while (*sp++); - return NULL; -} - /* Skip spaces (end of string is not space), return new pointer. */ static char * skip_spaces (char *cp) @@ -6398,7 +6359,7 @@ /* Build a sequence of "../" strings for the resulting relative file name. */ i = 0; - while ((dp = etags_strchr (dp + 1, '/')) != NULL) + while ((dp = strchr (dp + 1, '/')) != NULL) i += 1; res = xnew (3*i + strlen (fp + 1) + 1, char); res[0] = '\0'; @@ -6431,7 +6392,7 @@ res = concat (dir, file, ""); /* Delete the "/dirname/.." and "/." substrings. */ - slashp = etags_strchr (res, '/'); + slashp = strchr (res, '/'); while (slashp != NULL && slashp[0] != '\0') { if (slashp[1] == '.') @@ -6463,7 +6424,7 @@ } } - slashp = etags_strchr (slashp + 1, '/'); + slashp = strchr (slashp + 1, '/'); } if (res[0] == '\0') /* just a safety net: should never happen */ @@ -6484,7 +6445,7 @@ char *slashp, *res; char save; - slashp = etags_strrchr (file, '/'); + slashp = strrchr (file, '/'); if (slashp == NULL) return savestr (dir); save = slashp[1]; ------------------------------------------------------------ revno: 117790 committer: Christoph Scholtes branch nick: trunk timestamp: Sun 2014-08-31 14:44:36 -0600 message: Replace mode-specific quit function in ibuffer.el * lisp/ibuffer.el: Replace mode-specific quit function with `quit-window' via `special-mode'. (ibuffer-mode-map): Use keybindings from special-mode-map instead of local overrides. (ibuffer): Don't store previous windows configuration. Let `quit-window' handle restoring. (ibuffer-quit): Remove function. Use `quit-window' instead. (ibuffer-restore-window-config-on-quit): Remove variable. (ibuffer-prev-window-config): Remove variable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-30 09:21:16 +0000 +++ lisp/ChangeLog 2014-08-31 20:44:36 +0000 @@ -1,3 +1,15 @@ +2014-08-31 Christoph Scholtes + + * ibuffer.el: Replace mode-specific quit function with + `quit-window' via `special-mode'. + (ibuffer-mode-map): Use keybindings from special-mode-map instead + of local overrides. + (ibuffer): Don't store previous windows configuration. Let + `quit-window' handle restoring. + (ibuffer-quit): Remove function. Use `quit-window' instead. + (ibuffer-restore-window-config-on-quit): Remove variable. + (ibuffer-prev-window-config): Remove variable. + 2014-08-29 Michael Heerdegen * emacs-lisp/easy-mmode.el (define-minor-mode): Use mode function === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2014-08-08 14:35:40 +0000 +++ lisp/ibuffer.el 2014-08-31 20:44:36 +0000 @@ -540,10 +540,6 @@ (define-key map (kbd "/ X") 'ibuffer-delete-saved-filter-groups) (define-key map (kbd "/ \\") 'ibuffer-clear-filter-groups) - (define-key map (kbd "q") 'ibuffer-quit) - (define-key map (kbd "h") 'describe-mode) - (define-key map (kbd "?") 'describe-mode) - (define-key map (kbd "% n") 'ibuffer-mark-by-name-regexp) (define-key map (kbd "% m") 'ibuffer-mark-by-mode-regexp) (define-key map (kbd "% f") 'ibuffer-mark-by-file-name-regexp) @@ -878,12 +874,6 @@ (define-key map [down-mouse-3] 'ibuffer-mouse-popup-menu) map)) -(defvar ibuffer-restore-window-config-on-quit nil - "If non-nil, restore previous window configuration upon exiting `ibuffer'.") - -(defvar ibuffer-prev-window-config nil - "Window configuration before starting Ibuffer.") - (defvar ibuffer-did-modification nil) (defvar ibuffer-compiled-formats nil) @@ -2298,18 +2288,6 @@ (goto-char (point-min)) (forward-line orig)))) -(defun ibuffer-quit () - "Quit this `ibuffer' session. -Try to restore the previous window configuration if -`ibuffer-restore-window-config-on-quit' is non-nil." - (interactive) - (if ibuffer-restore-window-config-on-quit - (progn - (bury-buffer) - (unless (= (count-windows) 1) - (set-window-configuration ibuffer-prev-window-config))) - (bury-buffer))) - ;;;###autoload (defun ibuffer-list-buffers (&optional files-only) "Display a list of buffers, in another window. @@ -2350,7 +2328,6 @@ (interactive "P") (when ibuffer-use-other-window (setq other-window-p t)) - (setq ibuffer-prev-window-config (current-window-configuration)) (let ((buf (get-buffer-create (or name "*Ibuffer*")))) (if other-window-p (funcall (if noselect (lambda (buf) (display-buffer buf t)) #'pop-to-buffer) buf) @@ -2362,8 +2339,7 @@ (select-window (get-buffer-window buf 0)) (or (derived-mode-p 'ibuffer-mode) (ibuffer-mode)) - (setq ibuffer-restore-window-config-on-quit other-window-p) - (when shrink + (when shrink (setq ibuffer-shrink-to-minimum-size shrink)) (when qualifiers (require 'ibuf-ext) @@ -2501,7 +2477,6 @@ '\\[ibuffer-switch-format]' - Change the current display format. '\\[forward-line]' - Move point to the next line. '\\[previous-line]' - Move point to the previous line. - '\\[ibuffer-quit]' - Bury the Ibuffer buffer. '\\[describe-mode]' - This help. '\\[ibuffer-diff-with-file]' - View the differences between this buffer and its associated file. @@ -2616,7 +2591,6 @@ (set (make-local-variable 'ibuffer-cached-eliding-string) nil) (set (make-local-variable 'ibuffer-cached-elide-long-columns) nil) (set (make-local-variable 'ibuffer-current-format) nil) - (set (make-local-variable 'ibuffer-restore-window-config-on-quit) nil) (set (make-local-variable 'ibuffer-did-modification) nil) (set (make-local-variable 'ibuffer-tmp-hide-regexps) nil) (set (make-local-variable 'ibuffer-tmp-show-regexps) nil) ------------------------------------------------------------ revno: 117789 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2014-08-31 18:46:47 +0300 message: Fix cursor drawing in hscrolled R2L screen lines. src/xdisp.c (get_glyph_string_clip_rects): Don't let the width of a clipping rectangle become negative (i.e. large positive, since it's an unsigned data type). This can happen in R2L hscrolled glyph rows, and caused us to draw the cursor glyph on the fringe. For the details, see http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00543.html. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-31 02:40:00 +0000 +++ src/ChangeLog 2014-08-31 15:46:47 +0000 @@ -1,3 +1,12 @@ +2014-08-31 Eli Zaretskii + + * xdisp.c (get_glyph_string_clip_rects): Don't let the width of a + clipping rectangle become negative (i.e. large positive, since + it's an unsigned data type). This can happen in R2L hscrolled + glyph rows, and caused us to draw the cursor glyph on the fringe. + For the details, see + http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00543.html. + 2014-08-31 Ken Brown * gmalloc.c: Don't include . Declare system malloc and === modified file 'src/xdisp.c' --- src/xdisp.c 2014-08-28 14:48:02 +0000 +++ src/xdisp.c 2014-08-31 15:46:47 +0000 @@ -2174,7 +2174,10 @@ if (s->x > r.x) { - r.width -= s->x - r.x; + if (r.width >= s->x - r.x) + r.width -= s->x - r.x; + else /* R2L hscrolled row with cursor outside text area */ + r.width = 0; r.x = s->x; } r.width = min (r.width, glyph->pixel_width); ------------------------------------------------------------ revno: 117788 author: Paul Eggert committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-08-30 19:50:10 -0700 message: * configure.ac (__restrict_arr): Remove; no longer used. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-31 02:34:31 +0000 +++ ChangeLog 2014-08-31 02:50:10 +0000 @@ -2,6 +2,7 @@ * configure.ac (MAKE): Export it, for config.status. Needed on AIX when 'configure' infers MAKE=gmake. + (__restrict_arr): Remove; no longer used. 2014-08-30 Paul Eggert === modified file 'configure.ac' --- configure.ac 2014-08-31 02:34:31 +0000 +++ configure.ac 2014-08-31 02:50:10 +0000 @@ -4005,15 +4005,6 @@ AC_TYPE_MBSTATE_T -AC_CACHE_CHECK([for C restricted array declarations], emacs_cv_c_restrict_arr, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[void fred (int x[__restrict]);]], [[]])], - emacs_cv_c_restrict_arr=yes, emacs_cv_c_restrict_arr=no)]) -if test "$emacs_cv_c_restrict_arr" = yes; then - AC_DEFINE(__restrict_arr, __restrict, - [Define to compiler's equivalent of C99 restrict keyword in array - declarations. Define as empty for no equivalent.]) -fi - dnl Fixme: AC_SYS_POSIX_TERMIOS should probably be used, but it's not clear dnl how the tty code is related to POSIX and/or other versions of termios. dnl The following looks like a useful start. ------------------------------------------------------------ revno: 117787 committer: Ken Brown branch nick: trunk timestamp: Sat 2014-08-30 22:40:00 -0400 message: Fix bug#18368 with broken build on AIX due to HYBRID_MALLOC changes. * src/gmalloc.c: Don't include . Declare system malloc and friends before defining hybrid_malloc and friends if HYBRID_MALLOC is defined. (Bug#18368) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-30 22:59:39 +0000 +++ src/ChangeLog 2014-08-31 02:40:00 +0000 @@ -1,3 +1,9 @@ +2014-08-31 Ken Brown + + * gmalloc.c: Don't include . Declare system malloc and + friends before defining hybrid_malloc and friends if HYBRID_MALLOC + is defined. (Bug#18368) + 2014-08-30 Paul Eggert Vector-sorting fixes (Bug#18361). === modified file 'src/gmalloc.c' --- src/gmalloc.c 2014-08-28 14:48:02 +0000 +++ src/gmalloc.c 2014-08-31 02:40:00 +0000 @@ -19,13 +19,6 @@ The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* If HYBRID_MALLOC is defined in config.h, then conf_post.h #defines - malloc and friends as macros before including stdlib.h. In this - file we will need the prototypes for the system malloc, so we must - include stdlib.h before config.h. And we have to do this - unconditionally, since HYBRID_MALLOC hasn't been defined yet. */ -#include - #include #if defined HAVE_PTHREAD && !defined HYBRID_MALLOC @@ -1725,6 +1718,17 @@ #undef aligned_alloc #undef free +/* Declare system malloc and friends. */ +extern void *malloc (size_t size); +extern void *realloc (void *ptr, size_t size); +extern void *calloc (size_t nmemb, size_t size); +extern void free (void *ptr); +#ifdef HAVE_ALIGNED_ALLOC +extern void *aligned_alloc (size_t alignment, size_t size); +#elif defined HAVE_POSIX_MEMALIGN +extern int posix_memalign (void **memptr, size_t alignment, size_t size); +#endif + /* See the comments near the beginning of this file for explanations of the following functions. */ ------------------------------------------------------------ revno: 117786 committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-08-30 19:34:31 -0700 message: * configure.ac (MAKE): Export it, for config.status. Needed on AIX when 'configure' infers MAKE=gmake. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-30 22:59:39 +0000 +++ ChangeLog 2014-08-31 02:34:31 +0000 @@ -1,3 +1,8 @@ +2014-08-31 Paul Eggert + + * configure.ac (MAKE): Export it, for config.status. + Needed on AIX when 'configure' infers MAKE=gmake. + 2014-08-30 Paul Eggert Vector-sorting fixes (Bug#18361). === modified file 'configure.ac' --- configure.ac 2014-08-30 22:59:39 +0000 +++ configure.ac 2014-08-31 02:34:31 +0000 @@ -130,6 +130,7 @@ For example, run '$0 MAKE=gnu-make'.]]) } MAKE=$ac_cv_path_MAKE +export MAKE dnl Fairly arbitrary, older versions might work too. AM_INIT_AUTOMAKE(1.11) ------------------------------------------------------------ revno: 117785 committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-08-30 16:29:23 -0700 message: * fns.c (sort_vector): Fix GC bug in previous change. diff: === modified file 'src/fns.c' --- src/fns.c 2014-08-30 22:59:39 +0000 +++ src/fns.c 2014-08-30 23:29:23 +0000 @@ -1992,17 +1992,18 @@ return; ptrdiff_t halflen = len >> 1; Lisp_Object *tmp; + Lisp_Object tmpvec = Qnil; struct gcpro gcpro1, gcpro2, gcpro3; - GCPRO3 (vector, predicate, predicate); - USE_SAFE_ALLOCA; - SAFE_ALLOCA_LISP (tmp, halflen); - for (ptrdiff_t i = 0; i < halflen; i++) - tmp[i] = make_number (0); - gcpro3.var = tmp; - gcpro3.nvars = halflen; + GCPRO3 (vector, predicate, tmpvec); + if (halflen < MAX_ALLOCA / word_size) + tmp = alloca (halflen * word_size); + else + { + tmpvec = Fmake_vector (make_number (halflen), make_number (0)); + tmp = XVECTOR (tmpvec)->contents; + } sort_vector_inplace (predicate, len, XVECTOR (vector)->contents, tmp); UNGCPRO; - SAFE_FREE (); } DEFUN ("sort", Fsort, Ssort, 2, 2, 0, ------------------------------------------------------------ revno: 117784 fixes bug: http://debbugs.gnu.org/18361 committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-08-30 15:59:39 -0700 message: Vector-sorting fixes. It's not safe to call qsort or qsort_r, since they have undefined behavior if the user-specified predicate is not a total order. Also, watch out for garbage-collection while sorting vectors. * admin/merge-gnulib (GNULIB_MODULES): Add vla. * configure.ac (qsort_r): Remove, as we no longer use qsort-like functions. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/vla.h, m4/vararrays.m4: New files, copied from gnulib. * lib/stdlib.in.h, m4/stdlib_h.m4: Sync from gnulib, incorporating: 2014-08-29 qsort_r: new module, for GNU-style qsort_r The previous two files' changes are boilerplate generated by admin/merge-gnulib, and should not affect Emacs. * src/fns.c: Include . (sort_vector_predicate) [!HAVE_QSORT_R]: Remove. (sort_vector_compare): Remove, replacing with .... (inorder, merge_vectors, sort_vector_inplace, sort_vector_copy): ... these new functions. (sort_vector): Rewrite to use the new functions. GCPRO locals, since the predicate can invoke the GC. Since it's in-place return void; caller changed. (merge): Use 'inorder', for clarity. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-29 07:29:47 +0000 +++ ChangeLog 2014-08-30 22:59:39 +0000 @@ -1,3 +1,15 @@ +2014-08-30 Paul Eggert + + Vector-sorting fixes (Bug#18361). + * configure.ac (qsort_r): Remove, as we no longer use qsort-like + functions. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + * lib/vla.h, m4/vararrays.m4: New files, copied from gnulib. + * lib/stdlib.in.h, m4/stdlib_h.m4: Sync from gnulib, incorporating: + 2014-08-29 qsort_r: new module, for GNU-style qsort_r + The previous two files' changes are boilerplate generated by + admin/merge-gnulib, and should not affect Emacs. + 2014-08-29 Dmitry Antipov * configure.ac (AC_CHECK_FUNCS): Check for qsort_r. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-08-30 09:22:53 +0000 +++ admin/ChangeLog 2014-08-30 22:59:39 +0000 @@ -1,3 +1,8 @@ +2014-08-30 Paul Eggert + + Vector-sorting fixes (Bug#18361). + * merge-gnulib (GNULIB_MODULES): Add vla. + 2014-08-30 Eli Zaretskii * authors.el (authors): Fix last change so it works for MS-Windows === modified file 'admin/merge-gnulib' --- admin/merge-gnulib 2014-07-14 19:23:18 +0000 +++ admin/merge-gnulib 2014-08-30 22:59:39 +0000 @@ -39,7 +39,7 @@ strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv update-copyright utimens - warnings + vla warnings ' GNULIB_TOOL_FLAGS=' === modified file 'configure.ac' --- configure.ac 2014-08-29 07:29:47 +0000 +++ configure.ac 2014-08-30 22:59:39 +0000 @@ -3573,7 +3573,7 @@ getrlimit setrlimit shutdown getaddrinfo \ pthread_sigmask strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ -gai_strerror sync qsort_r \ +gai_strerror sync \ getpwent endpwent getgrent endgrent \ cfmakeraw cfsetspeed copysign __executable_start log2) LIBS=$OLD_LIBS === modified file 'lib/gnulib.mk' --- lib/gnulib.mk 2014-08-04 18:44:49 +0000 +++ lib/gnulib.mk 2014-08-30 22:59:39 +0000 @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv update-copyright utimens warnings +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings MOSTLYCLEANFILES += core *.stackdump @@ -1141,6 +1141,7 @@ -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ + -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ @@ -1192,6 +1193,7 @@ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ + -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ @@ -1798,6 +1800,13 @@ ## end gnulib module verify +## begin gnulib module vla + + +EXTRA_DIST += vla.h + +## end gnulib module vla + ## begin gnulib module xalloc-oversized if gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec === modified file 'lib/stdlib.in.h' --- lib/stdlib.in.h 2014-01-01 07:43:34 +0000 +++ lib/stdlib.in.h 2014-08-30 22:59:39 +0000 @@ -520,6 +520,29 @@ _GL_CXXALIASWARN (putenv); #endif +#if @GNULIB_QSORT_R@ +# if @REPLACE_QSORT_R@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef qsort_r +# define qsort_r rpl_qsort_r +# endif +_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg) _GL_ARG_NONNULL ((1, 4))); +_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg)); +# else +_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg)); +# endif +_GL_CXXALIASWARN (qsort_r); +#endif + #if @GNULIB_RANDOM_R@ # if !@HAVE_RANDOM_R@ === added file 'lib/vla.h' --- lib/vla.h 1970-01-01 00:00:00 +0000 +++ lib/vla.h 2014-08-30 22:59:39 +0000 @@ -0,0 +1,27 @@ +/* vla.h - variable length arrays + + Copyright 2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Written by Paul Eggert. */ + +/* A function's argument must point to an array with at least N elements. + Example: 'int main (int argc, char *argv[VLA_ELEMS (argc)]);'. */ + +#ifdef __STDC_NO_VLA__ +# define VLA_ELEMS(n) +#else +# define VLA_ELEMS(n) static n +#endif === modified file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2014-05-17 08:11:31 +0000 +++ m4/gnulib-comp.m4 2014-08-30 22:59:39 +0000 @@ -146,7 +146,9 @@ # Code from module unsetenv: # Code from module update-copyright: # Code from module utimens: + # Code from module vararrays: # Code from module verify: + # Code from module vla: # Code from module warnings: # Code from module xalloc-oversized: ]) @@ -383,6 +385,7 @@ fi gl_STDLIB_MODULE_INDICATOR([unsetenv]) gl_UTIMENS + AC_C_VARARRAYS gl_gnulib_enabled_260941c0e5dc67ec9e87d1fb321c300b=false gl_gnulib_enabled_dosname=false gl_gnulib_enabled_euidaccess=false @@ -916,6 +919,7 @@ lib/utimens.c lib/utimens.h lib/verify.h + lib/vla.h lib/xalloc-oversized.h m4/00gnulib.m4 m4/absolute-header.m4 @@ -1013,6 +1017,7 @@ m4/utimbuf.m4 m4/utimens.m4 m4/utimes.m4 + m4/vararrays.m4 m4/warn-on-use.m4 m4/warnings.m4 m4/wchar_t.m4 === modified file 'm4/stdlib_h.m4' --- m4/stdlib_h.m4 2014-01-01 07:43:34 +0000 +++ m4/stdlib_h.m4 2014-08-30 22:59:39 +0000 @@ -55,6 +55,7 @@ GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) + GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) @@ -107,6 +108,7 @@ REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) + REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) === added file 'm4/vararrays.m4' --- m4/vararrays.m4 1970-01-01 00:00:00 +0000 +++ m4/vararrays.m4 2014-08-30 22:59:39 +0000 @@ -0,0 +1,68 @@ +# Check for variable-length arrays. + +# serial 5 + +# From Paul Eggert + +# Copyright (C) 2001, 2009-2014 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This is a copy of AC_C_VARARRAYS from a recent development version +# of Autoconf. It replaces Autoconf's version, or for pre-2.61 autoconf +# it defines the macro that Autoconf lacks. +AC_DEFUN([AC_C_VARARRAYS], +[ + AC_CACHE_CHECK([for variable-length arrays], + ac_cv_c_vararrays, + [AC_EGREP_CPP([defined], + [#ifdef __STDC_NO_VLA__ + defined + #endif + ], + [ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined'], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[/* Test for VLA support. This test is partly inspired + from examples in the C standard. Use at least two VLA + functions to detect the GCC 3.4.3 bug described in: + http://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html + */ + #ifdef __STDC_NO_VLA__ + syntax error; + #else + extern int n; + int B[100]; + int fvla (int m, int C[m][m]); + + int + simple (int count, int all[static count]) + { + return all[count - 1]; + } + + int + fvla (int m, int C[m][m]) + { + typedef int VLA[m][m]; + VLA x; + int D[m]; + static int (*q)[m] = &B; + int (*s)[n] = q; + return C && &x[0][0] == &D[0] && &D[0] == s[0]; + } + #endif + ]])], + [ac_cv_c_vararrays=yes], + [ac_cv_c_vararrays=no])])]) + if test "$ac_cv_c_vararrays" = yes; then + dnl This is for compatibility with Autoconf 2.61-2.69. + AC_DEFINE([HAVE_C_VARARRAYS], 1, + [Define to 1 if C supports variable-length arrays.]) + elif test "$ac_cv_c_vararrays" = no; then + AC_DEFINE([__STDC_NO_VLA__], 1, + [Define to 1 if C does not support variable-length arrays, and + if the compiler does not already define this.]) + fi +]) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-30 16:47:19 +0000 +++ src/ChangeLog 2014-08-30 22:59:39 +0000 @@ -1,5 +1,19 @@ 2014-08-30 Paul Eggert + Vector-sorting fixes (Bug#18361). + It's not safe to call qsort or qsort_r, since they have undefined + behavior if the user-specified predicate is not a total order. + Also, watch out for garbage-collection while sorting vectors. + * fns.c: Include . + (sort_vector_predicate) [!HAVE_QSORT_R]: Remove. + (sort_vector_compare): Remove, replacing with .... + (inorder, merge_vectors, sort_vector_inplace, sort_vector_copy): + ... these new functions. + (sort_vector): Rewrite to use the new functions. + GCPRO locals, since the predicate can invoke the GC. + Since it's in-place return void; caller changed. + (merge): Use 'inorder', for clarity. + * sysdep.c (str_collate): Clear errno just before wcscoll(_l). One can't hoist this out of the 'if', because intervening calls to newlocale, twolower, etc. can change errno. === modified file 'src/fns.c' --- src/fns.c 2014-08-29 19:18:06 +0000 +++ src/fns.c 2014-08-30 22:59:39 +0000 @@ -24,6 +24,7 @@ #include #include +#include #include "lisp.h" #include "commands.h" @@ -49,6 +50,8 @@ static Lisp_Object Qmd5, Qsha1, Qsha224, Qsha256, Qsha384, Qsha512; +static void sort_vector_copy (Lisp_Object, ptrdiff_t, + Lisp_Object [restrict], Lisp_Object [restrict]); static bool internal_equal (Lisp_Object, Lisp_Object, int, bool, Lisp_Object); DEFUN ("identity", Fidentity, Sidentity, 1, 1, 0, @@ -1897,86 +1900,109 @@ return merge (front, back, predicate); } -/* Using GNU qsort_r, we can pass this as a parameter. This also - exists on FreeBSD and Darwin/OSX, but with a different signature. */ -#ifndef HAVE_QSORT_R -static Lisp_Object sort_vector_predicate; -#endif - -/* Comparison function called by qsort. */ - -static int -#ifdef HAVE_QSORT_R -#if defined (DARWIN_OS) || defined (__FreeBSD__) -sort_vector_compare (void *arg, const void *p, const void *q) -#elif defined (GNU_LINUX) -sort_vector_compare (const void *p, const void *q, void *arg) -#else /* neither darwin/bsd nor gnu/linux */ -#error "check how qsort_r comparison function works on your platform" -#endif /* DARWIN_OS || __FreeBSD__ */ -#else /* not HAVE_QSORT_R */ -sort_vector_compare (const void *p, const void *q) -#endif /* HAVE_QSORT_R */ -{ - bool more, less; - Lisp_Object op, oq, vp, vq; -#ifdef HAVE_QSORT_R - Lisp_Object sort_vector_predicate = *(Lisp_Object *) arg; -#endif - - op = *(Lisp_Object *) p; - oq = *(Lisp_Object *) q; - vp = XSAVE_OBJECT (op, 1); - vq = XSAVE_OBJECT (oq, 1); - - /* Use recorded element index as a secondary key to - preserve original order. Pretty ugly but works. */ - more = NILP (call2 (sort_vector_predicate, vp, vq)); - less = NILP (call2 (sort_vector_predicate, vq, vp)); - return ((more && !less) ? 1 - : ((!more && less) ? -1 - : XSAVE_INTEGER (op, 0) - XSAVE_INTEGER (oq, 0))); -} - -/* Sort VECTOR using PREDICATE, preserving original order of elements - considered as equal. */ - -static Lisp_Object +/* Using PRED to compare, return whether A and B are in order. + Compare stably when A appeared before B in the input. */ +static bool +inorder (Lisp_Object pred, Lisp_Object a, Lisp_Object b) +{ + return NILP (call2 (pred, b, a)); +} + +/* Using PRED to compare, merge from ALEN-length A and BLEN-length B + into DEST. Argument arrays must be nonempty and must not overlap, + except that B might be the last part of DEST. */ +static void +merge_vectors (Lisp_Object pred, + ptrdiff_t alen, Lisp_Object const a[restrict VLA_ELEMS (alen)], + ptrdiff_t blen, Lisp_Object const b[VLA_ELEMS (blen)], + Lisp_Object dest[VLA_ELEMS (alen + blen)]) +{ + eassume (0 < alen && 0 < blen); + Lisp_Object const *alim = a + alen; + Lisp_Object const *blim = b + blen; + + while (true) + { + if (inorder (pred, a[0], b[0])) + { + *dest++ = *a++; + if (a == alim) + { + if (dest != b) + memcpy (dest, b, (blim - b) * sizeof *dest); + return; + } + } + else + { + *dest++ = *b++; + if (b == blim) + { + memcpy (dest, a, (alim - a) * sizeof *dest); + return; + } + } + } +} + +/* Using PRED to compare, sort LEN-length VEC in place, using TMP for + temporary storage. LEN must be at least 2. */ +static void +sort_vector_inplace (Lisp_Object pred, ptrdiff_t len, + Lisp_Object vec[restrict VLA_ELEMS (len)], + Lisp_Object tmp[restrict VLA_ELEMS (len >> 1)]) +{ + eassume (2 <= len); + ptrdiff_t halflen = len >> 1; + sort_vector_copy (pred, halflen, vec, tmp); + if (1 < len - halflen) + sort_vector_inplace (pred, len - halflen, vec + halflen, vec); + merge_vectors (pred, halflen, tmp, len - halflen, vec + halflen, vec); +} + +/* Using PRED to compare, sort from LEN-length SRC into DST. + Len must be positive. */ +static void +sort_vector_copy (Lisp_Object pred, ptrdiff_t len, + Lisp_Object src[restrict VLA_ELEMS (len)], + Lisp_Object dest[restrict VLA_ELEMS (len)]) +{ + eassume (0 < len); + ptrdiff_t halflen = len >> 1; + if (halflen < 1) + dest[0] = src[0]; + else + { + if (1 < halflen) + sort_vector_inplace (pred, halflen, src, dest); + if (1 < len - halflen) + sort_vector_inplace (pred, len - halflen, src + halflen, dest); + merge_vectors (pred, halflen, src, len - halflen, src + halflen, dest); + } +} + +/* Sort VECTOR in place using PREDICATE, preserving original order of + elements considered as equal. */ + +static void sort_vector (Lisp_Object vector, Lisp_Object predicate) { - ptrdiff_t i; - EMACS_INT len = ASIZE (vector); - Lisp_Object *v = XVECTOR (vector)->contents; - + ptrdiff_t len = ASIZE (vector); if (len < 2) - return vector; - /* Record original index of each element to make qsort stable. */ - for (i = 0; i < len; i++) - v[i] = make_save_int_obj (i, v[i]); - - /* Setup predicate and sort. */ -#ifdef HAVE_QSORT_R -#if defined (DARWIN_OS) || defined (__FreeBSD__) - qsort_r (v, len, word_size, (void *) &predicate, sort_vector_compare); -#elif defined (GNU_LINUX) - qsort_r (v, len, word_size, sort_vector_compare, (void *) &predicate); -#else /* neither darwin/bsd nor gnu/linux */ -#error "check how qsort_r works on your platform" -#endif /* DARWIN_OS || __FreeBSD__ */ -#else /* not HAVE_QSORT_R */ - sort_vector_predicate = predicate; - qsort (v, len, word_size, sort_vector_compare); -#endif /* HAVE_QSORT_R */ - - /* Discard indexes and restore original elements. */ - for (i = 0; i < len; i++) - { - Lisp_Object save = v[i]; - /* Use explicit free to offload GC. */ - v[i] = XSAVE_OBJECT (save, 1); - free_misc (save); - } - return vector; + return; + ptrdiff_t halflen = len >> 1; + Lisp_Object *tmp; + struct gcpro gcpro1, gcpro2, gcpro3; + GCPRO3 (vector, predicate, predicate); + USE_SAFE_ALLOCA; + SAFE_ALLOCA_LISP (tmp, halflen); + for (ptrdiff_t i = 0; i < halflen; i++) + tmp[i] = make_number (0); + gcpro3.var = tmp; + gcpro3.nvars = halflen; + sort_vector_inplace (predicate, len, XVECTOR (vector)->contents, tmp); + UNGCPRO; + SAFE_FREE (); } DEFUN ("sort", Fsort, Ssort, 2, 2, 0, @@ -1990,7 +2016,7 @@ if (CONSP (seq)) seq = sort_list (seq, predicate); else if (VECTORP (seq)) - seq = sort_vector (seq, predicate); + sort_vector (seq, predicate); else if (!NILP (seq)) wrong_type_argument (Qsequencep, seq); return seq; @@ -2033,8 +2059,7 @@ Fsetcdr (tail, l1); return value; } - tem = call2 (pred, Fcar (l2), Fcar (l1)); - if (NILP (tem)) + if (inorder (pred, Fcar (l1), Fcar (l2))) { tem = l1; l1 = Fcdr (l1); ------------------------------------------------------------ revno: 117783 committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-08-30 09:47:19 -0700 message: * sysdep.c (str_collate): Clear errno just before wcscoll(_l). One can't hoist this out of the 'if', because intervening calls to newlocale, twolower, etc. can change errno. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-30 09:21:16 +0000 +++ src/ChangeLog 2014-08-30 16:47:19 +0000 @@ -1,3 +1,9 @@ +2014-08-30 Paul Eggert + + * sysdep.c (str_collate): Clear errno just before wcscoll(_l). + One can't hoist this out of the 'if', because intervening calls to + newlocale, twolower, etc. can change errno. + 2014-08-30 Eli Zaretskii * sysdep.c (str_collate) [__STDC_ISO_10646__]: Improve the === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-30 08:19:24 +0000 +++ src/sysdep.c 2014-08-30 16:47:19 +0000 @@ -3740,8 +3740,6 @@ FETCH_STRING_CHAR_ADVANCE (*(p2+i-1), s2, i, i_byte); *(p2+len) = 0; - errno = 0; - if (STRINGP (locale)) { locale_t loc = newlocale (LC_COLLATE_MASK | LC_CTYPE_MASK, @@ -3757,6 +3755,7 @@ *p = towlower_l (*p, loc); } + errno = 0; res = wcscoll_l (p1, p2, loc); err = errno; freelocale (loc); @@ -3771,6 +3770,7 @@ *p = towlower (*p); } + errno = 0; res = wcscoll (p1, p2); err = errno; } ------------------------------------------------------------ revno: 117782 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-08-30 12:22:53 +0300 message: admin/authors.el (authors): Fix last change so it works for MS-Windows as well. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-08-29 18:10:15 +0000 +++ admin/ChangeLog 2014-08-30 09:22:53 +0000 @@ -1,3 +1,8 @@ +2014-08-30 Eli Zaretskii + + * authors.el (authors): Fix last change so it works for MS-Windows + as well. + 2014-08-29 Michael Albinus * authors.el (authors): Use LOCALE argument of `string-collate-lessp'. === modified file 'admin/authors.el' --- admin/authors.el 2014-08-29 18:10:15 +0000 +++ admin/authors.el 2014-08-30 09:22:53 +0000 @@ -1315,7 +1315,10 @@ (setq authors-author-list (sort authors-author-list (lambda (a b) - (string-collate-lessp (car a) (car b) "en_US.UTF-8")))) + (string-collate-lessp (car a) (car b) + (if (eq system-type 'windows-nt) + "enu_USA" + "en_US.UTF-8"))))) (dolist (a authors-author-list) (let ((author (car a)) (wrote (nth 1 a)) ------------------------------------------------------------ revno: 117781 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-08-30 12:21:16 +0300 message: Minor ChangeLog fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-29 20:28:19 +0000 +++ lisp/ChangeLog 2014-08-30 09:21:16 +0000 @@ -6094,8 +6094,8 @@ 2014-01-14 Agustín Martín Domingo - * ispell.el (ispell-region): Reset `in-comment' for new line - instead of wrongly reset `add-coment' (bug#13577). + * textmodes/ispell.el (ispell-region): Reset `in-comment' for new + line instead of wrongly reset `add-coment' (bug#13577). 2014-01-14 Daiki Ueno === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-30 08:19:24 +0000 +++ src/ChangeLog 2014-08-30 09:21:16 +0000 @@ -1932,7 +1932,7 @@ * dispextern.h (struct face) [HAVE_XFT]: Ifdef 'extra' member. * font.c (font_done_for_face): - * xface.c (realize_non_ascii_face): Adjust user. + * xfaces.c (realize_non_ascii_face): Adjust user. * font.h (struct font_driver): Convert 'prepare_face' to return void because its return value is never used anyway. * xfont.c (xfont_prepare_face): Return void. ------------------------------------------------------------ revno: 117780 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-08-30 11:19:24 +0300 message: Improve error checking and error messages in string-collation functions. src/sysdep.c (str_collate) [__STDC_ISO_10646__]: Improve the wording of the error messages. (str_collate) [WINDOWSNT]: Signal an error if w32_compare_strings sets errno. src/w32proc.c (get_lcid_callback): Accept locale specifications without the country part, as in "enu" vs "enu_USA". (w32_compare_strings): Signal an error if a locale was specified, but couldn't be translated into a valid LCID. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-29 21:19:45 +0000 +++ src/ChangeLog 2014-08-30 08:19:24 +0000 @@ -1,3 +1,15 @@ +2014-08-30 Eli Zaretskii + + * sysdep.c (str_collate) [__STDC_ISO_10646__]: Improve the + wording of the error messages. + (str_collate) [WINDOWSNT]: Signal an error if w32_compare_strings + sets errno. + + * w32proc.c (get_lcid_callback): Accept locale specifications + without the country part, as in "enu" vs "enu_USA". + (w32_compare_strings): Signal an error if a locale was specified, + but couldn't be translated into a valid LCID. + 2014-08-29 Michael Albinus * sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno. === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-29 21:19:45 +0000 +++ src/sysdep.c 2014-08-30 08:19:24 +0000 @@ -3747,7 +3747,7 @@ locale_t loc = newlocale (LC_COLLATE_MASK | LC_CTYPE_MASK, SSDATA (locale), 0); if (!loc) - error ("Wrong locale: %s", strerror (errno)); + error ("Invalid locale %s: %s", SSDATA (locale), strerror (errno)); if (! NILP (ignore_case)) for (int i = 1; i < 3; i++) @@ -3774,8 +3774,13 @@ res = wcscoll (p1, p2); err = errno; } - if (err) - error ("Wrong argument: %s", strerror (err)); +# ifndef HAVE_NEWLOCALE + if (err) + error ("Invalid locale or string for collation: %s", strerror (err)); +# else + if (err) + error ("Invalid string for collation: %s", strerror (err)); +# endif SAFE_FREE (); return res; @@ -3789,7 +3794,14 @@ { char *loc = STRINGP (locale) ? SSDATA (locale) : NULL; - - return w32_compare_strings (SDATA (s1), SDATA (s2), loc, !NILP (ignore_case)); + int res, err = errno; + + errno = 0; + res = w32_compare_strings (SDATA (s1), SDATA (s2), loc, !NILP (ignore_case)); + if (errno) + error ("Invalid string for collation: %s", strerror (errno)); + + errno = err; + return res; } #endif /* WINDOWSNT */ === modified file 'src/w32proc.c' --- src/w32proc.c 2014-08-29 19:18:06 +0000 +++ src/w32proc.c 2014-08-30 08:19:24 +0000 @@ -3164,6 +3164,12 @@ if (GetLocaleInfo (try_lcid, LOCALE_SABBREVLANGNAME, locval, LOCALE_NAME_MAX_LENGTH)) { + /* This is for when they only specify the language, as in "ENU". */ + if (stricmp (locval, lname) == 0) + { + found_lcid = try_lcid; + return FALSE; + } strcat (locval, "_"); if (GetLocaleInfo (try_lcid, LOCALE_SABBREVCTRYNAME, locval + strlen (locval), LOCALE_NAME_MAX_LENGTH)) @@ -3287,6 +3293,8 @@ if (new_lcid > 0) lcid = new_lcid; + else + error ("Invalid locale %s: Invalid argument", locname); } if (ignore_case) ------------------------------------------------------------ revno: 117779 committer: Leo Liu branch nick: trunk timestamp: Sat 2014-08-30 07:30:50 +0800 message: * NEWS: Mention (:append FUN) to minibuffer-with-setup-hook. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-08-29 19:18:06 +0000 +++ etc/ChangeLog 2014-08-29 23:30:50 +0000 @@ -1,3 +1,7 @@ +2014-08-29 Leo Liu + + * NEWS: Mention (:append FUN) to minibuffer-with-setup-hook. + 2014-08-29 Eli Zaretskii * NEWS: Mention w32-collate-ignore-punctuation. === modified file 'etc/NEWS' --- etc/NEWS 2014-08-29 19:18:06 +0000 +++ etc/NEWS 2014-08-29 23:30:50 +0000 @@ -103,6 +103,9 @@ ** New font-lock functions font-lock-ensure and font-lock-flush, which should be used instead of font-lock-fontify-buffer when called from Elisp. +** Macro `minibuffer-with-setup-hook' takes (:append FUN) to mean +appending FUN to `minibuffer-setup-hook'. + ** Calendar and diary +++ ------------------------------------------------------------ revno: 117778 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-08-29 23:19:45 +0200 message: * sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-29 20:16:40 +0000 +++ src/ChangeLog 2014-08-29 21:19:45 +0000 @@ -1,9 +1,13 @@ +2014-08-29 Michael Albinus + + * sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno. + 2014-08-29 Paul Eggert - * sysdep.c (str_collate): Do not look at errno after towlower_l. - errno's value is not specified after towlower_l. Instead, assume - that towlower_l returns its argument on failure, which is portable - in practice. + * sysdep.c (str_collate) [__STDC_ISO_10646__]: Do not look at + errno after towlower_l. errno's value is not specified after + towlower_l. Instead, assume that towlower_l returns its argument + on failure, which is portable in practice. 2014-08-29 Eli Zaretskii === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-29 20:16:40 +0000 +++ src/sysdep.c 2014-08-29 21:19:45 +0000 @@ -3740,6 +3740,8 @@ FETCH_STRING_CHAR_ADVANCE (*(p2+i-1), s2, i, i_byte); *(p2+len) = 0; + errno = 0; + if (STRINGP (locale)) { locale_t loc = newlocale (LC_COLLATE_MASK | LC_CTYPE_MASK, @@ -3761,7 +3763,6 @@ } else { - errno = 0; if (! NILP (ignore_case)) for (int i = 1; i < 3; i++) { @@ -3769,6 +3770,7 @@ for (; *p; p++) *p = towlower (*p); } + res = wcscoll (p1, p2); err = errno; } ------------------------------------------------------------ revno: 117777 fixes bug: http://debbugs.gnu.org/18349 author: Michael Heerdegen committer: Christopher Schmidt branch nick: trunk timestamp: Fri 2014-08-29 22:28:19 +0200 message: * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Use mode function name instead of variable name in hook docstring. (Bug#18349) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-29 10:39:17 +0000 +++ lisp/ChangeLog 2014-08-29 20:28:19 +0000 @@ -1,3 +1,8 @@ +2014-08-29 Michael Heerdegen + + * emacs-lisp/easy-mmode.el (define-minor-mode): Use mode function + name instead of variable name in hook docstring. (Bug#18349) + 2014-08-29 Martin Rudalics * window.el (display-buffer-at-bottom): Prefer bottom-left === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2014-02-24 03:55:17 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2014-08-29 20:28:19 +0000 @@ -300,7 +300,7 @@ ,(format "Hook run after entering or leaving `%s'. No problems result if this variable is not bound. `add-hook' automatically binds it. (This is true for all hook variables.)" - mode)) + modefun)) ;; Define the minor-mode keymap. ,(unless (symbolp keymap) ;nil is also a symbol. ------------------------------------------------------------ revno: 117776 committer: Paul Eggert branch nick: trunk timestamp: Fri 2014-08-29 13:16:40 -0700 message: * sysdep.c (str_collate): Do not look at errno after towlower_l. errno's value is not specified after towlower_l. Instead, assume that towlower_l returns its argument on failure, which is portable in practice. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-29 19:18:06 +0000 +++ src/ChangeLog 2014-08-29 20:16:40 +0000 @@ -1,3 +1,10 @@ +2014-08-29 Paul Eggert + + * sysdep.c (str_collate): Do not look at errno after towlower_l. + errno's value is not specified after towlower_l. Instead, assume + that towlower_l returns its argument on failure, which is portable + in practice. + 2014-08-29 Eli Zaretskii * fns.c (Fstring_collate_lessp, Fstring_collate_equalp): Doc fix. === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-29 19:18:06 +0000 +++ src/sysdep.c 2014-08-29 20:16:40 +0000 @@ -3746,24 +3746,16 @@ SSDATA (locale), 0); if (!loc) error ("Wrong locale: %s", strerror (errno)); - errno = 0; if (! NILP (ignore_case)) for (int i = 1; i < 3; i++) { wchar_t *p = (i == 1) ? p1 : p2; for (; *p; p++) - { - *p = towlower_l (*p, loc); - if (errno) - break; - } - if (errno) - break; + *p = towlower_l (*p, loc); } - if (! errno) - res = wcscoll_l (p1, p2, loc); + res = wcscoll_l (p1, p2, loc); err = errno; freelocale (loc); } ------------------------------------------------------------ revno: 117775 fixes bug: http://debbugs.gnu.org/18051 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2014-08-29 22:18:06 +0300 message: Implement case-insensitive and Unicode-compliant collation on MS-Windows. src/fns.c (Fstring_collate_lessp, Fstring_collate_equalp): Doc fix. src/w32proc.c (w32_compare_strings): Accept additional argument IGNORE_CASE. Set up the flags for CompareStringW to ignore case if requested. If w32-collate-ignore-punctuation is non-nil, add NORM_IGNORESYMBOLS to the flags. (LINGUISTIC_IGNORECASE): Define if not already defined. (syms_of_ntproc) : New variable. src/sysdep.c (str_collate) [WINDOWSNT]: Adapt to the interface change. src/w32.h: Adjust prototype of w32_compare_strings. etc/NEWS: Mention w32-collate-ignore-punctuation. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-08-29 12:23:30 +0000 +++ etc/ChangeLog 2014-08-29 19:18:06 +0000 @@ -1,3 +1,7 @@ +2014-08-29 Eli Zaretskii + + * NEWS: Mention w32-collate-ignore-punctuation. + 2014-08-29 Dmitry Antipov * NEWS: Mention that `sort' can handle vectors. === modified file 'etc/NEWS' --- etc/NEWS 2014-08-29 12:23:30 +0000 +++ etc/NEWS 2014-08-29 19:18:06 +0000 @@ -72,6 +72,13 @@ systems and for MS-Windows, for other systems they fall back to their counterparts `string-lessp' and `string-equal'. +*** The MS-Windows specific variable `w32-collate-ignore-punctuation', +if set to a non-nil value, causes the above 2 functions to ignore +symbol and punctuation characters when collating strings. This +emulates the behavior of modern Posix platforms when the locale's +codeset is "UTF-8" (as in "en_US.UTF-8"). This is needed because +MS-Windows doesn't support UTF-8 as codeset in its locales. + * Editing Changes in Emacs 24.5 === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-29 17:57:36 +0000 +++ src/ChangeLog 2014-08-29 19:18:06 +0000 @@ -1,3 +1,17 @@ +2014-08-29 Eli Zaretskii + + * fns.c (Fstring_collate_lessp, Fstring_collate_equalp): Doc fix. + + * w32proc.c (w32_compare_strings): Accept additional argument + IGNORE_CASE. Set up the flags for CompareStringW to ignore case + if requested. If w32-collate-ignore-punctuation is non-nil, add + NORM_IGNORESYMBOLS to the flags. + (LINGUISTIC_IGNORECASE): Define if not already defined. + (syms_of_ntproc) : New variable. + + * sysdep.c (str_collate) [WINDOWSNT]: Adapt to the interface + change. + 2014-08-29 Michael Albinus * sysdep.c (LC_CTYPE, LC_CTYPE_MASK, towlower_l): === modified file 'src/fns.c' --- src/fns.c 2014-08-29 17:57:36 +0000 +++ src/fns.c 2014-08-29 19:18:06 +0000 @@ -350,7 +350,7 @@ This function obeys the conventions for collation order in your locale settings. For example, punctuation and whitespace characters -are considered less significant for sorting: +might be considered less significant for sorting: \(sort '\("11" "12" "1 1" "1 2" "1.1" "1.2") 'string-collate-lessp) => \("11" "1 1" "1.1" "12" "1 2" "1.2") @@ -358,11 +358,15 @@ The optional argument LOCALE, a string, overrides the setting of your current locale identifier for collation. The value is system dependent; a LOCALE \"en_US.UTF-8\" is applicable on POSIX systems, -while it would be \"English_USA.1252\" on MS Windows systems. +while it would be, e.g., \"enu_USA.1252\" on MS-Windows systems. If IGNORE-CASE is non-nil, characters are converted to lower-case before comparing them. +To emulate Unicode-compliant collation on MS-Windows systems, +bind `w32-collate-ignore-punctuation' to a non-nil value, since +the codeset part of the locale cannot be \"UTF-8\" on MS-Windows. + If your system does not support a locale environment, this function behaves like `string-lessp'. */) (Lisp_Object s1, Lisp_Object s2, Lisp_Object locale, Lisp_Object ignore_case) @@ -391,8 +395,8 @@ This function obeys the conventions for collation order in your locale settings. For example, characters with different coding points but -the same meaning are considered as equal, like different grave accent -unicode characters: +the same meaning might be considered as equal, like different grave +accent Unicode characters: \(string-collate-equalp \(string ?\\uFF40) \(string ?\\u1FEF)) => t @@ -400,13 +404,20 @@ The optional argument LOCALE, a string, overrides the setting of your current locale identifier for collation. The value is system dependent; a LOCALE \"en_US.UTF-8\" is applicable on POSIX systems, -while it would be \"English_USA.1252\" on MS Windows systems. +while it would be \"enu_USA.1252\" on MS Windows systems. If IGNORE-CASE is non-nil, characters are converted to lower-case before comparing them. +To emulate Unicode-compliant collation on MS-Windows systems, +bind `w32-collate-ignore-punctuation' to a non-nil value, since +the codeset part of the locale cannot be \"UTF-8\" on MS-Windows. + If your system does not support a locale environment, this function -behaves like `string-equal'. */) +behaves like `string-equal'. + +Do NOT use this function to compare file names for equality, only +for sorting them. */) (Lisp_Object s1, Lisp_Object s2, Lisp_Object locale, Lisp_Object ignore_case) { #if defined __STDC_ISO_10646__ || defined WINDOWSNT === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-29 18:29:30 +0000 +++ src/sysdep.c 2014-08-29 19:18:06 +0000 @@ -3796,6 +3796,6 @@ char *loc = STRINGP (locale) ? SSDATA (locale) : NULL; - return w32_compare_strings (SDATA (s1), SDATA (s2), loc); + return w32_compare_strings (SDATA (s1), SDATA (s2), loc, !NILP (ignore_case)); } #endif /* WINDOWSNT */ === modified file 'src/w32.h' --- src/w32.h 2014-08-25 15:55:46 +0000 +++ src/w32.h 2014-08-29 19:18:06 +0000 @@ -211,7 +211,7 @@ unsigned long long *, unsigned long long *); /* Compare 2 UTF-8 strings in locale-dependent fashion. */ -extern int w32_compare_strings (const char *, const char *, char *); +extern int w32_compare_strings (const char *, const char *, char *, int); #ifdef HAVE_GNUTLS #include === modified file 'src/w32proc.c' --- src/w32proc.c 2014-08-29 18:30:24 +0000 +++ src/w32proc.c 2014-08-29 19:18:06 +0000 @@ -3213,15 +3213,20 @@ #ifndef _NSLCMPERROR # define _NSLCMPERROR INT_MAX #endif +#ifndef LINGUISTIC_IGNORECASE +# define LINGUISTIC_IGNORECASE 0x00000010 +#endif int -w32_compare_strings (const char *s1, const char *s2, char *locname) +w32_compare_strings (const char *s1, const char *s2, char *locname, + int ignore_case) { LCID lcid = GetThreadLocale (); wchar_t *string1_w, *string2_w; int val, needed; extern BOOL g_b_init_compare_string_w; static int (WINAPI *pCompareStringW)(LCID, DWORD, LPCWSTR, int, LPCWSTR, int); + DWORD flags = 0; USE_SAFE_ALLOCA; @@ -3284,11 +3289,22 @@ lcid = new_lcid; } - /* FIXME: Need a way to control the FLAGS argument, perhaps via the - CODESET part of LOCNAME. In particular, ls-lisp will want - NORM_IGNORESYMBOLS and sometimes LINGUISTIC_IGNORECASE or - NORM_IGNORECASE. */ - val = pCompareStringW (lcid, 0, string1_w, -1, string2_w, -1); + if (ignore_case) + { + /* NORM_IGNORECASE ignores any tertiary distinction, not just + case variants. LINGUISTIC_IGNORECASE is more selective, and + is sensitive to the locale's language, but it is not + available before Vista. */ + if (w32_major_version >= 6) + flags |= LINGUISTIC_IGNORECASE; + else + flags |= NORM_IGNORECASE; + } + /* This approximates what glibc collation functions do when the + locale's codeset is UTF-8. */ + if (!NILP (Vw32_collate_ignore_punctuation)) + flags |= NORM_IGNORESYMBOLS; + val = pCompareStringW (lcid, flags, string1_w, -1, string2_w, -1); SAFE_FREE (); if (!val) { @@ -3408,6 +3424,20 @@ where the performance impact may be noticeable even on modern hardware. */); Vw32_get_true_file_attributes = Qlocal; + DEFVAR_LISP ("w32-collate-ignore-punctuation", + Vw32_collate_ignore_punctuation, + doc: /* Non-nil causes string collation functions ignore punctuation on MS-Windows. +On Posix platforms, `string-collate-lessp' and `string-collate-equalp' +ignore punctuation characters when they compare strings, if the +locale's codeset is UTF-8, as in \"en_US.UTF-8\". Binding this option +to a non-nil value will achieve a similar effect on MS-Windows, where +locales with UTF-8 codeset are not supported. + +Note that setting this to non-nil will also ignore blanks and symbols +in the strings. So do NOT use this option when comparing file names +for equality, only when you need to sort them. */); + Vw32_collate_ignore_punctuation = Qnil; + staticpro (&Vw32_valid_locale_ids); staticpro (&Vw32_valid_codepages); } ------------------------------------------------------------ revno: 117774 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2014-08-29 21:30:24 +0300 message: Revert a change inadvertently committed in last commit. diff: === modified file 'src/w32proc.c' --- src/w32proc.c 2014-08-29 18:29:30 +0000 +++ src/w32proc.c 2014-08-29 18:30:24 +0000 @@ -3288,7 +3288,7 @@ CODESET part of LOCNAME. In particular, ls-lisp will want NORM_IGNORESYMBOLS and sometimes LINGUISTIC_IGNORECASE or NORM_IGNORECASE. */ - val = pCompareStringW (lcid, NORM_IGNORESYMBOLS, string1_w, -1, string2_w, -1); + val = pCompareStringW (lcid, 0, string1_w, -1, string2_w, -1); SAFE_FREE (); if (!val) { ------------------------------------------------------------ revno: 117773 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2014-08-29 21:29:30 +0300 message: src/sysdep.c (str_collate) [WINDOWSNT]: Fix a typo in r117771. diff: === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-29 17:57:36 +0000 +++ src/sysdep.c 2014-08-29 18:29:30 +0000 @@ -3791,7 +3791,8 @@ #ifdef WINDOWSNT int str_collate (Lisp_Object s1, Lisp_Object s2, -{ Lisp_Object locale, Lisp_Object ignore_case) + Lisp_Object locale, Lisp_Object ignore_case) +{ char *loc = STRINGP (locale) ? SSDATA (locale) : NULL; === modified file 'src/w32proc.c' --- src/w32proc.c 2014-08-25 15:55:46 +0000 +++ src/w32proc.c 2014-08-29 18:29:30 +0000 @@ -3288,7 +3288,7 @@ CODESET part of LOCNAME. In particular, ls-lisp will want NORM_IGNORESYMBOLS and sometimes LINGUISTIC_IGNORECASE or NORM_IGNORECASE. */ - val = pCompareStringW (lcid, 0, string1_w, -1, string2_w, -1); + val = pCompareStringW (lcid, NORM_IGNORESYMBOLS, string1_w, -1, string2_w, -1); SAFE_FREE (); if (!val) { ------------------------------------------------------------ revno: 117772 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-08-29 20:10:15 +0200 message: * authors.el (authors): Use LOCALE argument of `string-collate-lessp'. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-08-29 07:05:23 +0000 +++ admin/ChangeLog 2014-08-29 18:10:15 +0000 @@ -1,3 +1,7 @@ +2014-08-29 Michael Albinus + + * authors.el (authors): Use LOCALE argument of `string-collate-lessp'. + 2014-08-28 Michael Albinus * authors.el (authors-aliases): Addition. === modified file 'admin/authors.el' --- admin/authors.el 2014-08-28 01:59:29 +0000 +++ admin/authors.el 2014-08-29 18:10:15 +0000 @@ -1313,11 +1313,9 @@ (let (authors-author-list) (maphash #'authors-add-to-author-list table) (setq authors-author-list - (let ((process-environment (cons "LC_COLLATE=en_US.UTF-8" - process-environment))) - (sort authors-author-list - (lambda (a b) - (string-collate-lessp (car a) (car b)))))) + (sort authors-author-list + (lambda (a b) + (string-collate-lessp (car a) (car b) "en_US.UTF-8")))) (dolist (a authors-author-list) (let ((author (car a)) (wrote (nth 1 a)) ------------------------------------------------------------ revno: 117771 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-08-29 19:57:36 +0200 message: Add optional arguments LOCALE and IGNORE-CASE to collation functions. * fns.c (Fstring_collate_lessp, Fstring_collate_equalp): Add optional arguments LOCALE and IGNORE-CASE. * lisp.h (str_collate): Adapt argument list. * sysdep.c (LC_CTYPE, LC_CTYPE_MASK, towlower_l): Define substitutes for platforms that lack them. (str_collate): Add arguments locale and ignore_case. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-29 16:28:53 +0000 +++ src/ChangeLog 2014-08-29 17:57:36 +0000 @@ -1,3 +1,14 @@ +2014-08-29 Michael Albinus + + * sysdep.c (LC_CTYPE, LC_CTYPE_MASK, towlower_l): + Define substitutes for platforms that lack them. + (str_collate): Add arguments locale and ignore_case. + + * fns.c (Fstring_collate_lessp, Fstring_collate_equalp): + Add optional arguments LOCALE and IGNORE-CASE. + + * lisp.h (str_collate): Adapt argument list. + 2014-08-29 Dmitry Antipov Add vectors support to Fsort. === modified file 'src/fns.c' --- src/fns.c 2014-08-29 16:21:30 +0000 +++ src/fns.c 2014-08-29 17:57:36 +0000 @@ -344,25 +344,28 @@ return i1 < SCHARS (s2) ? Qt : Qnil; } -DEFUN ("string-collate-lessp", Fstring_collate_lessp, Sstring_collate_lessp, 2, 2, 0, +DEFUN ("string-collate-lessp", Fstring_collate_lessp, Sstring_collate_lessp, 2, 4, 0, doc: /* Return t if first arg string is less than second in collation order. - -Case is significant. Symbols are also allowed; their print names are -used instead. +Symbols are also allowed; their print names are used instead. This function obeys the conventions for collation order in your locale settings. For example, punctuation and whitespace characters -are considered less significant for sorting. +are considered less significant for sorting: \(sort '\("11" "12" "1 1" "1 2" "1.1" "1.2") 'string-collate-lessp) => \("11" "1 1" "1.1" "12" "1 2" "1.2") +The optional argument LOCALE, a string, overrides the setting of your +current locale identifier for collation. The value is system +dependent; a LOCALE \"en_US.UTF-8\" is applicable on POSIX systems, +while it would be \"English_USA.1252\" on MS Windows systems. + +If IGNORE-CASE is non-nil, characters are converted to lower-case +before comparing them. + If your system does not support a locale environment, this function -behaves like `string-lessp'. - -If the environment variable \"LC_COLLATE\" is set in `process-environment', -it overrides the setting of your current locale. */) - (Lisp_Object s1, Lisp_Object s2) +behaves like `string-lessp'. */) + (Lisp_Object s1, Lisp_Object s2, Lisp_Object locale, Lisp_Object ignore_case) { #if defined __STDC_ISO_10646__ || defined WINDOWSNT /* Check parameters. */ @@ -372,34 +375,39 @@ s2 = SYMBOL_NAME (s2); CHECK_STRING (s1); CHECK_STRING (s2); + if (!NILP (locale)) + CHECK_STRING (locale); - return (str_collate (s1, s2) < 0) ? Qt : Qnil; + return (str_collate (s1, s2, locale, ignore_case) < 0) ? Qt : Qnil; #else /* !__STDC_ISO_10646__, !WINDOWSNT */ return Fstring_lessp (s1, s2); #endif /* !__STDC_ISO_10646__, !WINDOWSNT */ } -DEFUN ("string-collate-equalp", Fstring_collate_equalp, Sstring_collate_equalp, 2, 2, 0, +DEFUN ("string-collate-equalp", Fstring_collate_equalp, Sstring_collate_equalp, 2, 4, 0, doc: /* Return t if two strings have identical contents. - -Case is significant. Symbols are also allowed; their print names are -used instead. +Symbols are also allowed; their print names are used instead. This function obeys the conventions for collation order in your locale settings. For example, characters with different coding points but the same meaning are considered as equal, like different grave accent -unicode characters. +unicode characters: \(string-collate-equalp \(string ?\\uFF40) \(string ?\\u1FEF)) => t +The optional argument LOCALE, a string, overrides the setting of your +current locale identifier for collation. The value is system +dependent; a LOCALE \"en_US.UTF-8\" is applicable on POSIX systems, +while it would be \"English_USA.1252\" on MS Windows systems. + +If IGNORE-CASE is non-nil, characters are converted to lower-case +before comparing them. + If your system does not support a locale environment, this function -behaves like `string-equal'. - -If the environment variable \"LC_COLLATE\" is set in `process-environment', -it overrides the setting of your current locale. */) - (Lisp_Object s1, Lisp_Object s2) +behaves like `string-equal'. */) + (Lisp_Object s1, Lisp_Object s2, Lisp_Object locale, Lisp_Object ignore_case) { #if defined __STDC_ISO_10646__ || defined WINDOWSNT /* Check parameters. */ @@ -409,8 +417,10 @@ s2 = SYMBOL_NAME (s2); CHECK_STRING (s1); CHECK_STRING (s2); + if (!NILP (locale)) + CHECK_STRING (locale); - return (str_collate (s1, s2) == 0) ? Qt : Qnil; + return (str_collate (s1, s2, locale, ignore_case) == 0) ? Qt : Qnil; #else /* !__STDC_ISO_10646__, !WINDOWSNT */ return Fstring_equal (s1, s2); === modified file 'src/lisp.h' --- src/lisp.h 2014-08-29 07:29:47 +0000 +++ src/lisp.h 2014-08-29 17:57:36 +0000 @@ -4301,7 +4301,7 @@ extern void unlock_file (Lisp_Object); extern void unlock_buffer (struct buffer *); extern void syms_of_filelock (void); -extern int str_collate (Lisp_Object, Lisp_Object); +extern int str_collate (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); /* Defined in sound.c. */ extern void syms_of_sound (void); === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-28 14:48:02 +0000 +++ src/sysdep.c 2014-08-29 17:57:36 +0000 @@ -3605,6 +3605,7 @@ #ifdef __STDC_ISO_10646__ # include +# include # if defined HAVE_NEWLOCALE || defined HAVE_SETLOCALE # include @@ -3615,15 +3616,24 @@ # ifndef LC_COLLATE_MASK # define LC_COLLATE_MASK 0 # endif +# ifndef LC_CTYPE +# define LC_CTYPE 0 +# endif +# ifndef LC_CTYPE_MASK +# define LC_CTYPE_MASK 0 +# endif + # ifndef HAVE_NEWLOCALE # undef freelocale # undef locale_t # undef newlocale # undef wcscoll_l +# undef towlower_l # define freelocale emacs_freelocale # define locale_t emacs_locale_t # define newlocale emacs_newlocale # define wcscoll_l emacs_wcscoll_l +# define towlower_l emacs_towlower_l typedef char const *locale_t; @@ -3683,15 +3693,37 @@ errno = err; return result; } + +static wint_t +towlower_l (wint_t wc, locale_t loc) +{ + wint_t result = wc; + char *oldloc = emacs_setlocale (LC_CTYPE, NULL); + + if (oldloc) + { + USE_SAFE_ALLOCA; + char *oldcopy = SAFE_ALLOCA (strlen (oldloc) + 1); + strcpy (oldcopy, oldloc); + if (emacs_setlocale (LC_CTYPE, loc)) + { + result = towlower (wc); + emacs_setlocale (LC_COLLATE, oldcopy); + } + SAFE_FREE (); + } + + return result; +} # endif int -str_collate (Lisp_Object s1, Lisp_Object s2) +str_collate (Lisp_Object s1, Lisp_Object s2, + Lisp_Object locale, Lisp_Object ignore_case) { int res, err; ptrdiff_t len, i, i_byte; wchar_t *p1, *p2; - Lisp_Object lc_collate; USE_SAFE_ALLOCA; @@ -3708,22 +3740,43 @@ FETCH_STRING_CHAR_ADVANCE (*(p2+i-1), s2, i, i_byte); *(p2+len) = 0; - lc_collate = - Fgetenv_internal (build_string ("LC_COLLATE"), Vprocess_environment); - - if (STRINGP (lc_collate)) + if (STRINGP (locale)) { - locale_t loc = newlocale (LC_COLLATE_MASK, SSDATA (lc_collate), 0); + locale_t loc = newlocale (LC_COLLATE_MASK | LC_CTYPE_MASK, + SSDATA (locale), 0); if (!loc) error ("Wrong locale: %s", strerror (errno)); errno = 0; - res = wcscoll_l (p1, p2, loc); + + if (! NILP (ignore_case)) + for (int i = 1; i < 3; i++) + { + wchar_t *p = (i == 1) ? p1 : p2; + for (; *p; p++) + { + *p = towlower_l (*p, loc); + if (errno) + break; + } + if (errno) + break; + } + + if (! errno) + res = wcscoll_l (p1, p2, loc); err = errno; freelocale (loc); } else { errno = 0; + if (! NILP (ignore_case)) + for (int i = 1; i < 3; i++) + { + wchar_t *p = (i == 1) ? p1 : p2; + for (; *p; p++) + *p = towlower (*p); + } res = wcscoll (p1, p2); err = errno; } @@ -3733,15 +3786,14 @@ SAFE_FREE (); return res; } -#endif /* __STDC_ISO_10646__ */ +#endif /* __STDC_ISO_10646__ */ #ifdef WINDOWSNT int -str_collate (Lisp_Object s1, Lisp_Object s2) -{ - Lisp_Object lc_collate = - Fgetenv_internal (build_string ("LC_COLLATE"), Vprocess_environment); - char *loc = STRINGP (lc_collate) ? SSDATA (lc_collate) : NULL; +str_collate (Lisp_Object s1, Lisp_Object s2, +{ Lisp_Object locale, Lisp_Object ignore_case) + + char *loc = STRINGP (locale) ? SSDATA (locale) : NULL; return w32_compare_strings (SDATA (s1), SDATA (s2), loc); } ------------------------------------------------------------ revno: 117770 committer: Dmitry Antipov branch nick: trunk timestamp: Fri 2014-08-29 20:28:53 +0400 message: Fix ChangeLog entry. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-29 16:21:30 +0000 +++ src/ChangeLog 2014-08-29 16:28:53 +0000 @@ -9,7 +9,7 @@ * lisp.h (enum Lisp_Save_Type): New member SAVE_TYPE_INT_OBJ. (make_save_int_obj): Add prototype. - Fix last change to support Darwin/OSX (Bug#18354). + Fix last change to support Darwin/OSX and FreeBSD (Bug#18354). * sysdep.c (sort_vector_compare) [DARWIN_OS || __FreeBSD__]: Conditionally define to match system's qsort_r signature. (sort_vector) [DARWIN_OS || __FreeBSD__]: Likewise in call to qsort_r. ------------------------------------------------------------ revno: 117769 committer: Dmitry Antipov branch nick: trunk timestamp: Fri 2014-08-29 20:21:30 +0400 message: Fix last change to support Darwin/OSX (Bug#18354). * sysdep.c (sort_vector_compare) [DARWIN_OS || __FreeBSD__]: Conditionally define to match system's qsort_r signature. (sort_vector) [DARWIN_OS || __FreeBSD__]: Likewise in call to qsort_r. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-29 07:29:47 +0000 +++ src/ChangeLog 2014-08-29 16:21:30 +0000 @@ -9,6 +9,11 @@ * lisp.h (enum Lisp_Save_Type): New member SAVE_TYPE_INT_OBJ. (make_save_int_obj): Add prototype. + Fix last change to support Darwin/OSX (Bug#18354). + * sysdep.c (sort_vector_compare) [DARWIN_OS || __FreeBSD__]: + Conditionally define to match system's qsort_r signature. + (sort_vector) [DARWIN_OS || __FreeBSD__]: Likewise in call to qsort_r. + 2014-08-28 Ken Brown Add support for HYBRID_MALLOC, allowing the use of gmalloc before === modified file 'src/fns.c' --- src/fns.c 2014-08-29 11:02:56 +0000 +++ src/fns.c 2014-08-29 16:21:30 +0000 @@ -1876,7 +1876,8 @@ return merge (front, back, predicate); } -/* Using GNU qsort_r, we can pass this as a parameter. */ +/* Using GNU qsort_r, we can pass this as a parameter. This also + exists on FreeBSD and Darwin/OSX, but with a different signature. */ #ifndef HAVE_QSORT_R static Lisp_Object sort_vector_predicate; #endif @@ -1885,16 +1886,22 @@ static int #ifdef HAVE_QSORT_R +#if defined (DARWIN_OS) || defined (__FreeBSD__) +sort_vector_compare (void *arg, const void *p, const void *q) +#elif defined (GNU_LINUX) sort_vector_compare (const void *p, const void *q, void *arg) -#else +#else /* neither darwin/bsd nor gnu/linux */ +#error "check how qsort_r comparison function works on your platform" +#endif /* DARWIN_OS || __FreeBSD__ */ +#else /* not HAVE_QSORT_R */ sort_vector_compare (const void *p, const void *q) -#endif /* HAVE_QSORT_R */ +#endif /* HAVE_QSORT_R */ { bool more, less; Lisp_Object op, oq, vp, vq; #ifdef HAVE_QSORT_R Lisp_Object sort_vector_predicate = *(Lisp_Object *) arg; -#endif +#endif op = *(Lisp_Object *) p; oq = *(Lisp_Object *) q; @@ -1928,8 +1935,14 @@ /* Setup predicate and sort. */ #ifdef HAVE_QSORT_R +#if defined (DARWIN_OS) || defined (__FreeBSD__) + qsort_r (v, len, word_size, (void *) &predicate, sort_vector_compare); +#elif defined (GNU_LINUX) qsort_r (v, len, word_size, sort_vector_compare, (void *) &predicate); -#else +#else /* neither darwin/bsd nor gnu/linux */ +#error "check how qsort_r works on your platform" +#endif /* DARWIN_OS || __FreeBSD__ */ +#else /* not HAVE_QSORT_R */ sort_vector_predicate = predicate; qsort (v, len, word_size, sort_vector_compare); #endif /* HAVE_QSORT_R */ ------------------------------------------------------------ revno: 117768 committer: Dmitry Antipov branch nick: trunk timestamp: Fri 2014-08-29 16:23:30 +0400 message: * NEWS: Mention that `sort' can handle vectors. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-08-28 01:59:29 +0000 +++ etc/ChangeLog 2014-08-29 12:23:30 +0000 @@ -1,3 +1,7 @@ +2014-08-29 Dmitry Antipov + + * NEWS: Mention that `sort' can handle vectors. + 2014-08-28 Glenn Morris * emacs.appdata.xml: New file; description from Emacs's homepage. === modified file 'etc/NEWS' --- etc/NEWS 2014-08-25 15:55:46 +0000 +++ etc/NEWS 2014-08-29 12:23:30 +0000 @@ -205,6 +205,8 @@ ** Functions `rmail-delete-forward' and `rmail-delete-backward' take an optional repeat-count argument. +** Function `sort' can deal with vectors. + --- ** New utilities in subr-x.el: *** New macros `if-let' and `when-let' allow defining bindings and to ------------------------------------------------------------ revno: 117767 committer: Dmitry Antipov branch nick: trunk timestamp: Fri 2014-08-29 15:02:56 +0400 message: * doc/lispref/lists.texi (Functions that Rearrange Lists): Remove description of sort ... * doc/lispref/sequences.texi (Sequence Functions): ... and generalize it for sequences. Add an example. * src/fns.c (Fsort): Use more natural Qsequencep error. * test/automated/fns-tests.el (fns-tests-sort): Minor style rewrite. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-08-28 01:59:29 +0000 +++ doc/lispref/ChangeLog 2014-08-29 11:02:56 +0000 @@ -1,3 +1,10 @@ +2014-08-29 Dmitry Antipov + + * lists.texi (Functions that Rearrange Lists): Remove + description of sort ... + * sequences.texi (Sequence Functions): ... and generalize + it for sequences. Add an example. + 2014-08-28 Eli Zaretskii * display.texi (Bidirectional Display): Update the Emacs's class === modified file 'doc/lispref/lists.texi' --- doc/lispref/lists.texi 2014-05-15 14:59:02 +0000 +++ doc/lispref/lists.texi 2014-08-29 11:02:56 +0000 @@ -1124,74 +1124,6 @@ @end smallexample @end defun -@defun sort list predicate -@cindex stable sort -@cindex sorting lists -This function sorts @var{list} stably, though destructively, and -returns the sorted list. It compares elements using @var{predicate}. A -stable sort is one in which elements with equal sort keys maintain their -relative order before and after the sort. Stability is important when -successive sorts are used to order elements according to different -criteria. - -The argument @var{predicate} must be a function that accepts two -arguments. It is called with two elements of @var{list}. To get an -increasing order sort, the @var{predicate} should return non-@code{nil} if the -first element is ``less than'' the second, or @code{nil} if not. - -The comparison function @var{predicate} must give reliable results for -any given pair of arguments, at least within a single call to -@code{sort}. It must be @dfn{antisymmetric}; that is, if @var{a} is -less than @var{b}, @var{b} must not be less than @var{a}. It must be -@dfn{transitive}---that is, if @var{a} is less than @var{b}, and @var{b} -is less than @var{c}, then @var{a} must be less than @var{c}. If you -use a comparison function which does not meet these requirements, the -result of @code{sort} is unpredictable. - -The destructive aspect of @code{sort} is that it rearranges the cons -cells forming @var{list} by changing @sc{cdr}s. A nondestructive sort -function would create new cons cells to store the elements in their -sorted order. If you wish to make a sorted copy without destroying the -original, copy it first with @code{copy-sequence} and then sort. - -Sorting does not change the @sc{car}s of the cons cells in @var{list}; -the cons cell that originally contained the element @code{a} in -@var{list} still has @code{a} in its @sc{car} after sorting, but it now -appears in a different position in the list due to the change of -@sc{cdr}s. For example: - -@example -@group -(setq nums '(1 3 2 6 5 4 0)) - @result{} (1 3 2 6 5 4 0) -@end group -@group -(sort nums '<) - @result{} (0 1 2 3 4 5 6) -@end group -@group -nums - @result{} (1 2 3 4 5 6) -@end group -@end example - -@noindent -@strong{Warning}: Note that the list in @code{nums} no longer contains -0; this is the same cons cell that it was before, but it is no longer -the first one in the list. Don't assume a variable that formerly held -the argument now holds the entire sorted list! Instead, save the result -of @code{sort} and use that. Most often we store the result back into -the variable that held the original list: - -@example -(setq nums (sort nums '<)) -@end example - -@xref{Sorting}, for more functions that perform sorting. -See @code{documentation} in @ref{Accessing Documentation}, for a -useful example of @code{sort}. -@end defun - @node Sets And Lists @section Using Lists as Sets @cindex lists as sets === modified file 'doc/lispref/sequences.texi' --- doc/lispref/sequences.texi 2014-06-08 23:41:43 +0000 +++ doc/lispref/sequences.texi 2014-08-29 11:02:56 +0000 @@ -327,6 +327,98 @@ @end defun +@defun sort sequence predicate +@cindex stable sort +@cindex sorting lists +@cindex sorting vectors +This function sorts @var{sequence} stably. Note that this function doesn't work +for all sequences; it may be used only for lists and vectors. If @var{sequence} +is a list, it is modified destructively. This functions returns the sorted +@var{sequence} and compares elements using @var{predicate}. A stable sort is +one in which elements with equal sort keys maintain their relative order before +and after the sort. Stability is important when successive sorts are used to +order elements according to different criteria. + +The argument @var{predicate} must be a function that accepts two +arguments. It is called with two elements of @var{sequence}. To get an +increasing order sort, the @var{predicate} should return non-@code{nil} if the +first element is ``less than'' the second, or @code{nil} if not. + +The comparison function @var{predicate} must give reliable results for +any given pair of arguments, at least within a single call to +@code{sort}. It must be @dfn{antisymmetric}; that is, if @var{a} is +less than @var{b}, @var{b} must not be less than @var{a}. It must be +@dfn{transitive}---that is, if @var{a} is less than @var{b}, and @var{b} +is less than @var{c}, then @var{a} must be less than @var{c}. If you +use a comparison function which does not meet these requirements, the +result of @code{sort} is unpredictable. + +The destructive aspect of @code{sort} for lists is that it rearranges the +cons cells forming @var{sequence} by changing @sc{cdr}s. A nondestructive +sort function would create new cons cells to store the elements in their +sorted order. If you wish to make a sorted copy without destroying the +original, copy it first with @code{copy-sequence} and then sort. + +Sorting does not change the @sc{car}s of the cons cells in @var{sequence}; +the cons cell that originally contained the element @code{a} in +@var{sequence} still has @code{a} in its @sc{car} after sorting, but it now +appears in a different position in the list due to the change of +@sc{cdr}s. For example: + +@example +@group +(setq nums '(1 3 2 6 5 4 0)) + @result{} (1 3 2 6 5 4 0) +@end group +@group +(sort nums '<) + @result{} (0 1 2 3 4 5 6) +@end group +@group +nums + @result{} (1 2 3 4 5 6) +@end group +@end example + +@noindent +@strong{Warning}: Note that the list in @code{nums} no longer contains +0; this is the same cons cell that it was before, but it is no longer +the first one in the list. Don't assume a variable that formerly held +the argument now holds the entire sorted list! Instead, save the result +of @code{sort} and use that. Most often we store the result back into +the variable that held the original list: + +@example +(setq nums (sort nums '<)) +@end example + +For the better understanding of what stable sort is, consider the following +vector example. After sorting, all items whose @code{car} is 8 are grouped +at the beginning of @code{vector}, but their relative order is preserved. +All items whose @code{car} is 9 are grouped at the end of @code{vector}, +but their relative order is also preserved: + +@example +@group +(setq + vector + (vector '(8 . "xxx") '(9 . "aaa") '(8 . "bbb") '(9 . "zzz") + '(9 . "ppp") '(8 . "ttt") '(8 . "eee") '(9 . "fff"))) + @result{} [(8 . "xxx") (9 . "aaa") (8 . "bbb") (9 . "zzz") + (9 . "ppp") (8 . "ttt") (8 . "eee") (9 . "fff")] +@end group +@group +(sort vector (lambda (x y) (< (car x) (car y)))) + @result{} [(8 . "xxx") (8 . "bbb") (8 . "ttt") (8 . "eee") + (9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")] +@end group +@end example + +@xref{Sorting}, for more functions that perform sorting. +See @code{documentation} in @ref{Accessing Documentation}, for a +useful example of @code{sort}. +@end defun + @node Arrays @section Arrays @cindex array === modified file 'src/fns.c' --- src/fns.c 2014-08-29 07:29:47 +0000 +++ src/fns.c 2014-08-29 11:02:56 +0000 @@ -1958,7 +1958,7 @@ else if (VECTORP (seq)) seq = sort_vector (seq, predicate); else if (!NILP (seq)) - wrong_type_argument (Qarrayp, seq); + wrong_type_argument (Qsequencep, seq); return seq; } === modified file 'test/automated/fns-tests.el' --- test/automated/fns-tests.el 2014-08-29 07:29:47 +0000 +++ test/automated/fns-tests.el 2014-08-29 11:02:56 +0000 @@ -113,8 +113,8 @@ (should (equal (sort (vector - (cons 8 "xxx") (cons 9 "aaa") (cons 8 "bbb") (cons 9 "zzz") - (cons 9 "ppp") (cons 8 "ttt") (cons 8 "eee") (cons 9 "fff")) + '(8 . "xxx") '(9 . "aaa") '(8 . "bbb") '(9 . "zzz") + '(9 . "ppp") '(8 . "ttt") '(8 . "eee") '(9 . "fff")) (lambda (x y) (< (car x) (car y)))) [(8 . "xxx") (8 . "bbb") (8 . "ttt") (8 . "eee") (9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")]))) ------------------------------------------------------------ revno: 117766 committer: martin rudalics branch nick: trunk timestamp: Fri 2014-08-29 12:39:17 +0200 message: Adjust display-buffer-at-bottom. * window.el (display-buffer-at-bottom): Prefer bottom-left window to other bottom windows. Reuse a bottom window if it shows the buffer already. Suggested by Juri Linkov in discussion of (Bug#18181). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-29 07:05:23 +0000 +++ lisp/ChangeLog 2014-08-29 10:39:17 +0000 @@ -1,3 +1,10 @@ +2014-08-29 Martin Rudalics + + * window.el (display-buffer-at-bottom): Prefer bottom-left + window to other bottom windows. Reuse a bottom window if it + shows the buffer already. Suggested by Juri Linkov + in discussion of (Bug#18181). + 2014-08-29 Leo Liu * files.el (minibuffer-with-setup-hook): Allow (:append FUN) to === modified file 'lisp/window.el' --- lisp/window.el 2014-08-21 08:40:29 +0000 +++ lisp/window.el 2014-08-29 10:39:17 +0000 @@ -6469,13 +6469,26 @@ (defun display-buffer-at-bottom (buffer alist) "Try displaying BUFFER in a window at the bottom of the selected frame. -This either splits the window at the bottom of the frame or the -frame's root window, or reuses an existing window at the bottom -of the selected frame." - (let (bottom-window window) +This either reuses such a window provided it shows BUFFER +already, splits a window at the bottom of the frame or the +frame's root window, or reuses some window at the bottom of the +selected frame." + (let (bottom-window bottom-window-shows-buffer window) (walk-window-tree - (lambda (window) (setq bottom-window window)) nil nil 'nomini) - (or (and (not (frame-parameter nil 'unsplittable)) + (lambda (window) + (cond + ((window-in-direction 'below window)) + ((and (not bottom-window-shows-buffer) + (eq buffer (window-buffer window))) + (setq bottom-window-shows-buffer t) + (setq bottom-window window)) + ((not bottom-window) + (setq bottom-window window))) + nil nil 'nomini)) + (or (and bottom-window-shows-buffer + (window--display-buffer + buffer bottom-window 'reuse alist display-buffer-mark-dedicated)) + (and (not (frame-parameter nil 'unsplittable)) (let (split-width-threshold) (setq window (window--try-to-split-window bottom-window alist))) (window--display-buffer ------------------------------------------------------------ revno: 117765 committer: Dmitry Antipov branch nick: trunk timestamp: Fri 2014-08-29 11:29:47 +0400 message: Add vectors support to Fsort. * configure.ac (AC_CHECK_FUNCS): Check for qsort_r. * src/fns.c (sort_vector, sort_vector_compare): New functions. (sort_list): Likewise, refactored out of ... (Fsort): ... adjusted user. Mention vectors in docstring. (sort_vector_predicate) [!HAVE_QSORT_R]: New variable. * src/alloc.c (make_save_int_obj): New function. * src/lisp.h (enum Lisp_Save_Type): New member SAVE_TYPE_INT_OBJ. (make_save_int_obj): Add prototype. * test/automated/fns-tests.el (fns-tests-sort): New test. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-28 14:48:02 +0000 +++ ChangeLog 2014-08-29 07:29:47 +0000 @@ -1,3 +1,7 @@ +2014-08-29 Dmitry Antipov + + * configure.ac (AC_CHECK_FUNCS): Check for qsort_r. + 2014-08-28 Ken Brown * configure.ac (HYBRID_MALLOC): New macro; define to use gmalloc === modified file 'configure.ac' --- configure.ac 2014-08-28 14:48:02 +0000 +++ configure.ac 2014-08-29 07:29:47 +0000 @@ -3573,7 +3573,7 @@ getrlimit setrlimit shutdown getaddrinfo \ pthread_sigmask strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ -gai_strerror sync \ +gai_strerror sync qsort_r \ getpwent endpwent getgrent endgrent \ cfmakeraw cfsetspeed copysign __executable_start log2) LIBS=$OLD_LIBS === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-28 18:33:18 +0000 +++ src/ChangeLog 2014-08-29 07:29:47 +0000 @@ -1,3 +1,14 @@ +2014-08-29 Dmitry Antipov + + Add vectors support to Fsort. + * fns.c (sort_vector, sort_vector_compare): New functions. + (sort_list): Likewise, refactored out of ... + (Fsort): ... adjusted user. Mention vectors in docstring. + (sort_vector_predicate) [!HAVE_QSORT_R]: New variable. + * alloc.c (make_save_int_obj): New function. + * lisp.h (enum Lisp_Save_Type): New member SAVE_TYPE_INT_OBJ. + (make_save_int_obj): Add prototype. + 2014-08-28 Ken Brown Add support for HYBRID_MALLOC, allowing the use of gmalloc before === modified file 'src/alloc.c' --- src/alloc.c 2014-08-28 14:48:02 +0000 +++ src/alloc.c 2014-08-29 07:29:47 +0000 @@ -3610,6 +3610,17 @@ return val; } +Lisp_Object +make_save_int_obj (ptrdiff_t a, Lisp_Object b) +{ + Lisp_Object val = allocate_misc (Lisp_Misc_Save_Value); + struct Lisp_Save_Value *p = XSAVE_VALUE (val); + p->save_type = SAVE_TYPE_INT_OBJ; + p->data[0].integer = a; + p->data[1].object = b; + return val; +} + #if ! (defined USE_X_TOOLKIT || defined USE_GTK) Lisp_Object make_save_ptr_ptr (void *a, void *b) === modified file 'src/fns.c' --- src/fns.c 2014-08-25 15:55:46 +0000 +++ src/fns.c 2014-08-29 07:29:47 +0000 @@ -1846,13 +1846,12 @@ wrong_type_argument (Qsequencep, seq); return new; } - -DEFUN ("sort", Fsort, Ssort, 2, 2, 0, - doc: /* Sort LIST, stably, comparing elements using PREDICATE. -Returns the sorted list. LIST is modified by side effects. -PREDICATE is called with two elements of LIST, and should return non-nil -if the first element should sort before the second. */) - (Lisp_Object list, Lisp_Object predicate) + +/* Sort LIST using PREDICATE, preserving original order of elements + considered as equal. */ + +static Lisp_Object +sort_list (Lisp_Object list, Lisp_Object predicate) { Lisp_Object front, back; register Lisp_Object len, tem; @@ -1877,6 +1876,92 @@ return merge (front, back, predicate); } +/* Using GNU qsort_r, we can pass this as a parameter. */ +#ifndef HAVE_QSORT_R +static Lisp_Object sort_vector_predicate; +#endif + +/* Comparison function called by qsort. */ + +static int +#ifdef HAVE_QSORT_R +sort_vector_compare (const void *p, const void *q, void *arg) +#else +sort_vector_compare (const void *p, const void *q) +#endif /* HAVE_QSORT_R */ +{ + bool more, less; + Lisp_Object op, oq, vp, vq; +#ifdef HAVE_QSORT_R + Lisp_Object sort_vector_predicate = *(Lisp_Object *) arg; +#endif + + op = *(Lisp_Object *) p; + oq = *(Lisp_Object *) q; + vp = XSAVE_OBJECT (op, 1); + vq = XSAVE_OBJECT (oq, 1); + + /* Use recorded element index as a secondary key to + preserve original order. Pretty ugly but works. */ + more = NILP (call2 (sort_vector_predicate, vp, vq)); + less = NILP (call2 (sort_vector_predicate, vq, vp)); + return ((more && !less) ? 1 + : ((!more && less) ? -1 + : XSAVE_INTEGER (op, 0) - XSAVE_INTEGER (oq, 0))); +} + +/* Sort VECTOR using PREDICATE, preserving original order of elements + considered as equal. */ + +static Lisp_Object +sort_vector (Lisp_Object vector, Lisp_Object predicate) +{ + ptrdiff_t i; + EMACS_INT len = ASIZE (vector); + Lisp_Object *v = XVECTOR (vector)->contents; + + if (len < 2) + return vector; + /* Record original index of each element to make qsort stable. */ + for (i = 0; i < len; i++) + v[i] = make_save_int_obj (i, v[i]); + + /* Setup predicate and sort. */ +#ifdef HAVE_QSORT_R + qsort_r (v, len, word_size, sort_vector_compare, (void *) &predicate); +#else + sort_vector_predicate = predicate; + qsort (v, len, word_size, sort_vector_compare); +#endif /* HAVE_QSORT_R */ + + /* Discard indexes and restore original elements. */ + for (i = 0; i < len; i++) + { + Lisp_Object save = v[i]; + /* Use explicit free to offload GC. */ + v[i] = XSAVE_OBJECT (save, 1); + free_misc (save); + } + return vector; +} + +DEFUN ("sort", Fsort, Ssort, 2, 2, 0, + doc: /* Sort SEQ, stably, comparing elements using PREDICATE. +Returns the sorted sequence. SEQ should be a list or vector. +If SEQ is a list, it is modified by side effects. PREDICATE +is called with two elements of SEQ, and should return non-nil +if the first element should sort before the second. */) + (Lisp_Object seq, Lisp_Object predicate) +{ + if (CONSP (seq)) + seq = sort_list (seq, predicate); + else if (VECTORP (seq)) + seq = sort_vector (seq, predicate); + else if (!NILP (seq)) + wrong_type_argument (Qarrayp, seq); + return seq; +} + Lisp_Object merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred) { === modified file 'src/lisp.h' --- src/lisp.h 2014-08-28 14:48:02 +0000 +++ src/lisp.h 2014-08-29 07:29:47 +0000 @@ -1989,6 +1989,7 @@ SAVE_TYPE_OBJ_OBJ_OBJ_OBJ = SAVE_OBJECT + (SAVE_TYPE_OBJ_OBJ_OBJ << SAVE_SLOT_BITS), SAVE_TYPE_PTR_INT = SAVE_POINTER + (SAVE_INTEGER << SAVE_SLOT_BITS), + SAVE_TYPE_INT_OBJ = SAVE_INTEGER + (SAVE_OBJECT << SAVE_SLOT_BITS), SAVE_TYPE_PTR_OBJ = SAVE_POINTER + (SAVE_OBJECT << SAVE_SLOT_BITS), SAVE_TYPE_PTR_PTR = SAVE_POINTER + (SAVE_POINTER << SAVE_SLOT_BITS), SAVE_TYPE_FUNCPTR_PTR_OBJ @@ -3773,6 +3774,7 @@ extern Lisp_Object make_save_ptr (void *); extern Lisp_Object make_save_ptr_int (void *, ptrdiff_t); extern Lisp_Object make_save_ptr_ptr (void *, void *); +extern Lisp_Object make_save_int_obj (ptrdiff_t, Lisp_Object); extern Lisp_Object make_save_funcptr_ptr_obj (void (*) (void), void *, Lisp_Object); extern Lisp_Object make_save_memory (Lisp_Object *, ptrdiff_t); === modified file 'test/ChangeLog' --- test/ChangeLog 2014-08-28 01:59:29 +0000 +++ test/ChangeLog 2014-08-29 07:29:47 +0000 @@ -1,3 +1,7 @@ +2014-08-29 Dmitry Antipov + + * automated/fns-tests.el (fns-tests-sort): New test. + 2014-08-28 Glenn Morris * automated/python-tests.el (python-shell-calculate-exec-path-2): === modified file 'test/automated/fns-tests.el' --- test/automated/fns-tests.el 2014-08-02 20:22:31 +0000 +++ test/automated/fns-tests.el 2014-08-29 07:29:47 +0000 @@ -100,3 +100,21 @@ (should (compare-strings "こんにちはｺﾝﾆﾁﾊ" nil nil "こんにちはｺﾝﾆﾁﾊ" nil nil)) (should (= (compare-strings "んにちはｺﾝﾆﾁﾊこ" nil nil "こんにちはｺﾝﾆﾁﾊ" nil nil) 1)) (should (= (compare-strings "こんにちはｺﾝﾆﾁﾊ" nil nil "んにちはｺﾝﾆﾁﾊこ" nil nil) -1))) + +(ert-deftest fns-tests-sort () + (should (equal (sort '(9 5 2 -1 5 3 8 7 4) (lambda (x y) (< x y))) + '(-1 2 3 4 5 5 7 8 9))) + (should (equal (sort '(9 5 2 -1 5 3 8 7 4) (lambda (x y) (> x y))) + '(9 8 7 5 5 4 3 2 -1))) + (should (equal (sort '[9 5 2 -1 5 3 8 7 4] (lambda (x y) (< x y))) + [-1 2 3 4 5 5 7 8 9])) + (should (equal (sort '[9 5 2 -1 5 3 8 7 4] (lambda (x y) (> x y))) + [9 8 7 5 5 4 3 2 -1])) + (should (equal + (sort + (vector + (cons 8 "xxx") (cons 9 "aaa") (cons 8 "bbb") (cons 9 "zzz") + (cons 9 "ppp") (cons 8 "ttt") (cons 8 "eee") (cons 9 "fff")) + (lambda (x y) (< (car x) (car y)))) + [(8 . "xxx") (8 . "bbb") (8 . "ttt") (8 . "eee") + (9 . "aaa") (9 . "zzz") (9 . "ppp") (9 . "fff")]))) ------------------------------------------------------------ revno: 117764 committer: Michael Albinus branch nick: trunk timestamp: Fri 2014-08-29 09:05:23 +0200 message: Move an entry where it belongs to. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-08-26 17:58:06 +0000 +++ admin/ChangeLog 2014-08-29 07:05:23 +0000 @@ -1,3 +1,7 @@ +2014-08-28 Michael Albinus + + * authors.el (authors-aliases): Addition. + 2014-08-26 Glenn Morris * authors.el (authors-ignored-files, authors-valid-file-names) === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-29 02:48:17 +0000 +++ lisp/ChangeLog 2014-08-29 07:05:23 +0000 @@ -30,8 +30,6 @@ 2014-08-28 Michael Albinus - * emacs-lisp/authors.el (authors-aliases): Addition. - * net/tramp-adb.el: Spell author name correctly. 2014-08-28 João Távora ------------------------------------------------------------ revno: 117763 fixes bug: http://debbugs.gnu.org/18341 committer: Leo Liu branch nick: trunk timestamp: Fri 2014-08-29 10:48:17 +0800 message: * files.el (minibuffer-with-setup-hook): Allow (:append FUN) to append to minibuffer-setup-hook. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-28 20:37:13 +0000 +++ lisp/ChangeLog 2014-08-29 02:48:17 +0000 @@ -1,3 +1,8 @@ +2014-08-29 Leo Liu + + * files.el (minibuffer-with-setup-hook): Allow (:append FUN) to + append to minibuffer-setup-hook. (Bug#18341) + 2014-08-28 Stefan Monnier * progmodes/cc-defs.el: Expose c-lanf-defconst's expressions to the === modified file 'lisp/files.el' --- lisp/files.el 2014-08-12 02:35:24 +0000 +++ lisp/files.el 2014-08-29 02:48:17 +0000 @@ -1375,6 +1375,9 @@ (defmacro minibuffer-with-setup-hook (fun &rest body) "Temporarily add FUN to `minibuffer-setup-hook' while executing BODY. +FUN can also be (:append FUN1), in which case FUN1 is appended to +`minibuffer-setup-hook'. + BODY should use the minibuffer at most once. Recursive uses of the minibuffer are unaffected (FUN is not called additional times). @@ -1383,20 +1386,23 @@ rather than FUN itself, to `minibuffer-setup-hook'." (declare (indent 1) (debug t)) (let ((hook (make-symbol "setup-hook")) - (funsym (make-symbol "fun"))) + (funsym (make-symbol "fun")) + (append nil)) + (when (eq (car-safe fun) :append) + (setq append '(t) fun (cadr fun))) `(let ((,funsym ,fun) ,hook) (setq ,hook - (lambda () - ;; Clear out this hook so it does not interfere - ;; with any recursive minibuffer usage. - (remove-hook 'minibuffer-setup-hook ,hook) - (funcall ,funsym))) + (lambda () + ;; Clear out this hook so it does not interfere + ;; with any recursive minibuffer usage. + (remove-hook 'minibuffer-setup-hook ,hook) + (funcall ,funsym))) (unwind-protect - (progn - (add-hook 'minibuffer-setup-hook ,hook) - ,@body) - (remove-hook 'minibuffer-setup-hook ,hook))))) + (progn + (add-hook 'minibuffer-setup-hook ,hook ,@append) + ,@body) + (remove-hook 'minibuffer-setup-hook ,hook))))) (defun find-file-read-args (prompt mustmatch) (list (read-file-name prompt nil default-directory mustmatch) ------------------------------------------------------------ revno: 117762 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-08-28 18:18:39 -0400 message: Misc accumulated ChangeLog convention fixes diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-08-07 11:49:36 +0000 +++ doc/emacs/ChangeLog 2014-08-28 22:18:39 +0000 @@ -10118,7 +10118,7 @@ * frames.texi (Dialog Boxes): Add use-file-dialog. -2003-11-22 Martin Stjernholm +2003-11-22 Martin Stjernholm * ack.texi: Note that Alan Mackenzie contributed the AWK support in CC Mode. === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-08-07 11:49:36 +0000 +++ doc/misc/ChangeLog 2014-08-28 22:18:39 +0000 @@ -264,14 +264,14 @@ 2014-03-23 Katsumi Yamaoka - * gnus.texi (MIME Commands): Mention - gnus-mime-buttonize-attachments-in-header and + * gnus.texi (MIME Commands): + Mention gnus-mime-buttonize-attachments-in-header and gnus-mime-display-attachment-buttons-in-header. 2014-03-23 Lars Ingebrigtsen - * message.texi (Forwarding): Mention - `message-forward-included-headers'. + * message.texi (Forwarding): + Mention `message-forward-included-headers'. 2014-03-23 Lars Ingebrigtsen @@ -8791,7 +8791,7 @@ * org.texi (Installation, Activation): Split from Installation and Activation. - (Clocking work time): Documented new features. + (Clocking work time): Document new features. 2006-08-13 Alex Schroeder @@ -9392,22 +9392,22 @@ * emacs-mime.texi (Flowed text): Add mm-fill-flowed. (Sync 2004-01-27 from the trunk). -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * cc-mode.texi: Rename c-hungry-backspace to c-hungry-delete-backwards, at the request of RMS. Leave the old name as an alias. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * cc-mode.texi: Correct the definition of c-beginning-of-defun, to include the function header within the defun. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * cc-mode.texi: Correct two typos. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * cc-mode.texi (Comment Commands): State that C-u M-; kills any existing comment. @@ -9721,7 +9721,7 @@ (MIME with Emacs mail packages): Delete section about the Emacs MIME FAQ (it's not reachable anymore). -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * cc-mode.texi: The manual has been extensively revised: the information about using CC Mode has been separated from the larger @@ -9949,7 +9949,7 @@ 2005-10-10 Carsten Dominik - * org.texi (Workflow states): Documented that change in keywords + * org.texi (Workflow states): Document that change in keywords becomes active only after restart of Emacs. 2005-10-08 Michael Albinus @@ -10824,7 +10824,7 @@ * Makefile.in (../info/tramp, tramp.dvi): Depend on trampver.texi. -2004-08-11 Martin Stjernholm +2004-08-11 Martin Stjernholm * cc-mode.texi: Various updates for CC Mode 5.30.9. @@ -11072,7 +11072,7 @@ * eshell.texi (Known Problems): Add doc item. -2003-11-22 Martin Stjernholm +2003-11-22 Martin Stjernholm * cc-mode.texi: Update for CC Mode 5.30. === modified file 'etc/NEWS.19' --- etc/NEWS.19 2014-03-22 23:47:20 +0000 +++ etc/NEWS.19 2014-08-28 22:18:39 +0000 @@ -477,7 +477,7 @@ this example: (add-hook 'emacs-lisp-mode-hook - '(lambda () (imenu-add-to-menubar "Index"))) + (lambda () (imenu-add-to-menubar "Index"))) ** Changes in BibTeX mode. === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2014-03-09 23:55:11 +0000 +++ lisp/ChangeLog.10 2014-08-28 22:18:39 +0000 @@ -1,4 +1,4 @@ -2003-07-03 Martin Stjernholm +2003-07-03 Martin Stjernholm * progmodes/cc-menus.el (cc-imenu-init): Do not set `imenu-create-index-function' if the second argument is left @@ -9,7 +9,7 @@ (c-lineup-arglist-close-under-paren): Fixes to cope with special brace lists in Pike. -2003-07-03 Alan Mackenzie +2003-07-03 Alan Mackenzie * progmodes/cc-mode.el (awk-mode): Call c-awk-after-change to ensure syntax-table props at loading. @@ -21,7 +21,7 @@ analyze AWK top-level forms properly (c-guess-basic-syntax CASE 5P), c-awk-backward-syntactic-ws. -2003-07-03 Martin Stjernholm +2003-07-03 Martin Stjernholm * progmodes/cc-fix.el: cc-mode-19.el has been renamed to progmodes/cc-fix.el since it now contains compatibility stuff @@ -59,7 +59,7 @@ * progmodes/cc-langs.el (comment-end): Put a space in front of the comment ender in C, as it was before the move from cc-mode.el. -2003-07-03 Alan Mackenzie +2003-07-03 Alan Mackenzie * progmodes/cc-fonts.el: Do not load progmodes/cc-awk.elc or awk-font-lock-keywords unless there is an AWK Mode buffer. @@ -72,7 +72,7 @@ * progmodes/cc-engine.el, progmodes/cc-fonts.el: Changes for the new AWK support. -2003-07-03 Martin Stjernholm +2003-07-03 Martin Stjernholm * progmodes/cc-engine.el, progmodes/cc-langs.el (c-decl-block-key, c-search-uplist-for-classkey): Check that @@ -940,8 +940,8 @@ This change is slightly incompatible. Although the calling convention for line-up functions is strictly extended, the format - of the `c-syntactic-context' variable has changed slightly. It's - believed that this incompatibility is minor, though; not a single + of the `c-syntactic-context' variable has changed slightly. + It's believed that this incompatibility is minor, though; not a single line-up function distributed with CC Mode needed to be changed, for instance. @@ -1612,7 +1612,7 @@ * dabbrev.el (dabbrev--goto-start-of-abbrev): Use minibuffer-prompt-end. - * comint.el (comint-move-point-for-output): Renamed from + * comint.el (comint-move-point-for-output): Rename from comint-scroll-to-bottom-on-output. Old name is alias. All uses changed. Doc fix. (comint-scroll-show-maximum-output): Doc fix. @@ -2918,7 +2918,7 @@ 2003-05-09 Sam Steingold - * pcvs.el (cvs-mode-find-file): Fixed the last patch's logic. + * pcvs.el (cvs-mode-find-file): Fix the last patch's logic. 2003-05-09 Stefan Monnier @@ -3253,7 +3253,7 @@ 2003-05-03 Richard M. Stallman - * emacs-lisp/autoload.el (update-directory-autoloads): Renamed from + * emacs-lisp/autoload.el (update-directory-autoloads): Rename from update-autoloads-from-directories. * progmodes/cperl-mode.el (cperl-nonoverridable-face): Doc fix. @@ -3792,7 +3792,7 @@ for both the argument and the value. * desktop.el (desktop-base-file-name): - Renamed from desktop-basefilename. Add defvaralias. + Rename from desktop-basefilename. Add defvaralias. 2003-04-14 John Paul Wallington @@ -3859,7 +3859,7 @@ (describe-minor-mode-completion-table-for-symbol): New functions. minor-mode-list is used here. (describe-minor-mode-from-symbol): - Renamed from (old) describe-minor-mode. + Rename from (old) describe-minor-mode. Use describe-minor-mode-completion-table-for-symbol. Don't use eval. Just use symbol-name. (describe-minor-mode-from-indicator): Document is updated. @@ -3929,7 +3929,7 @@ * international/mule.el: Don't set after-insert-file-adjust-coding-function. (after-insert-file-set-coding): - Renamed from after-insert-file-set-buffer-file-coding-system. + Rename from after-insert-file-set-buffer-file-coding-system. 2003-04-11 Kenichi Handa @@ -3952,13 +3952,13 @@ (quail-make-guidance-frame): Delete the arg BUF. Fix position calculation. Don't set the window buffer, just return the new frame. (quail-minibuffer-message): New function. - (quail-show-guidance): Renamed from quail-show-guidance-buf. + (quail-show-guidance): Rename from quail-show-guidance-buf. Use message and quail-minibuffer-message to display the guidance. - (quail-hide-guidance): Renamed from quail-hide-guidance-buf. + (quail-hide-guidance): Rename from quail-hide-guidance-buf. Only delete quail-guidance-frame. (quail-update-guidance): Just update quail-guidance-str, not display it. - (quail-get-translations): Renamed from quail-show-translations. + (quail-get-translations): Rename from quail-show-translations. Return a string instead of inserting it in quail-guidance-buf. 2003-04-11 Kenichi Handa @@ -3969,7 +3969,7 @@ 2003-04-10 Juanma Barranquero - * frame.el (modify-all-frames-parameters): Deleted. + * frame.el (modify-all-frames-parameters): Delete. 2003-04-10 Sebastian Tennant (tiny change) @@ -4071,7 +4071,7 @@ (utf-16-le-with-signature, utf-16-be-with-signature) (utf-16): Aliases of the above coding systems. -2003-04-08 Martin Stjernholm +2003-04-08 Martin Stjernholm * progmodes/cc-langs.el (c-symbol-key): Use POSIX char classes to match symbols. This makes CC Mode cope with the full range @@ -4146,7 +4146,7 @@ 2003-04-06 Masatake YAMATO - * progmodes/etags.el (tag-find-file-of-tag): Renamed from + * progmodes/etags.el (tag-find-file-of-tag): Rename from find-file-of-tag to avoid name space pollution. (tag-find-file-of-tag-noselect): Likewise. (etags-list-tags, etags-tags-apropos): @@ -4270,10 +4270,10 @@ 2003-04-02 Masatake YAMATO - * woman.el (woman-xref): Removed. + * woman.el (woman-xref): Remove. (woman-mode): Use `Man-highlight-references' instead of `WoMan-highlight-references'. - (WoMan-highlight-references): Removed. + (WoMan-highlight-references): Remove. * man.el (toplevel): Require button. (Man-header-file-path): New option. @@ -4285,7 +4285,7 @@ `button-buffer-map'. (Man-xref-man-page, Man-xref-header-file, Man-xref-normal-file): New buttons. `Man-xref-man-page' comes from woman.el. - (man-follow-mouse): Removed. + (man-follow-mouse): Remove. (Man-fontify-manpage): Use `Man-highlight-references' instead of calling `add-text-properties' directly. (Man-highlight-references, Man-highlight-references0): New functions. @@ -4525,7 +4525,7 @@ * net/net-utils.el (dns-lookup-host): New function. -2003-03-23 Martin Stjernholm +2003-03-23 Martin Stjernholm * progmodes/cc-mode.el (c-parse-state): Add kludge to avoid an infinite loop when Emacs' open-paren-in-column-zero rule @@ -5471,8 +5471,8 @@ * ffap.el: Many doc fixes. (ffap-replace-file-component): - Renamed from ffap-replace-path-component. Callers changed. - (ffap-host-to-filename): Renamed from ffap-host-to-path. Callers chgd. + Rename from ffap-replace-path-component. Callers changed. + (ffap-host-to-filename): Rename from ffap-host-to-path. Callers chgd. * international/iso-ascii.el (iso-ascii-display-table): New variable. (iso-ascii-standard-display-table): New variable. @@ -5801,13 +5801,13 @@ * language/ind-util.el (indian-itrans-v5-table): Add entries for "E" and "O". -2003-02-10 Martin Stjernholm +2003-02-10 Martin Stjernholm * progmodes/cc-styles.el (c-set-offset): Don't find a default syntactic element through syntactic analysis if called outside a CC Mode buffer. -2003-02-09 Martin Stjernholm +2003-02-09 Martin Stjernholm * progmodes/cc-mode.el (c-basic-common-init): Install `c-fill-paragraph' on `fill-paragraph-function'. @@ -5974,7 +5974,7 @@ * term.el (term-raw-map): Set it up at load time. (term-char-mode): Don't set up term-raw-map here. (term-set-escape-char): Don't set up C-x subcommand. - (term-ansi-face-already-done): Renamed from + (term-ansi-face-already-done): Rename from term-ansi-face-alredy-done. (term-command-hook): Avoid error if STRING is empty. (term, term-mode): Doc fixes. @@ -6134,7 +6134,7 @@ (antlr-slow-syntactic-context): Use cache. (antlr-slow-cache-enabling-symbol): New internal variable. (antlr-slow-cache-diff-threshold): New variable. - (antlr-fast-invalidate-context-cache): Renamed from + (antlr-fast-invalidate-context-cache): Rename from antlr-xemacs-bug-workaround. (antlr-imenu-create-index-function): Search from beginning. @@ -6152,13 +6152,13 @@ (antlr-simple-read-shell-command): Define. (antlr-simple-with-displaying-help-buffer): Define. (antlr-simple-scan-sexps, antlr-simple-scan-lists): - Renamed from antlr-scan-{sexps,lists}-internal. + Rename from antlr-scan-{sexps,lists}-internal. Changes from 2002-02-28: * progmodes/antlr-mode.el: Version 2.2 is released. - * progmodes/antlr-mode.el (antlr): Moved to SourceForge.net + * progmodes/antlr-mode.el (antlr): Move to SourceForge.net * progmodes/antlr-mode.el: Minor bug fixes: insert options and indentation. @@ -6284,7 +6284,7 @@ * ibuf-ext.el (ibuffer-yank-filter-group): Move check for empty `ibuffer-filter-group-kill-ring' out of `interactive' declaration. -2003-01-28 Martin Stjernholm +2003-01-28 Martin Stjernholm * progmodes/cc-vars.el, progmodes/cc-mode.el (c-require-final-newline): Made this variable an alist to @@ -6325,7 +6325,7 @@ * progmodes/ebrowse.el (ebrowse-draw-tree-fn): Likewise. -2003-01-26 Martin Stjernholm +2003-01-26 Martin Stjernholm * progmodes/cc-vars.el, progmodes/cc-mode.el (c-require-final-newline): Add a variable to make the @@ -6930,7 +6930,7 @@ 2003-01-08 Francesco Potortì - * mail/undigest.el (unforward-rmail-message): Simplified. + * mail/undigest.el (unforward-rmail-message): Simplify. No functional change. 2003-01-07 Markus Rost @@ -7354,7 +7354,7 @@ (makeinfo-compilation-sentinel-buffer, makeinfo-current-node): New functions. (makeinfo-compile): Add a sentinel parameter. - (makeinfo-compilation-sentinel-region): Renamed from + (makeinfo-compilation-sentinel-region): Rename from makeinfo-compilation-sentinel, and makeinfo-temp-file now never nil. (makeinfo-region): Use this. * info.el (Info-revert-find-node): New function. @@ -7412,7 +7412,7 @@ 2002-12-20 Francesco Potortì - * mail/undigest.el (rmail-mail-separator): Renamed from + * mail/undigest.el (rmail-mail-separator): Rename from rmail-digest-mail-separator. All users changed. (unforward-rmail-message): Rewritten to be more robust and to additionally account for the common style of forwarding messages @@ -7618,7 +7618,7 @@ 2002-12-10 Steven Tamm - * generic-x.el (javascript-generic-mode): Added C style block + * generic-x.el (javascript-generic-mode): Add C style block comments as used in ECMA-262 standard. 2002-12-10 Kenichi Handa @@ -8136,7 +8136,7 @@ * progmodes/sql.el: Added LINTER support. (sql-linter-program): New variable. (sql-linter-options): New variable. - (sql-mode-menu): Added Linter keywords. + (sql-mode-menu): Add Linter keywords. (sql-mode-linter-font-lock-keywords): New variable. (sql-highlight-linter-keywords): New function. (sql-linter): New function. @@ -8165,7 +8165,7 @@ 2002-11-20 Markus Rost - * Makefile.in (setwins_almost): Renamed from finder_setwins. + * Makefile.in (setwins_almost): Rename from finder_setwins. (custom-deps): Use it. (finder-data): Adjust to that name change. @@ -8317,10 +8317,10 @@ diary-entries-list. (diary-mode, fancy-diary-display-mode): New derived modes, for diary file and fancy diary buffer respectively. - (fancy-diary-font-lock-keywords, diary-font-lock-keywords): New - variables. - (font-lock-diary-sexps, font-lock-diary-date-forms): New - functions, used in diary-font-lock-keywords. + (fancy-diary-font-lock-keywords, diary-font-lock-keywords): + New variables. + (font-lock-diary-sexps, font-lock-diary-date-forms): + New functions, used in diary-font-lock-keywords. * calendar/calendar.el (diary-face): New. (european-calendar-display-form, describe-calendar-mode) @@ -8335,9 +8335,9 @@ * international/codepage.el (cp866-decode-table): Fix the translation table. -2002-11-16 Martin Stjernholm +2002-11-16 Martin Stjernholm - * progmodes/cc-bytecomp.el (cc-bytecomp-defun): Fixed bug that + * progmodes/cc-bytecomp.el (cc-bytecomp-defun): Fix bug that caused existing function definitions to be overridden by phonies when the bytecomp environment is restored. @@ -8390,7 +8390,7 @@ * files.el (mode-name): Mark it as risky-local-variable like the other mode-line elements (moved from bindings.el). - * bindings.el (mode-name): Moved mark as risky-local-variable to + * bindings.el (mode-name): Move mark as risky-local-variable to files.el. 2002-11-14 Juanma Barranquero @@ -8655,13 +8655,13 @@ don't defvar, and make permanent-local. (ucs-unify-8859, ucs-unify-8859, ucs-fragment-8859): Add/remove set-buffer-major-mode-hook, not quail-activate-hook. - (ucs-set-table-for-input): Renamed from ucs-quail-activate. + (ucs-set-table-for-input): Rename from ucs-quail-activate. (ucs-unify-8859, ucs-unify-8859, ucs-fragment-8859): Setup keyboard-translate-table, not translation-table-for-input. Modify set-buffer-major-mode-hook, not quail-activate-hook. (ucs-fragment-8859): Don't use translation-table-for-input coding system property. - (ucs-quail-activate): Deleted. + (ucs-quail-activate): Delete. (ucs-set-table-for-input): New. (ucs-minibuffer-setup): Use it. @@ -8691,7 +8691,7 @@ 2002-11-06 Kim F. Storm - * info.el (Info-fontify-node): Fixed hiding of *note references + * info.el (Info-fontify-node): Fix hiding of *note references with embedded file names like (xxx.yyy). Avoid making any lines visibly longer if hiding newlines inside note references by wrapping line after references if it contained @@ -8852,7 +8852,7 @@ 2002-10-29 Kim F. Storm - * ido.el (ido-wide-find-dirs-or-files): Fixed problem that caused + * ido.el (ido-wide-find-dirs-or-files): Fix problem that caused incomplete list of matches to be returned. 2002-10-29 Masayuki Ataka (tiny change) @@ -9119,21 +9119,21 @@ * international/mule-diag.el (non-iso-charset-alist): Add koi8-u. - * international/code-pages.el (cp-make-translation-table): Use - ucs-mule-to-mule-unicode. + * international/code-pages.el (cp-make-translation-table): + Use ucs-mule-to-mule-unicode. (cp-fix-safe-chars): Fix typo. (non-iso-charset-alist): Don't define. (cp-make-coding-system): Use utf-8-translation-table-for-decode. Define translation-table-for-input. (cp866): Reinstate. (alternativnj): Don't define alias. - (koi8-u): Deleted. + (koi8-u): Delete. * language/european.el ("Slovenian"): Use slovenian input-method. (encode-mac-roman): Use ucs-mule-to-mule-unicode. - * language/cyrillic.el (cyrillic-alternativnyj-decode-table): Fix - the table. + * language/cyrillic.el (cyrillic-alternativnyj-decode-table): + Fix the table. (cyrillic-alternativnyj): Don't give it `mime-charset' property. (cp866): Delete this alias. ("Bulgarian"): Fix the value of `input-method'. @@ -9162,8 +9162,8 @@ 2002-10-15 Kenichi Handa - * mail/sendmail.el (sendmail-send-it): Call - select-message-coding-system before changing the current buffer to + * mail/sendmail.el (sendmail-send-it): + Call select-message-coding-system before changing the current buffer to " sendmail temp". 2002-10-14 Andre Spiegel @@ -9171,7 +9171,7 @@ * files.el (insert-directory): Handle //SUBDIRED// lines in recursive listings from ls --dired. - * vc.el (vc-dired-reformat-line): Simplified. Handles text + * vc.el (vc-dired-reformat-line): Simplify. Handles text properties correctly now. 2002-10-14 Juanma Barranquero @@ -9208,7 +9208,7 @@ * ediff-init.el (ediff-frame-char-height): Use frame-selected-window. - * ediff-util.el (ediff-file-checked-in-p): Changed progn with and. + * ediff-util.el (ediff-file-checked-in-p): Change progn with and. * ediff-wind.el (ediff-skip-unsuitable-frames): Distinguish selected frame from frame of selected window. @@ -9341,7 +9341,7 @@ 2002-10-07 Kim F. Storm * emulation/cua-base.el (cua-normal-cursor-color): - Fixed initialization to make "Erase Customization" work. + Fix initialization to make "Erase Customization" work. 2002-10-07 Stefan Monnier @@ -9469,7 +9469,7 @@ (widget-editable-list-entry-create): Update caller. * wid-edit.el (widget-types-copy): New function. - (default): Added :copy keyword. + (default): Add :copy keyword. (menu-choice): Ditto. (checklist): Ditto. (radio-button-choice): Ditto. @@ -9580,17 +9580,17 @@ * international/utf-8.el (ucs-mule-to-mule-unicode): Don't define this translation-table name here. (utf-translation-table-for-encode): New translation-table name. - (utf-fragmentation-table): Renamed from utf-8-fragmentation-table. + (utf-fragmentation-table): Rename from utf-8-fragmentation-table. (utf-defragmentation-table): New variable. - (ucs-mule-cjk-to-unicode): Renamed from utf-8-subst-rev-table. + (ucs-mule-cjk-to-unicode): Rename from utf-8-subst-rev-table. (utf-subst-table-for-encode): New translation-table name. - (ucs-unicode-to-mule-cjk): Renamed from utf-8-subst-table. + (ucs-unicode-to-mule-cjk): Rename from utf-8-subst-table. (utf-subst-table-for-decode): New translation-table name. - (utf-fragment-on-decoding): Renamed from + (utf-fragment-on-decoding): Rename from utf-8-fragment-on-decoding. Correctly handle the case that unify-8859-on-encoding-mode is off. Handle mule-utf-16-le and mule-utf-16-be too. - (utf-translate-cjk): Renamed from utf-8-translate-cjk. + (utf-translate-cjk): Rename from utf-8-translate-cjk. Handle mule-utf-16-le and mule-utf-16-be too. (ccl-decode-mule-utf-8): Refer to utf-translation-table-for-decode and utf-subst-table-for-decode. @@ -10044,7 +10044,7 @@ (gamegrid-display-type): Use Emacs' standard `display-.*-p' functions to check for display capabilities. Fix the recognition of image-support in Emacs 21 by this way. - (gamegrid-hide-cursor): Removed. + (gamegrid-hide-cursor): Remove. (gamegrid-setup-default-font): Ported the code from XEmacs to Emacs: create a new face and assign the variable `gamegrid-face' to it. Make sure that the face is not higher than the smallest @@ -10234,7 +10234,7 @@ 2002-09-10 Michael Albinus - * net/tramp.el (tramp-handle-write-region): Added missing + * net/tramp.el (tramp-handle-write-region): Add missing `)'. Hope it's the right place. 2002-09-09 Kai Großjohann @@ -10246,7 +10246,7 @@ something harmless, but the /bin/sh will display a dollar sign which confused the subsequent prompt recognition. (tramp-multi-action-password): More debugging output. - (tramp-encoding-shell): Renamed from tramp-sh-program. + (tramp-encoding-shell): Rename from tramp-sh-program. More documentation. Default to cmd.exe on Windows NT. (tramp-encoding-command-switch): New variable. Use instead of hard-wired "-c" which is only good for /bin/sh. @@ -10286,7 +10286,7 @@ (tramp-completion-handle-file-name-all-completions): Change function call for user/host completion according to definition in `tramp-completion-function-alist'. - (tramp-parse-passwd): Added exception handling for "root", because + (tramp-parse-passwd): Add exception handling for "root", because `tramp-get-completion-su' (the previous place for this stuff) doesn't exist any longer. @@ -10375,7 +10375,7 @@ (tramp-multi-file-name-hop-structure-unified) (tramp-multi-file-name-hop-structure-separate) (tramp-make-multi-tramp-file-format-unified) - (tramp-make-multi-tramp-file-format-separate): Removed. + (tramp-make-multi-tramp-file-format-separate): Remove. (tramp-make-tramp-file-name): Allow partial tramp file names. Generate tramp file format on-the-fly depending on parameters. Apply atomar format strings resp expressions. @@ -10402,7 +10402,7 @@ (tramp-completion-file-name-handler-alist): Add handler for `file-exists-p. (tramp-completion-handle-file-exists-p): New function. - (tramp-completion-handle-file-name-completion): Simplified. + (tramp-completion-handle-file-name-completion): Simplify. (tramp-completion-dissect-file-name): Regexp's reorganized. (tramp-completion-handle-file-name-all-completions): Call completion-function only if `user' or `host' is given. @@ -10683,7 +10683,7 @@ * viper-util.el (viper-chars-in-region): Simplification. - * viper.el (viper-emacs-state-mode-list): Added modes. + * viper.el (viper-emacs-state-mode-list): Add modes. 2002-09-18 Jonathan Yavner @@ -10766,13 +10766,13 @@ (nonincremental-search-forward, nonincremental-re-search-forward) (nonincremental-search-backward, nonincremental-re-search-backward): Set menu-bar-last-search-type to string or regexp. - (nonincremental-repeat-re-search-forward): Removed. - (nonincremental-repeat-re-search-backward): Removed. + (nonincremental-repeat-re-search-forward): Remove. + (nonincremental-repeat-re-search-backward): Remove. (menu-bar-replace-menu): New keymap for "Edit->Replace" submenu. (menu-bar-i-search-menu): New keymap for "Incremental Search" submenu. - (menu-bar-adv-search-menu): Removed. + (menu-bar-adv-search-menu): Remove. (menu-bar-search-menu): Reorganized. - (menu-bar-edit-menu): Added "Replace" submenu. + (menu-bar-edit-menu): Add "Replace" submenu. 2002-09-15 Richard M. Stallman @@ -10917,7 +10917,7 @@ 2002-09-13 Kim F. Storm - * kmacro.el (kmacro-keymap): Changed bindings: + * kmacro.el (kmacro-keymap): Change bindings: C-x C-k s to kmacro-start-macro, C-x C-k b to kmacro-bind-to-key. 2002-09-12 Richard M. Stallman @@ -11033,7 +11033,7 @@ * loadup.el ("simple.el"): Move to after loaddefs.el. - * subr.el (define-mail-user-agent): Moved from simple.el. + * subr.el (define-mail-user-agent): Move from simple.el. 2002-09-10 Richard M. Stallman @@ -11051,11 +11051,11 @@ * international/ucs-tables.el: Bind utf-8-translation-table-for-decode when setting up tables and remove useless optimize-char-table. - (ucs-mule-to-mule-unicode): Deleted. + (ucs-mule-to-mule-unicode): Delete. (ucs-unify-8859): Maybe optimize ucs-mule-to-mule-unicode. * international/utf-16.el (utf-16-le-pre-write-conversion) - (utf-16-be-pre-write-conversion): Deleted. + (utf-16-be-pre-write-conversion): Delete. (mule-utf-16-le, mule-utf-16-be): Register encoding translation table. 2002-09-10 Richard M. Stallman @@ -11384,10 +11384,10 @@ * vc-hooks.el: Require vc.el at compile-time. (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): - Moved here from vc.el. + Move here from vc.el. * vc.el (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): - Moved to vc-hooks.el. + Move to vc-hooks.el. * vc-rcs.el (vc-rcs-state): Don't require vc.el. @@ -11540,7 +11540,7 @@ 2002-08-30 ARISAWA Akihiro (tiny change) - * ps-print.el (ps-lp-system): Fixed typo in `usg-unix-v'. + * ps-print.el (ps-lp-system): Fix typo in `usg-unix-v'. 2002-08-30 Markus Rost @@ -11660,7 +11660,7 @@ 2002-08-28 Juanma Barranquero - * replace.el (occur-hook): Renamed from `occur-mode-hook'. + * replace.el (occur-hook): Rename from `occur-mode-hook'. (occur-mode): Remove call to `occur-mode-hook'. (occur-rename-buffer): Fix reference to `occur-mode-hook' in docstring. (occur-1): Add call to `occur-hook'. @@ -11700,9 +11700,9 @@ (reftex-section-number): Better handling of parts: No chapter counter resets. - * textmodes/reftex.el (reftex-highlight-overlays): Added a third + * textmodes/reftex.el (reftex-highlight-overlays): Add a third overlay. - (reftex-mode-menu): Added entry for `reftex-toc-recenter. + (reftex-mode-menu): Add entry for `reftex-toc-recenter. Also moved `reftex-reset-mode' to top level. * textmodes/reftex-toc.el (reftex-toc-recenter): New command. @@ -11745,15 +11745,15 @@ 2002-08-25 Miles Bader * rfn-eshadow.el (file-name-shadow-properties-custom-type): - Renamed from `read-file-name-electric-shadow-properties-custom-type'. + Rename from `read-file-name-electric-shadow-properties-custom-type'. Change name of face. - (file-name-shadow-properties): Renamed from + (file-name-shadow-properties): Rename from `read-file-name-electric-shadow-properties'. - (file-name-shadow-tty-properties): Renamed from + (file-name-shadow-tty-properties): Rename from `read-file-name-electric-shadow-tty-properties'. - (file-name-shadow): Renamed from `read-file-name-electric-shadow'. + (file-name-shadow): Rename from `read-file-name-electric-shadow'. (rfn-eshadow-setup-minibuffer): Update references to renamed variables. - (file-name-shadow-mode): Renamed from + (file-name-shadow-mode): Rename from `read-file-name-electric-shadow-mode'. Update references to renamed variables. @@ -11797,7 +11797,7 @@ * files.el (ange-ftp-completion-hook-function): Add safe-magic prop. * subr.el (symbol-file-load-history-loaded) - (load-symbol-file-load-history): Deleted. + (load-symbol-file-load-history): Delete. (symbol-file): Don't call load-symbol-file-load-history. 2002-08-23 Andre Spiegel @@ -11859,18 +11859,18 @@ 2002-08-21 Kim F. Storm - * bindings.el (mode-line-format): Moved global-mode-string last. - (mode-line-position): Moved %p first. Added padding to %l/%c to + * bindings.el (mode-line-format): Move global-mode-string last. + (mode-line-position): Move %p first. Added padding to %l/%c to eliminate jumpiness in modeline. Use (%l,%c) format if both line-number-mode and column-number-mode are enabled. -2002-08-20 Martin Stjernholm +2002-08-20 Martin Stjernholm - * progmodes/cc-engine.el (c-forward-syntactic-ws): Fixed a bug + * progmodes/cc-engine.el (c-forward-syntactic-ws): Fix a bug that could cause an infinite loop if something that looks like a macro begins in the middle of a line. - * progmodes/cc-engine.el (c-parse-state): Fixed a bug that + * progmodes/cc-engine.el (c-parse-state): Fix a bug that could cause `c-state-cache' to contain two conses in sequence when there's an unbalanced open paren in a macro. @@ -11990,7 +11990,7 @@ 2002-08-15 Carsten Dominik - * textmodes/reftex.el (reftex-mode): Moved the creation of special + * textmodes/reftex.el (reftex-mode): Move the creation of special syntax tables to top-level. 2002-08-15 David Kastrup @@ -12094,7 +12094,7 @@ * international/mule-cmds.el (search-unencodable-char): New function. (select-safe-coding-system): Show unencodable characters. - (unencodable-char-position): Deleted, and implemented in C in coding.c. + (unencodable-char-position): Delete, and implemented in C in coding.c. 2002-04-09 John Wiegley @@ -12177,9 +12177,9 @@ 2002-08-05 Alan Shutko - * ibuffer.el (ibuffer-mode-map): Added ibuffer-filter-by-used-mode. - (ibuffer-mode-map): Added ibuffer-filter-by-used-mode. - (ibuffer-mode): Added ibuffer-filter-by-used-mode to doc string. + * ibuffer.el (ibuffer-mode-map): Add ibuffer-filter-by-used-mode. + (ibuffer-mode-map): Add ibuffer-filter-by-used-mode. + (ibuffer-mode): Add ibuffer-filter-by-used-mode to doc string. * ibuf-ext.el (ibuffer-list-buffer-modes): New. (ibuffer-filter-by-used-mode): New. @@ -12359,11 +12359,11 @@ 2002-07-31 Richard M. Stallman - * makefile.w32-in (compile-after-backup): Renamed from `compile'. + * makefile.w32-in (compile-after-backup): Rename from `compile'. Use `compile-always'. (bootstrap): Use `compile', not `compile-files'. Use `update-subdirs'. - (compile): Renamed from `compile-files'. - (compile-CMD, compile-SH): Renamed from `compile-files-*'. + (compile): Rename from `compile-files'. + (compile-CMD, compile-SH): Rename from `compile-files-*'. * emacs-lisp/bytecomp.el (byte-compile-find-cl-functions): Check that (car elt) is a string. @@ -12574,10 +12574,10 @@ 2002-07-25 Carsten Dominik * textmodes/reftex.el (reftex-compile-variables): - Simplified regular expression. + Simplify regular expression. * textmodes/reftex-parse.el (reftex-locate-bibliography-files): - Simplified the regexp. + Simplify the regexp. * textmodes/reftex-cite.el (reftex-get-bibkey-default): New function. (reftex-extract-bib-entries-from-thebibliography): @@ -12639,8 +12639,8 @@ * warnings.el (warning-levels): Add %s to the strings. (warning-group-format): New variable. - (warning-suppress-log-types): Renamed from warning-suppress-log. - (warning-suppress-types): Renamed from warning-suppress. + (warning-suppress-log-types): Rename from warning-suppress-log. + (warning-suppress-types): Rename from warning-suppress. (display-warning): Implement those changes. 2002-07-23 Richard M. Stallman @@ -12677,7 +12677,7 @@ (finder-inf.el): Remove. (update-authors): New target. (TAGS-LISP): Remove $(lispsource). - (compile-always): Renamed from `compile-files'. + (compile-always): Rename from `compile-files'. (compile): New target, adapted from `compile-files'. (compile-calc): New target. (recompile): Change `.' to $(lisp). @@ -12698,7 +12698,7 @@ * net/browse-url.el (browse-url-lynx-input-attempts): Use defcustom. (browse-url-lynx-input-delay): Add custom type and group. - * cus-start.el (double-click-fuzz): Added. + * cus-start.el (double-click-fuzz): Add. 2002-07-22 Alan Shutko @@ -12747,7 +12747,7 @@ (reftex-toc-split-windows-horizontally): New option. (reftex-toc-split-windows-horizontally-fraction): New option. (reftex-include-file-commands): New option. - (reftex-cite-format-builtin): Added ?n for nocite. + (reftex-cite-format-builtin): Add ?n for nocite. * textmodes/reftex-index.el (reftex-query-index-phrase): Use `reftex-index-verify-function'. @@ -12764,7 +12764,7 @@ * textmodes/reftex.el (reftex-compile-variables): Use `reftex-include-file-commands'. - (reftex-type-query-prompt): Changed defconst to defvar. + (reftex-type-query-prompt): Change defconst to defvar. (reftex-type-query-help, reftex-typekey-to-format-alist) (reftex-typekey-to-prefix-alist, reftex-env-or-mac-alist) (reftex-special-env-parsers, reftex-label-mac-list) @@ -12929,7 +12929,7 @@ (ucs-mule-to-mule-unicode): New. (ucs-unify-8859): Use utf-8-fragment-on-decoding, set up Quail translation. - (ucs-fragment-8859): Modified consistent with ucs-unify-8859. + (ucs-fragment-8859): Modify consistent with ucs-unify-8859. (unify-8859-on-encoding-mode): Doc mod. Fix custom version. (unify-8859-on-decoding-mode): Doc mod. Change code. Fix custom version. Add custom dependencies. @@ -13184,7 +13184,7 @@ 2002-07-13 Kim F. Storm - * progmodes/compile.el (grep-tree): Fixed autoload. + * progmodes/compile.el (grep-tree): Fix autoload. Corrected use of undefined variable `match-files-aliases'. 2002-07-12 Glenn Morris @@ -13263,7 +13263,7 @@ (tramp-handle-file-name-directory): Don't return "/" when completing a remote root directory (where the filename looks like "/method:user@host:/"). - (tramp-handle-ange-ftp): Deleted. + (tramp-handle-ange-ftp): Delete. (tramp-disable-ange-ftp): New function, called at toplevel, deletes Ange-FTP from file-name-handler-alist. (tramp-handle-make-symbolic-link): Implement. @@ -13357,7 +13357,7 @@ * files.el (after-find-file): Don't check for read-only status of files just created (and not yet saved on disk). - * ido.el (ido-completion-help): Changed XEmacs specific code to + * ido.el (ido-completion-help): Change XEmacs specific code to avoid byte compiler warning in GNU Emacs. (ido-set-matches1): Use regexp-quote instead of identity. (ido-complete-space): New function. @@ -13549,7 +13549,7 @@ (define-stroke, strokes-fix-button2-command, strokes-insinuated) (strokes-insinuate, global-set-stroke, describe-stroke) (load-user-strokes, save-strokes, strokes-bug-address) - (strokes-click-command): Deleted. + (strokes-click-command): Delete. (strokes-execute-stroke): Remove strokes-click-p case. (strokes-describe-stroke): Remove strokes-click-p stuff. (strokes-help): Fix. @@ -13868,7 +13868,7 @@ end-statement, specially with regards to nested subprograms. (comment-region advice): Initially disabled, for better compatibility with other modes. - (ada-fill-comment-paragraph): Fixed (no longer worked with Emacs 21). + (ada-fill-comment-paragraph): Fix (no longer worked with Emacs 21). * progmodes/ada-xref.el: Update copyright notice. (ada-xref-create-ali): The default is now not to create automatically @@ -13889,7 +13889,7 @@ (ada-find-references): New parameters arg and local-only. (ada-find-any-references): New parameters local-only and append. (ada-goto-declaration): Fix handling of predefined entities in xref. - (ada-get-all-references): Updated to the new xref format in GNAT 3.15, + (ada-get-all-references): Update to the new xref format in GNAT 3.15, still compatible with GNAT 3.14 of course. Fix various calls to count-lines, that didn't work correctly when the buffer was narrowed. @@ -13958,17 +13958,17 @@ * simple.el (what-cursor-position): Use describe-char. - * descr-text.el (describe-char): Moved from mule-diag.el, renamed + * descr-text.el (describe-char): Move from mule-diag.el, renamed from describe-char-after. Now calls describe-text-properties. - (describe-property-list): Renamed from describe-text-properties. - (describe-text-properties): Renamed from describe-text-at. + (describe-property-list): Rename from describe-text-properties. + (describe-text-properties): Rename from describe-text-at. New arg OUTPUT-BUFFER. (describe-text-properties-1): New subroutine, broken out from describe-text-properties. Output a newline before each section of the output. * international/mule-diag.el (describe-char-after): - Moved to descr-text.el. + Move to descr-text.el. 2002-06-17 Eli Zaretskii @@ -14143,9 +14143,9 @@ (eshell-sublist): Use copy-sequence. (eshell-copy-tree): Make it an alias for copy-tree. - * emacs-lisp/cl.el (copy-list): Moved back from subr.el. + * emacs-lisp/cl.el (copy-list): Move back from subr.el. - * subr.el (copy-list): Moved to cl.el. + * subr.el (copy-list): Move to cl.el. (copy-tree): Don't use copy-list or cl-pop. 2002-06-10 Miles Bader @@ -14189,7 +14189,7 @@ `tty-color-translate' and `tty-color-by-index'; this is now the main place to do it. -2002-06-09 Martin Stjernholm +2002-06-09 Martin Stjernholm * progmodes/cc-styles.el (c-set-style, c-set-style-1): Add another state for the `dont-override' flag where it only keeps @@ -14218,13 +14218,13 @@ 2002-06-08 Colin Walters - * subr.el (copy-list): Moved here from cl.el. - (copy-tree): Renamed here from `cl-copy-tree' in cl-extra.el. + * subr.el (copy-list): Move here from cl.el. + (copy-tree): Rename here from `cl-copy-tree' in cl-extra.el. - * emacs-lisp/cl-extra.el (cl-copy-tree): Moved to `copy-tree' in + * emacs-lisp/cl-extra.el (cl-copy-tree): Move to `copy-tree' in subr.el. Add a defalias with the old name. - * emacs-lisp/cl.el (copy-list): Moved to subr.el. + * emacs-lisp/cl.el (copy-list): Move to subr.el. * replace.el (occur-mode): Don't set up categories. Do set `font-lock-defaults', and be sure to set `font-lock-core-only'. @@ -14245,7 +14245,7 @@ (ibuffer-compile-format): Don't treat `name' category specially. (ibuffer-column name): Use `font-lock-face'. (filename-and-process): Ditto. - (ibuffer-buffer-name-category): Renamed to + (ibuffer-buffer-name-category): Rename to `ibuffer-buffer-name-face'. Don't use categories. (ibuffer-update-title-and-summary): Use `font-lock-face'. (ibuffer-insert-filter-group): Ditto. @@ -14374,15 +14374,15 @@ * subr.el (open-network-stream, open-network-stream-nowait) (open-network-stream-server, process-kill-without-query): - Moved from simple.el. + Move from simple.el. * simple.el (open-network-stream, open-network-stream-nowait) (open-network-stream-server, process-kill-without-query): - Moved to subr.el. + Move to subr.el. * simple.el (byte-compiling-files-p): Function deleted. - * textmodes/ispell.el (ispell-library-directory): Renamed from + * textmodes/ispell.el (ispell-library-directory): Rename from ispell-library-path. If Ispell is not installed, init to nil. (check-ispell-version): Doc fix. (ispell-menu-map): Get rid of byte-compiling-files-p hackery; @@ -14432,7 +14432,7 @@ * textmodes/sgml-mode.el (xml-mode): New alias for `sgml-mode'. - * emacs-lisp/bytecomp.el (byte-compile-last-line): Deleted. + * emacs-lisp/bytecomp.el (byte-compile-last-line): Delete. (byte-compile-delete-first): New function. (byte-compile-read-position): New variable. (byte-compile-last-position): New variable. @@ -14460,7 +14460,7 @@ 2002-05-27 Kim F. Storm - * simple.el (push-mark-command): Added optional NOMSG arg. + * simple.el (push-mark-command): Add optional NOMSG arg. * emulation/cua-base.el (cua-set-mark): Align pop to mark behavior with standard set-mark-command. @@ -14506,7 +14506,7 @@ * rot13.el (rot13-translate-table): New variable. (rot13, rot13-string, rot13-region): New functions. -2002-05-25 Martin Stjernholm +2002-05-25 Martin Stjernholm * progmodes/cc-engine.el (c-add-stmt-syntax): Fix some cases of wrong anchoring, e.g. for else-if compounds. @@ -14575,7 +14575,7 @@ (apropos-command, apropos, apropos-value, apropos-documentation): Allow keywords in addition to regexp. Added scoring. (apropos-documentation-check-doc-file) - (apropos-documentation-check-elc-file): Added scoring. + (apropos-documentation-check-elc-file): Add scoring. (apropos-print): Sort according to score. 2002-05-22 Colin Walters @@ -14660,8 +14660,8 @@ (ibuffer-compile-format): If the current column is a `name' column, figure out the appropriate category to put on it. (filename-and-process): Use category property. - (ibuffer-fontify-region-function): Deleted. - (ibuffer-unfontify-region-function): Deleted. + (ibuffer-fontify-region-function): Delete. + (ibuffer-unfontify-region-function): Delete. (ibuffer-update-title-and-summary): Use category properties. (ibuffer-insert-filter-group): Ditto. (ibuffer-mode): Set up category properties. @@ -14677,7 +14677,7 @@ * ibuffer.el (toplevel): Require font-lock, to get the face definitions. - (ibuffer-use-fontification): Deleted. + (ibuffer-use-fontification): Delete. (column filename-and-process): New column. (ibuffer-formats): Use it by default. (ibuffer-name-map, ibuffer-mode-name-map) @@ -15096,8 +15096,8 @@ * emacs-lisp/find-func.el (find-function-search-for-symbol): Add autoload cookie. - (find-function-regexp): Include - "\(quote " to match the defaliases in loaddefs.el. + (find-function-regexp): + Include "\(quote " to match the defaliases in loaddefs.el. * filesets.el (filesets-conditional-sort): Use copy-sequence, not copy-list. @@ -15287,7 +15287,7 @@ 2002-05-03 John Wiegley - * eshell/esh-var.el (eshell-modify-global-environment): Added this + * eshell/esh-var.el (eshell-modify-global-environment): Add this customization variable, which will cause any "export" commands within any eshell buffer to modify the global Emacs environment. It defaults to nil, which means that such commands will only @@ -15375,7 +15375,7 @@ * align.el (align-region): Fix the fix to align-region, because the "name" argument was appearing twice. -2002-05-01 Martin Stjernholm +2002-05-01 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-decl-1): Better way to handle protection labels, one which doesn't get confused by @@ -15465,7 +15465,7 @@ * subr.el (remove-yank-excluded-properties): New helper function. (insert-for-yank, insert-buffer-substring-as-yank): Use it. - * simple.el (yank-excluded-properties): Added help-echo to list. + * simple.el (yank-excluded-properties): Add help-echo to list. 2002-04-29 Glenn Morris @@ -15556,7 +15556,7 @@ not a list. * replace.el (occur-revert-arguments): - Renamed from occur-revert-properties. All uses changed. + Rename from occur-revert-properties. All uses changed. 2002-04-28 Pavel Janík @@ -15838,7 +15838,7 @@ (buffers-menu-show-status): New variables. (menu-bar-update-buffers-1): Use them. -2002-04-24 Martin Stjernholm +2002-04-24 Martin Stjernholm * progmodes/cc-cmds.el (c-mask-comment): More fixes when used from `c-do-auto-fill' and point is at or near the limit of the @@ -15863,19 +15863,19 @@ (occur-mode-display-occurrence): Handle buffer property. (list-matching-lines-face): Use defcustom. (list-matching-lines-buffer-name-face): New variable. - (occur-accumulate-lines): Renamed from `ibuffer-accumulate-lines', + (occur-accumulate-lines): Rename from `ibuffer-accumulate-lines', in ibuffer.el. (occur-read-primary-args): Move out of `occur'. (occur): Delete. Now simply call `occur-1'. (multi-occur, multi-occur-by-filename-regexp): New functions. (occur-1): New function. - (occur-engine): Renamed from `ibuffer-occur-engine' to replace the + (occur-engine): Rename from `ibuffer-occur-engine' to replace the previous implementation of `occur'; taken from ibuf-ext.el. (occur-fontify-on-property): New function. (occur-fontify-region-function, occur-unfontify-region-function): New functions. - * ibuffer.el (ibuffer-accumulate-lines): Moved to replace.el. + * ibuffer.el (ibuffer-accumulate-lines): Move to replace.el. * ibuf-ext.el (ibuffer-depropertize-string): Delete. (ibuffer-occur-match-face): Delete. @@ -15883,7 +15883,7 @@ (ibuffer-occur-mouse-display-occurence): Delete. (ibuffer-occur-goto-occurence, ibuffer-occur-display-occurence) (ibuffer-do-occur-1, ibuffer-occur-revert-buffer-function): Delete. - (ibuffer-occur-engine): Moved to replace.el. + (ibuffer-occur-engine): Move to replace.el. (ibuffer-do-occur): Simply call `occur-1'. * play/gamegrid.el (gamegrid-add-score-with-update-game-score): @@ -15921,9 +15921,9 @@ * dired.el (dired-mouse-find-file-other-window): Handle events that move out of the window. -2002-04-23 Martin Stjernholm +2002-04-23 Martin Stjernholm - * progmodes/cc-cmds.el (c-mask-comment): Fixed bug where point + * progmodes/cc-cmds.el (c-mask-comment): Fix bug where point was moved to the following line when it was at the first line of a block comment where comment-start-skip matched to eol. @@ -15948,13 +15948,13 @@ * diary-lib.el (include-other-diary-files): Allow modifying included buffer, to turn off selective display. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-mode.el (c-define-abbrev-table): New function to pass the SYSTEM-FLAG to `define-abbrev' in a way that works in emacsen that doesn't support it. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el, progmodes/cc-engine.el, * progmodes/cc-styles.el, progmodes/cc-vars.el @@ -15976,27 +15976,27 @@ (c-opt-asm-stmt-key): New language variable to recognize the beginning of asm statements. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-guess-basic-syntax): Detect variable declarations after class and struct declarations correctly. Fixed limit error when finding the anchor for template-args-cont and topmost-intro-cont. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-beginning-of-defun) (c-declaration-limits): Find the "line oriented" declaration start too, just like the "line oriented" end is found. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-vars.el (c-offsets-alist): A more sane default for `inexpr-statement'. This is not compatible, though. I think the benefit of a good default style outweights that in this case. Besides, `inexpr-statement' is not very common. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-delete-forward): Fix silly bug that caused it to delete backwards in hungry delete @@ -16013,7 +16013,7 @@ list initializers correctly (but costly; it ought to be integrated into `c-beginning-of-statement-1'). -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-engine.el (c-beginning-of-defun, c-end-of-defun, c-mark-function): @@ -16028,7 +16028,7 @@ handles declarations that continue after the block. * progmodes/cc-engine.el (c-syntactic-re-search-forward): - Added an option to restrict matching to the top level of the + Add an option to restrict matching to the top level of the current paren sexp. * progmodes/cc-langs.el (c-opt-block-decls-with-vars-key): @@ -16036,9 +16036,9 @@ (c-syntactic-eol): New regexp to match a "syntactic" eol. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed a bug + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix a bug that often caused the backward limit to be lost at the top level. This improves performance a bit. @@ -16052,12 +16052,12 @@ (c-beginning-of-decl-1): New function that put point at the beginning of the declaration. It handles K&R argdecl blocks. - (c-guess-basic-syntax): Replaced the `knr-argdecl' recognition + (c-guess-basic-syntax): Replace the `knr-argdecl' recognition code with one that doesn't depend on the current indentation. The anchor position for `knr-argdecl' has also changed, but in a way that is unlikely to cause compatibility problems. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-defs.el, progmodes/cc-engine.el (c-forward-comment): `forward-comment' in XEmacs skips over @@ -16069,19 +16069,19 @@ setup of the language specific variables. The regexp-opt mangling is also done at compile time now. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-line-or-region): Call `c-indent-line' directly instead of through `indent-according-to-mode' so that this function always indents syntactically. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed a bug + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix a bug where a class beginning with a nested class could cause an infinite loop (the state outside the narrowed out class is never used now). -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el, progmodes/cc-cmds.el, progmodes/cc-engine.el, progmodes/cc-vars.el: Fixes so that @@ -16102,7 +16102,7 @@ * progmodes/cc-align.el: Use the vector form in the return value in all cases where lineup functions return absolute columns. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-add-stmt-syntax) (c-guess-basic-syntax): Anchor `brace-list-intro' and @@ -16122,7 +16122,7 @@ (c-major-mode-is): Compare against the buffer local variable `c-buffer-is-cc-mode', which is faster than using `derived-mode-class'. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-forward-syntactic-ws) (c-backward-syntactic-ws, c-forward-token-1) @@ -16133,19 +16133,19 @@ That's signified by making their documentation into docstrings. (c-whack-state, c-hack-state, c-skip-case-statement-forward): - Removed these internal functions since they aren't used. + Remove these internal functions since they aren't used. (c-forward-to-cpp-expression): Classified this function as internal. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-langs.el (c-ObjC-class-key, c-Java-class-key): - Simplified these regexps; the class keywords they contain + Simplify these regexps; the class keywords they contain ought to be enough to avoid false matches, so checking for following identifiers etc is just unnecessary (and might also fail for oddly formatted code). -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el, progmodes/cc-cmds.el (c-forward-comment-lc): New function that behaves like @@ -16160,7 +16160,7 @@ normal label in a switch block as a case label, to get consistent lineup with the case labels. - * progmodes/cc-engine.el (c-backward-syntactic-ws): Fixed bug + * progmodes/cc-engine.el (c-backward-syntactic-ws): Fix bug in skipping over a macro that ends with an empty line. * progmodes/cc-styles.el: Require cc-align since styles added @@ -16168,7 +16168,7 @@ defined there, and so the `c-valid-offset' check might otherwise complain on them. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el, progmodes/cc-mode.el: * progmodes/cc-vars.el: Added two new lineup functions: @@ -16195,7 +16195,7 @@ * progmodes/cc-langs.el (c-symbol-key): Made this variable mode specific, to handle Pike special symbols like `== better. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-engine.el, progmodes/cc-vars.el (c-report-syntactic-errors): A new @@ -16203,13 +16203,13 @@ to off; since CC Mode ignores most syntactic errors it might as well ignore them all for the sake of consistency. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-looking-at-inexpr-block): Optimization. Can give a noticeable speedup if there's a large preceding function or class body. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el, progmodes/cc-cmds.el: Use more efficient and correct insertion functions in many places. @@ -16221,21 +16221,21 @@ * progmodes/cc-styles.el (c-read-offset): Unbind SPC in the completion to make it easier to enter lists. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm - * progmodes/cc-cmds.el (c-beginning-of-defun): Fixed bug where + * progmodes/cc-cmds.el (c-beginning-of-defun): Fix bug where c-state-cache was clobbered. * progmodes/cc-cmds.el, progmodes/cc-engine.el - (c-calculate-state): Moved from cc-cmds.el to cc-engine.el due + (c-calculate-state): Move from cc-cmds.el to cc-engine.el due to dependency. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-parse-state): Ignore unbalanced open parens in macros (if point isn't in the same one). -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-context-open-line): New function that is the `open-line' equivalent to `c-context-line-break'. @@ -16244,7 +16244,7 @@ for Emacs 21 since `indent-new-comment-line' has been changed to `comment-indent-new-line' there. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el, progmodes/cc-langs.el (c-stmt-delim-chars, c-stmt-delim-chars-with-comma): @@ -16257,7 +16257,7 @@ the set of statement delimiting characters, to allow it to be changed dynamically and per-mode. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-looking-at-bos) (c-looking-at-inexpr-block, c-add-stmt-syntax) @@ -16270,21 +16270,21 @@ Made arglist-cont anchor correctly in arglists that contain statements. * progmodes/cc-engine.el (c-guess-basic-syntax): - Fixed consistent anchoring of defun-block-intro in defuns in code + Fix consistent anchoring of defun-block-intro in defuns in code blocks (can only occur in Pike). * progmodes/cc-engine.el (c-looking-at-inexpr-block) - (c-looking-at-inexpr-block-backward): Changed the arguments to + (c-looking-at-inexpr-block-backward): Change the arguments to require containing sexps and paren state, for better efficiency. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-engine.el, progmodes/cc-vars.el: Improved anchoring of statement and handling of labels in front of substatements. (c-guess-continued-construct, c-guess-basic-syntax): - Improved and unified anchoring at statements. Statements beginning + Improve and unified anchoring at statements. Statements beginning with comments or labels are now avoided, by going out of blocks and containing statements if necessary. This nesting handling also fixes the case when there's a statement after a @@ -16293,7 +16293,7 @@ (c-electric-colon): Map the new `substatement-label' to `label' when consulting `c-hanging-colons-alist'. - (c-offsets-alist): Added substatement-label. Updated the + (c-offsets-alist): Add substatement-label. Updated the comments for the new anchoring positions at statements. * progmodes/cc-engine.el (c-guess-basic-syntax): Use more sane @@ -16302,7 +16302,7 @@ neutralized by a kludge in `c-get-syntactic-indentation' which ignored such anchor points. - (c-get-syntactic-indentation): Removed the kludge that was + (c-get-syntactic-indentation): Remove the kludge that was necessary due to buggy anchor points. * progmodes/cc-engine.el (c-guess-basic-syntax): Do not check @@ -16312,7 +16312,7 @@ recognized as normal arglist-cont if we're directly in a macro arglist, for consistency with other "bare" statements. - * progmodes/cc-engine.el (c-looking-at-bos): Added optional + * progmodes/cc-engine.el (c-looking-at-bos): Add optional limit arg for backward searches. * progmodes/cc-engine.el (c-looking-at-inexpr-block): @@ -16325,7 +16325,7 @@ in the list of syntactic symbols. Only the first is used as the base for the offset calculation. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-defun): Indent the current macro if inside one at the top level. Do not throw an error @@ -16340,7 +16340,7 @@ * progmodes/cc-engine.el (c-least-enclosing-brace): Rewritten to not be destructive. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-context-line-break): Only do a macro line break when point is inside the content of it; if it's in @@ -16349,21 +16349,21 @@ * progmodes/cc-engine.el (c-guess-basic-syntax): Do not add cpp-macro-cont inside the argument list to a #define. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-defs.el (c-forward-comment): Implemented a kludge to avoid the problem most forward-comment incarnations have with `\' together with comment parsing. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm - * progmodes/cc-engine.el (c-check-state-cache): Fixed bug + * progmodes/cc-engine.el (c-check-state-cache): Fix bug which could cause the state returned by `c-parse-state' to lack a closed paren element. That in turn could result in very long searches, since it's common that they start from the last preceding close brace. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-statement-1): Do not treat else-if as a single continuation, since that'd make it @@ -16373,7 +16373,7 @@ the starting if, but that doesn't affect the indentation for any reasonably sane style. Also introduced a noerror flag. - (c-beginning-of-closest-statement): Removed; + (c-beginning-of-closest-statement): Remove; c-beginning-of-statement-1 now avoids the problem this one solved. * progmodes/cc-engine.el (c-guess-continued-construct) @@ -16384,7 +16384,7 @@ before the start of the statement. * progmodes/cc-engine.el (c-looking-at-inexpr-block): - Added flag to disable looking at the type of the surrounding paren + Add flag to disable looking at the type of the surrounding paren since that confuses c-beginning-of-statement-1 and a couple of other places. @@ -16392,7 +16392,7 @@ Avoid stepping to the previous statement in case 18. Improvements in recognition of statement blocks on the top level. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-statement-1) (c-crosses-statement-barrier-p): Rewritten to get a well @@ -16400,7 +16400,7 @@ in recognition of do-while constructs. (c-backward-to-start-of-do, c-backward-to-start-of-if): - Removed; use c-beginning-of-statement-1 instead. + Remove; use c-beginning-of-statement-1 instead. (c-guess-continued-construct, c-guess-basic-syntax): Various fixes to not depend on the bugs previously in @@ -16408,20 +16408,20 @@ use the new behavior of c-beginning-of-statement-1 better. Fixed recognition of catch blocks inside macros. - * progmodes/cc-engine.el (c-backward-syntactic-ws): Fixed bug + * progmodes/cc-engine.el (c-backward-syntactic-ws): Fix bug in skipping over a macro. * progmodes/cc-langs.el (c-label-kwds): New variable to contain the appropriate c-*-label-kwds value. - * progmodes/cc-vars.el (defcustom-c-stylevar): Fixed value + * progmodes/cc-vars.el (defcustom-c-stylevar): Fix value evaluation bug that caused the widget for c-block-comment-prefix to bug out. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-guess-basic-syntax): - Improved recognition of statements: They are now recognized in + Improve recognition of statements: They are now recognized in contexts where they normally can't occur, e.g. on the top level or in function call arguments. This is mainly useful to recognize statements in macros at the top level, and in arguments to @@ -16444,7 +16444,7 @@ analysis in ObjC mode. * progmodes/cc-engine.el (c-beginning-of-statement-1): - Fixed bug in do-while statements where the body is not a block. + Fix bug in do-while statements where the body is not a block. * progmodes/cc-styles.el (c-set-style): Reset c-special-indent-hook to its global value if in override mode. @@ -16454,7 +16454,7 @@ * progmodes/cc-engine.el (c-evaluate-offset, c-get-offset): Use c-benign-error to report the c-strict-syntax-p error. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el, progmodes/cc-defs.el: * progmodes/cc-cmds.el, progmodes/cc-engine.el, progmodes/cc-vars.el: @@ -16469,7 +16469,7 @@ default. An extra flag argument is required to do that. (c-macro-start, c-query-macro-start) - (c-query-and-set-macro-start): Added a cache for the macro + (c-query-and-set-macro-start): Add a cache for the macro start position. (c-forward-syntactic-ws, c-backward-syntactic-ws): Fixes for @@ -16477,7 +16477,7 @@ in forward-comment in some emacsen when it hits a buffer limit with a large repeat count. - (c-lineup-macro-cont): Improved behavior when + (c-lineup-macro-cont): Improve behavior when c-syntactic-indentation-in-macros is nil. (c-syntactic-indentation-in-macros, c-backslash-max-column) @@ -16495,15 +16495,15 @@ (c-benign-error): New macro to report errors that doesn't need to interrupt the operation. - * progmodes/cc-defs.el (c-point): Added eonl and eopl positions. + * progmodes/cc-defs.el (c-point): Add eonl and eopl positions. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-brace, c-indent-region): - Removed most of the c-state-cache fiddling, since the global + Remove most of the c-state-cache fiddling, since the global state cache now handles this. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug when there's an open paren at the very first char of the visible buffer region. @@ -16515,7 +16515,7 @@ * progmodes/cc-engine.el (c-whack-state-after): Slight optimization. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el, progmodes/cc-langs.el, progmodes/cc-align.el: Improvements to syntactic analysis @@ -16524,7 +16524,7 @@ (c-block-stmt-1-kwds, c-block-stmt-2-kwds): New variables used by `c-guess-basic-syntax'. - (c-parse-state): Fixed bug with braces inside macros when + (c-parse-state): Fix bug with braces inside macros when using cached state info. (c-forward-to-cpp-expression): New function to aid in @@ -16542,7 +16542,7 @@ (c-offsets-alist): Made `c-lineup-macro-cont' the default for cpp-macro-cont. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-statement-1) (c-forward-syntactic-ws): Fixes to handle continued lines. @@ -16550,7 +16550,7 @@ (c-backward-to-start-of-if, c-guess-basic-syntax): Do syntactic analysis inside macros. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-region): Did a speedup made possible by the more flexible state cache. @@ -16558,22 +16558,22 @@ * progmodes/cc-engine.el (c-parse-state, c-whack-state-before) (c-whack-state-after, c-hack-state) (c-narrow-out-enclosing-class, c-guess-basic-syntax): - Improved the state cache system. It now can use partial info from + Improve the state cache system. It now can use partial info from an old cached state to calculate a new one at a different position. Removed some kludges to avoid the state cache. The new functions `c-whack-state-before' and `c-whack-state-after' replace the now obsolete `c-whack-state'. * progmodes/cc-engine.el (c-beginning-of-statement-1): - Optimized backing through a macro. This can speed things up + Optimize backing through a macro. This can speed things up quite a bit when there are long macros before point. (c-beginning-of-macro): Do not ignore the limit. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-continued-statement): - Fixed a bug where the keyword wasn't reindented correctly if + Fix a bug where the keyword wasn't reindented correctly if followed by another keyword or identifier. * progmodes/cc-engine.el (c-parse-state): Ignore closed brace @@ -16581,7 +16581,7 @@ second of two "do { } while (0)" macros after each other indented differently. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-macro) (c-forward-syntactic-ws): Recognize "#!" as a preprocessor @@ -16589,13 +16589,13 @@ interpreter lines like "#!/usr/bin/pike" at the beginning of the file. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-looking-at-inexpr-block): Recognize brace blocks inside a parenthesis expression as inexpr-statement. Useful when writing statements as macro arguments. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-fill-paragraph, c-do-auto-fill) (c-mask-comment): Broke out the comment masking code from @@ -16603,14 +16603,14 @@ able to do the same thing in `c-do-auto-fill'. This should make auto-fill-mode behave better. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-brace, c-electric-paren): Check `executing-macro' to avoid blinking parens when macros are executed. * progmodes/cc-mode.el, progmodes/cc-styles.el - (c-setup-filladapt): Moved from cc-mode.el to cc-styles.el for + (c-setup-filladapt): Move from cc-mode.el to cc-styles.el for consistency with `c-setup-paragraph-variables' (which was placed there due to the dependency from `c-set-style'). @@ -16619,14 +16619,14 @@ there already is a style called "user" defined when CC Mode starts up for the first time. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-vars.el - (c-comment-indent, c-indent-comment-alist): Added new variable + (c-comment-indent, c-indent-comment-alist): Add new variable `c-indent-comment-alist' to allow better control over `c-comment-indent'. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el (c-lineup-C-comments): Try to match both `comment-start-skip' and the comment prefix on the @@ -16636,29 +16636,29 @@ `comment-start-skip' match whatever `c-comment-prefix-regexp' matches. * progmodes/cc-mode.el, progmodes/cc-styles.el (c-common-init) - (c-set-style-1, c-setup-paragraph-variables): Moved the + (c-set-style-1, c-setup-paragraph-variables): Move the variable initialization based on `c-comment-prefix-regexp' to a new function `c-setup-paragraph-variables', which is now used both at mode init and when a style that sets `c-comment-prefix-regexp' is activated. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-member-init-list): Better handling of C++ template args to avoid confusion with `<' and `>' used as operators in member init expressions. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-most-enclosing-brace) - (c-least-enclosing-brace): Added optional second arg to limit + (c-least-enclosing-brace): Add optional second arg to limit the search to before a certain point. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug which + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug which could cause incorrect analysis if a cached state is used (usually only happens when an electric key reindents a line). -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-defs.el (c-forward-comment): More idiosyncrasy insulation. This time for XEmacs 21. @@ -16676,25 +16676,25 @@ the indentation of the current line. Switched places on cases 5D.3 and 5D.4 and made them use more syntactically correct methods. - (c-inher-key): Removed since the code in + (c-inher-key): Remove since the code in `c-guess-basic-syntax' now uses token-based search. * progmodes/cc-cmds.el, progmodes/cc-mode.el (c-mode-menu): - Added a submenu to access some toggles. + Add a submenu to access some toggles. (c-toggle-syntactic-indentation): New function to toggle the variable `c-syntactic-indentation'. - * progmodes/cc-styles.el (c-set-style): Improved the error + * progmodes/cc-styles.el (c-set-style): Improve the error message for incorrect offsets a bit. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-exp): Don't require that the sexp follows point immediately, instead find the closest following open paren that ends on another line. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el (c-lineup-cascaded-calls): New indentation function. @@ -16702,26 +16702,26 @@ * progmodes/cc-engine.el (c-beginning-of-macro): Bugfix for directives with whitespace between the '#' and the name. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-forward-syntactic-ws) (c-backward-syntactic-ws): Handle line continuations as whitespace. Don't move past a macro if that'd take us past the limit. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-macro) (c-forward-syntactic-ws): Multiline strings begin with `#"' in Pike, and that shouldn't be confused with a preprocessor directive. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el: Extended the kludge to interoperate with the delsel and pending-del packages wrt to the new function `c-electric-delete-forward'. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-exp): Keep the indentation of the block itself, i.e. only indent the contents in it. @@ -16730,38 +16730,38 @@ argument to completing-read instead of initial-contents, if the function is recent enough to support it. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-mode.el (c-mode-help-address): - Removed bug-gnu-emacs@gnu.org from the receiver list for bug reports. + Remove bug-gnu-emacs@gnu.org from the receiver list for bug reports. I've almost never seen a bug reported this way that should go to that list, but it's rather common that the reports concern the combination CC Mode and XEmacs instead. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm - * progmodes/cc-cmds.el (c-electric-paren): Fixed bug when both + * progmodes/cc-cmds.el (c-electric-paren): Fix bug when both brace-elseif-brace and brace-catch-brace are active and there's a "else if"-block before the catch block. * progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Detect function headers that span lines. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-brace) (c-electric-semi&comma, c-electric-colon, c-electric-paren): Check for last on line only for doing the auto-newline-mode stuff, not for the reindentation. - * progmodes/cc-cmds.el (c-electric-brace): Fixed bugs in the + * progmodes/cc-cmds.el (c-electric-brace): Fix bugs in the handling of c-syntactic-indentation: When it's nil, indent the new lines but don't reindent the current one. Reindent the line only when the inserted brace comes first on it, instead of last. * progmodes/cc-cmds.el (c-electric-brace) - (c-electric-semi&comma): Fixed two places where + (c-electric-semi&comma): Fix two places where c-syntactic-indentation wasn't heeded. * progmodes/cc-cmds.el (c-electric-pound): Don't be electric @@ -16772,7 +16772,7 @@ is found. Fixed case where an else following a do-while statement could be associated with an if inside the do-while. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-guess-fill-prefix): Tuned the dwim for the fallback to add a single space after the comment prefix. @@ -16781,15 +16781,15 @@ behavior in some special cases, especially for single-line comments. Avoid breaking up a comment starter or ender. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el (c-outline-level): Applied patch from the Emacs sources to make this work in invisible text. - * progmodes/cc-langs.el (c-switch-label-key): Fixed regexp to + * progmodes/cc-langs.el (c-switch-label-key): Fix regexp to not be confused by a later ':' on the same line as the label. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-mode.el (c-electric-delete, c-electric-delete-forward): @@ -16800,20 +16800,20 @@ `c-electric-delete-forward' is now bound to C-d to get the electric behavior on that key too. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm - * progmodes/cc-cmds.el (c-fill-paragraph): Fixed bogus direct + * progmodes/cc-cmds.el (c-fill-paragraph): Fix bogus direct use of c-comment-prefix-regexp, which caused an error when it's a list. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-mode.el, progmodes/cc-vars.el (c-common-init) - (c-default-style): Removed the hardcoded switch to "java" style + (c-default-style): Remove the hardcoded switch to "java" style in Java mode. It's instead taken care of by the default value for c-default-style. -2002-04-22 Martin Stjernholm +2002-04-22 Martin Stjernholm * progmodes/cc-align.el (c-lineup-math): Fix bug where lineup was triggered by equal signs in string literals. @@ -16864,9 +16864,9 @@ 2002-04-19 Miles Bader * custom.el (customize-mark-to-save, customize-mark-as-set) - (custom-quote): Moved here from `cus-edit.el'. + (custom-quote): Move here from `cus-edit.el'. * cus-edit.el (customize-mark-to-save, customize-mark-as-set) - (custom-quote): Moved to `custom.el'. + (custom-quote): Move to `custom.el'. 2002-04-18 Richard M. Stallman @@ -16958,7 +16958,7 @@ (ediff-clone-buffer-for-region-comparison): More robust window arrangement while prompting for regions to compare. (ediff-make-cloned-buffer): Use generate-new-buffer-name. - (ediff-inferior-compare-regions): Deleted unused vars + (ediff-inferior-compare-regions): Delete unused vars ctl-buf and quit-now. 2002-04-15 Richard M. Stallman @@ -17039,7 +17039,7 @@ call `math-group-float'. * play/gamegrid.el (gamegrid-add-score-with-update-game-score): - Renamed from `gamegrid-add-score'. + Rename from `gamegrid-add-score'. (gamegrid-add-score-insecure): Restored from the old `gamegrid-add-score'. (gamegrid-add-score): Just dispatch on `system-type' to one of the @@ -17453,7 +17453,7 @@ (sgml-insert-end-tag): New funs taken from xml-lite.el. (sgml-calculate-indent): Use them. (sgml-slash-matching): Rename from sgml-slash. - (sgml-slash): Copied from xml-lite and changed to use + (sgml-slash): Copy from xml-lite and changed to use sgml-slash-matching and sgml-quick-keys. * international/mule-cmds.el (standard-keyboard-coding-systems): @@ -17502,10 +17502,10 @@ * info.el (info-tool-bar-map): Use tool-bar-local-item-from-menu. - * toolbar/tool-bar.el (tool-bar-local-item): Renamed from + * toolbar/tool-bar.el (tool-bar-local-item): Rename from tool-bar-add-item, and new arg MAP. (tool-bar-add-item): Now calls tool-bar-local-item. - (tool-bar-local-item-from-menu): Renamed from + (tool-bar-local-item-from-menu): Rename from tool-bar-add-item-from-menu, and new arg IN-MAP. (tool-bar-add-item-from-menu): Now calls tool-bar-local-item-from-menu. @@ -17542,9 +17542,9 @@ 2002-03-29 Richard M. Stallman - * subr.el (play-sound-file): Moved to simple.el. + * subr.el (play-sound-file): Move to simple.el. - * simple.el (play-sound-file): Moved from subr.el, made unconditional. + * simple.el (play-sound-file): Move from subr.el, made unconditional. 2002-03-29 Colin Walters @@ -17626,7 +17626,7 @@ 2002-03-28 Richard M. Stallman - * dired.el (dired-toggle-marks): Renamed from dired-do-toggle. + * dired.el (dired-toggle-marks): Rename from dired-do-toggle. Bindings changed. * progmodes/compile.el (compilation-handle-exit): @@ -17714,7 +17714,7 @@ * gud.el (gud-jdb-sourcepath): New variable, saves jdb -sourcepath parameter value. (gud-jdb-build-source-files-list): Comment clarification. - (gud-jdb-massage-args): Reworked into loop-based argument list + (gud-jdb-massage-args): Rework into loop-based argument list processing in order to support -classpath and -sourcepath argument processing. (gud-jdb-find-source-using-classpath): Prepend gud-jdb-sourcepath @@ -17894,11 +17894,11 @@ * ediff-util.el (ediff-toggle-hilit): Fix toggling of highlighting. (ediff-select-difference): Take highlighting style into account. (ediff-clone-buffer-for-region-comparison): New function. - (ediff-inferior-compare-regions): Added comparison of current diff + (ediff-inferior-compare-regions): Add comparison of current diff regions. * ediff.el (ediff-clone-buffer-for-region-comparison) - (ediff-clone-buffer-for-window-comparison): Moved to ediff-util.el. + (ediff-clone-buffer-for-window-comparison): Move to ediff-util.el. 2002-03-19 Paul Reilly @@ -17977,7 +17977,7 @@ 2002-03-17 Stefan Monnier - * textmodes/sgml-mode.el (sgml-xml-mode): Renamed from sgml-xml. + * textmodes/sgml-mode.el (sgml-xml-mode): Rename from sgml-xml. (sgml-xml-guess): Simplify. (sgml-mode-common): Remove (move into sgml-mode). (sgml-mode): Add code from sgml-mode-common. @@ -18020,7 +18020,7 @@ 2002-03-16 Simon Marshall - * imenu.el (imenu-menubar-modified-tick): Renamed from + * imenu.el (imenu-menubar-modified-tick): Rename from imenu-update-menubar-modified-tick. (imenu-update-menubar): Update imenu-menubar-modified-tick whenever outer condition succeeds. @@ -18098,7 +18098,7 @@ (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others). - * dired-aux.el (dired-fun-in-all-buffers): Moved to dired.el. + * dired-aux.el (dired-fun-in-all-buffers): Move to dired.el. * facemenu.el (facemenu-add-new-face): Pass region args to facemenu-set-face, when there is a region. @@ -18167,7 +18167,7 @@ (lisp-loop-forms-indentation, lisp-simple-loop-indentation): New user options. (extended-loop-p, common-lisp-loop-part-indentation): New functions. - (common-lisp-indent-function-1): Renamed from + (common-lisp-indent-function-1): Rename from common-lisp-indent-function. (common-lisp-indent-function): Handle loop forms specially. (lisp-indent-defmethod): Use car/cdr instead of first/rest. @@ -18278,7 +18278,7 @@ (ibuffer-insert-buffer-line): Ditto. (ibuffer-map-lines): Ditto. (ibuffer-insert-buffers-and-marks): Ditto. - (ibuffer-update-title-and-summary): Renamed from + (ibuffer-update-title-and-summary): Rename from `ibuffer-update-title'. Handle "summarizer" columns. (ibuffer-clear-summary-columns): New function. @@ -18321,7 +18321,7 @@ (hif-tokenize): Handle `?' and ':' as tokens. (hif-expr): Parse conditional expressions. (hif-or-expr): Parse `||' expressions. - (hif-and-expr): Renamed from hif-term. + (hif-and-expr): Rename from hif-term. (hif-conditional): New function to evaluate a conditional expression. @@ -18441,14 +18441,14 @@ * cus-start.el: Rename automatic-hscroll-step and automatic-hscroll-margin into hscroll-step and hscroll-margin. - * frame.el (auto-hscroll-mode): Renamed from automatic-hscrolling. + * frame.el (auto-hscroll-mode): Rename from automatic-hscrolling. (automatic-hscrolling): Now a defvaralias for auto-hscroll-mode. * mouse.el (mouse-region-delete-keys): Add deletechar. 2002-03-03 Sam Steingold - * play/snake.el (snake-score-file): Fixed parens (broken by the + * play/snake.el (snake-score-file): Fix parens (broken by the last patch). * play/tetris.el (tetris-score-file): Ditto. @@ -18574,14 +18574,14 @@ `winner-boring-buffers', will no longer be restored by `winner-undo'. (winner-sorted-window-list): Used to improve comparison between window configurations. - (winner-win-data): Simplified and moved. - (winner-conf): Simplified (now uses `winner-win-data'). + (winner-win-data): Simplify and moved. + (winner-conf): Simplify (now uses `winner-win-data'). (winner-change-fun, winner-save-old-configurations) (winner-save-(un)conditionally, winner-redo): Changes made while in the minibuffer will be ignored. (Such changes are undone upon exit for the minibuffer, anyway.) (winner-set-conf): Preserve selected window whenever possible. - (winner-make-point-alist): Simplified. + (winner-make-point-alist): Simplify. (winner-mode, winner-save-unconditionally): Save current window configuration on entering minibuffer. (minor-mode-alist): Don't add winner-mode to `minor-mode-alist', @@ -18589,11 +18589,11 @@ 2002-02-26 Eli Zaretskii - * international/mule-conf.el (compound-text): Renamed back from + * international/mule-conf.el (compound-text): Rename back from compound-text-no-extensions. (ctext-no-compositions): Remove the mime-charset property. - (compound-text-with-extensions): Renamed from compound-text. - (x-ctext-with-extensions, ctext-with-extensions): Renamed aliases. + (compound-text-with-extensions): Rename from compound-text. + (x-ctext-with-extensions, ctext-with-extensions): Rename aliases. 2002-02-26 Juanma Barranquero @@ -18636,7 +18636,7 @@ 2002-02-25 Per Abrahamsen - * ps-print.el (ps-print-printer): Added `lpr' customize group member. + * ps-print.el (ps-print-printer): Add `lpr' customize group member. 2002-02-25 Juanma Barranquero @@ -18715,7 +18715,7 @@ (snake-update-game, snake-move-left) (snake-move-right, snake-move-up, snake-move-down, snake-active-p) (snake-start-game): Use that queue. - (snake-use-glyphs-flag): Renamed from snake-use-glyphs. + (snake-use-glyphs-flag): Rename from snake-use-glyphs. (snake-use-color-flag): Likewise. (snake-mode): Rename uses of those variables. @@ -18725,7 +18725,7 @@ * international/mule-conf.el (ctext-no-compositions): New coding system. - (compound-text-no-extensions): Renamed from compound-text. + (compound-text-no-extensions): Rename from compound-text. (x-ctext-no-extensions, ctext-no-extensions): Aliases for compound-text-no-extensions. (compound-text): Redefined using post-read and pre-write conversions. @@ -18813,7 +18813,7 @@ 2002-02-19 Per Abrahamsen - * facemenu.el (describe-text-mode-map): Removed bootstrap kludge. + * facemenu.el (describe-text-mode-map): Remove bootstrap kludge. * toolbar/tool-bar.el (tool-bar-mode): Made the standard value t. * menu-bar.el (menu-bar-mode): Ditto. @@ -18860,10 +18860,10 @@ 2002-02-17 Per Abrahamsen - * menu-bar.el (menu-bar-showhide-menu): Added speedbar. - (menu-bar-tools-menu): Removed speedbar. + * menu-bar.el (menu-bar-showhide-menu): Add speedbar. + (menu-bar-tools-menu): Remove speedbar. - * textmodes/ispell.el (ispell-menu-map): Added `customize-ispell' + * textmodes/ispell.el (ispell-menu-map): Add `customize-ispell' and `flyspell-mode' entries. * textmodes/flyspell.el (flyspell): Add to ispell group. @@ -18962,13 +18962,13 @@ 2002-02-16 John Wiegley - * eshell/esh-ext.el (eshell-external-command): Added a fix for + * eshell/esh-ext.el (eshell-external-command): Add a fix for XEmacs' new dired.el, which adds a global entry in the `file-name-handler-alist'. 2002-02-16 John Wiegley - * align.el (align-region): Added a missing name argument. + * align.el (align-region): Add a missing name argument. 2002-02-16 John Wiegley @@ -19037,7 +19037,7 @@ 2002-02-12 Per Abrahamsen - * menu-bar.el (menu-bar-options-save): Removed `truncate-lines'. + * menu-bar.el (menu-bar-options-save): Remove `truncate-lines'. (menu-bar-options-menu): Don't set default value for `truncate-lines'. 2002-02-12 Per Abrahamsen @@ -19063,7 +19063,7 @@ 2002-02-11 Per Abrahamsen - * toolbar/tool-bar.el (tool-bar-mode): Removed standard value. + * toolbar/tool-bar.el (tool-bar-mode): Remove standard value. * menu-bar.el (menu-bar-mode): Ditto. * cus-edit.el (customize-mark-to-save): Always save variables without a standard value. @@ -19111,7 +19111,7 @@ table information. Maybe report char-code-property-table info. Maybe report character's unicode. Tweak printing of list info. (list-input-methods): Add xref buttons. - (dump-charsets, dump-codings): Deleted (obsolete). + (dump-charsets, dump-codings): Delete (obsolete). From Dave Love . 2002-02-10 Pavel Janík @@ -19455,8 +19455,8 @@ (batch-byte-compile-if-not-done): New function. * Makefile.in (compile): New target. - (compile-always): Renamed from compile-files. - (compile-after-backup): Renamed from compile. + (compile-always): Rename from compile-files. + (compile-after-backup): Rename from compile. (bootstrap): Depend on compile-always, not compile-files. * emulation/pc-select.el (pc-select-save-and-set-mode): @@ -19769,7 +19769,7 @@ 2002-01-16 Richard M. Stallman - * mouse.el (mouse-drag-region-1): Renamed from mouse-drag-region, + * mouse.el (mouse-drag-region-1): Rename from mouse-drag-region, more or less. (mouse-drag-region): New function. For a click in the echo area, show *Messages*. @@ -19812,7 +19812,7 @@ (eudc-pre-select-window-configuration, eudc-insertion-marker): Variables removed. (eudc-insert-selected): Function removed. - (eudc-select): Reimplemented. + (eudc-select): Reimplement. (eudc-expand-inline): Delete the strings only after its expansion is chosen not before. @@ -20045,7 +20045,7 @@ * viper-util.el: Use viper-cond-compile-for-xemacs-or-emacs. (viper-read-key-sequence, viper-set-unread-command-events) - (viper-char-symbol-sequence-p, viper-char-array-p): Moved here. + (viper-char-symbol-sequence-p, viper-char-array-p): Move here. * viper-ex.el: Use viper-cond-compile-for-xemacs-or-emacs. @@ -20072,7 +20072,7 @@ (ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p) (ediff-whitespace-diff-region-p, ediff-get-region-contents): Move to ediff-util.el. - (ediff-event-key): Moved here. + (ediff-event-key): Move here. * ediff-merge.el: Got rid of unreferenced variables. @@ -20091,7 +20091,7 @@ (ediff-unhighlight-diff, ediff-unhighlight-diffs-totally) (ediff-empty-diff-region-p, ediff-whitespace-diff-region-p) (ediff-get-region-contents, ediff-make-current-diff-overlay): - Moved here. + Move here. (ediff-format-bindings-of): New function by Hannu Koivisto . (ediff-setup): Make sure the merge buffer is always widened and @@ -20116,7 +20116,7 @@ (ediff-regions-internal): Get rid of the warning about comparing regions of the same buffer. - * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): Moved here. + * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): Move here. Plus the following fixes courtesy of Dave Love: Doc fixes. (ediff-word-1): Use word class and move - to the front per regexp documentation. @@ -20177,19 +20177,19 @@ 2002-01-05 Andre Spiegel * vc.el (vc-branch-part): Return nil if there's no `.'. - (vc-default-previous-version): Renamed from vc-previous-version. + (vc-default-previous-version): Rename from vc-previous-version. New args BACKEND and FILE. Return nil for revision numbers without a `.'. (vc-version-diff): Call vc-BACKEND-previous-version. (vc-steal-lock): Steal lock before composing mail, so that no mail is sent when the stealing goes wrong. And we'll actually see the error in that case now. - (vc-finish-steal): Removed. + (vc-finish-steal): Remove. * vc-rcs.el (vc-rcs-steal-lock): Do a real checkout after stealing the lock, so that we see expanded headers. (vc-rcs-trunk-p, vc-rcs-branch-part, vc-rcs-branch-p) - (vc-rcs-minor-part, vc-rcs-previous-version): Removed. These are + (vc-rcs-minor-part, vc-rcs-previous-version): Remove. These are available from vc.el. Updated all callers. 2002-01-05 Richard M. Stallman @@ -20235,7 +20235,7 @@ 2002-01-03 Per Abrahamsen - * custom.el (defcustom): Documented :tag, :link and :load. + * custom.el (defcustom): Document :tag, :link and :load. 2002-01-03 Eli Zaretskii @@ -20321,7 +20321,7 @@ (xscheme-send-string-1): Call xscheme-insert-expression to save expression in ring. (xscheme-yank-previous-send): Now an alias for xscheme-yank. - (xscheme-previous-send): Deleted variable. + (xscheme-previous-send): Delete variable. (xscheme-send-string-2, xscheme-send-char, xscheme-send-proceed) (xscheme-send-control-g-interrupt): Use process-send-string rather @@ -20591,15 +20591,15 @@ * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r command. - (viper-buffer-search-enable): Fixed format string. + (viper-buffer-search-enable): Fix format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name instead of viper-info-on-file. (ex-set-visited-file-name): New function. - * viper.el (viper-emacs-state-mode-list): Added mail-mode. + * viper.el (viper-emacs-state-mode-list): Add mail-mode. - * ediff-mult.el (ediff-meta-mark-equal-files): Added optional + * ediff-mult.el (ediff-meta-mark-equal-files): Add optional action argument. * ediff-init.el: Fixed some doc strings. @@ -20626,7 +20626,7 @@ * emacs-lisp/elint.el (elint-unknown-builtin-args): Remove mocklisp entries. - * subr.el (insert-string): Moved from mocklisp.c, reimplemented in + * subr.el (insert-string): Move from mocklisp.c, reimplemented in Lisp. Obsoleted. * emulation/mlconvert.el: File removed. @@ -20887,8 +20887,8 @@ (lm-crack-copyright): Cope with multi-line copyright `lines'. * simple.el (newline): Doc fix. - (eval-expression-print-level, eval-expression-print-length): Doc - fix. Amend :type. + (eval-expression-print-level, eval-expression-print-length): + Doc fix. Amend :type. (next-line, previous-line): Make arg optional. (newline): Doc fix. @@ -20914,10 +20914,10 @@ 2001-12-16 Richard M. Stallman - * dired.el (dired-copy-filename-as-kill): Moved from dired-x.el. + * dired.el (dired-copy-filename-as-kill): Move from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill. - * dired-x.el (dired-copy-filename-as-kill): Moved to dired.el. + * dired-x.el (dired-copy-filename-as-kill): Move to dired.el. * autoinsert.el (auto-insert-alist): Redo finding C and C++ headers. Add a DESCRIPTION for the makefile item. @@ -20977,26 +20977,26 @@ 2001-12-15 Richard M. Stallman * language/ind-util.el (range): Function deleted. - (indian-regexp-of-hashtbl-keys): Renamed from `regexp-of-hashtbl-keys'. + (indian-regexp-of-hashtbl-keys): Rename from `regexp-of-hashtbl-keys'. All calls changed. - * language/devan-util.el (devanagari-range): Renamed from `range'. + * language/devan-util.el (devanagari-range): Rename from `range'. All calls changed. (devanagari-regexp-of-hashtbl-keys): - Renamed from `regexp-of-hashtbl-keys'. All calls changed. + Rename from `regexp-of-hashtbl-keys'. All calls changed. 2001-12-15 Dave Love * language/ind-util.el: Don't require cl. (indian-glyph-char, indian-glyph-max-char) - (indian-char-glyph): Moved from indian.el. + (indian-char-glyph): Move from indian.el. (indian--puthash-char, mapthread): Don't quote lambda. (indian--map): New function. (indian--puthash-v, indian--puthash-c, indian--puthash-m) (indian--puthash-cv): Use it. * language/indian.el (indian-glyph-char, indian-glyph-max-char) - (indian-char-glyph): Moved to ind-util.el + (indian-char-glyph): Move to ind-util.el * language/devan-util.el (devanagari-post-read-conversion): New function. @@ -21132,7 +21132,7 @@ * derived.el (derived-mode-p): Function moved to subr.el. - * subr.el (derived-mode-p): Moved here from derived.el. + * subr.el (derived-mode-p): Move here from derived.el. * international/mule.el (set-auto-coding): Use set-auto-mode-1. @@ -21282,7 +21282,7 @@ 2001-12-07 Miles Bader * progmodes/compile.el (compilation-error-regexp-alist): - Added regexps for RXP. + Add regexps for RXP. 2001-12-05 Eli Zaretskii @@ -21792,7 +21792,7 @@ * menu-bar.el (menu-bar-apropos-menu): New variable. Moved all `apropos' bindings to this menu. - (menu-bar-help-menu): Added `menu-bar-apropos-menu'. + (menu-bar-help-menu): Add `menu-bar-apropos-menu'. 2001-11-24 KAWABATA, Taichi @@ -22048,7 +22048,7 @@ (browse-url-galeon, browse-url-galeon-sentinel): New functions. (browse-url-default-browser): New function. (browse-url-process-environment): Use browse-url-browser-display. - (browse-url-browser-display): Renamed from browse-url-netscape-display. + (browse-url-browser-display): Rename from browse-url-netscape-display. (browse-url-mozilla-startup-arguments, browse-url-galeon-program) (browse-url-galeon-arguments, browse-url-galeon-startup-arguments) (browse-url-mozilla-program, browse-url-mozilla-arguments): New vars. @@ -22077,7 +22077,7 @@ (Math-integer-neg, Math-equal, Math-lessp, Math-primp) (Math-num-integerp, Math-bignum-test, Math-equal-int) (Math-natnum-lessp, math-format-radix-digit): Change to `defsubst'. - (calc-record-compilation-date-macro): Deleted. Callers updated. + (calc-record-compilation-date-macro): Delete. Callers updated. (math-format-radix-digit): Move to calc-bin.el. * calc/calc.el (calc-record-compilation-date): Remove. @@ -22523,7 +22523,7 @@ * calc/calc-keypd.el (toplevel): Bind mouse buttons. (calc-do-keypad): Don't attempt to use nonexistent global mouse-map, use calc-keypad-map. - (calc-keypad-x-left-click): Renamed to calc-keypad-left-click. + (calc-keypad-x-left-click): Rename to calc-keypad-left-click. (calc-keypad-left-click): Don't use mouse-map; update to new event interface. (calc-keypad-x-middle-click, calc-keypad-x-right-click): Ditto. @@ -22632,7 +22632,7 @@ * textmodes/flyspell.el (flyspell-correct-word/local-keymap): Function deleted. (flyspell-correct-word): Old definition deleted. - (flyspell-correct-word/mouse-keymap): Renamed to flyspell-correct-word. + (flyspell-correct-word/mouse-keymap): Rename to flyspell-correct-word. All references renamed too. 2001-11-10 Gerd Moellmann @@ -22641,7 +22641,7 @@ 2001-11-09 Per Abrahamsen - * wid-edit.el (checklist): Removed `:menu-tag'. + * wid-edit.el (checklist): Remove `:menu-tag'. (radio-button-choice): Ditto. (editable-list): Ditto. @@ -23102,7 +23102,7 @@ 2001-10-28 Per Abrahamsen - * cus-start.el (recursive-load-depth-limit): Added. + * cus-start.el (recursive-load-depth-limit): Add. 2001-10-28 Richard M. Stallman @@ -23176,7 +23176,7 @@ 2001-10-27 Sam Steingold - * textmodes/sgml-mode.el (sgml-xml): Renamed from `html-xhtml'. + * textmodes/sgml-mode.el (sgml-xml): Rename from `html-xhtml'. (sgml-xml-guess): Extracted from `html-mode' and generalized. (sgml-mode-common): Call it. (sgml-mode, html-mode): Set `mode-name' based on `sgml-xml'. @@ -23369,10 +23369,10 @@ 2001-10-24 Sam Steingold - * mouse.el (mouse-buffer-menu-mode-groups): Added "Version + * mouse.el (mouse-buffer-menu-mode-groups): Add "Version Control" and "SGML" groups. -2001-10-24 Martin Stjernholm +2001-10-24 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-member-init-list): Better handling of C++ template args to avoid confusion with `<' @@ -23455,25 +23455,25 @@ * vc.el (vc-annotate-display-default): Accept colormap scaling ratio (now deprecated). - (vc-annotate-display-autoscale): Added. + (vc-annotate-display-autoscale): Add. (vc-annotate-add-menu): New autoscaling menu options "Span to Oldest" and "Span Oldest->Newest". Easymenu support added for toggle menus driven by customize variable `vc-annotate-display-mode'. - (vc-annotate-display-select): Added. - (vc-annotate): Changed temp-buffer-show-function to + (vc-annotate-display-select): Add. + (vc-annotate): Change temp-buffer-show-function to `vc-annotate-display-select'. - (vc-annotate-display): Removed arguments BUFFER and BACKEND. + (vc-annotate-display): Remove arguments BUFFER and BACKEND. Added argument OFFSET. Instead of backend function, calls now generic `vc-annotate-difference'. - (vc-annotate-difference): Added as generic function instead of + (vc-annotate-difference): Add as generic function instead of backend-specific function. No longer takes argument POINT, but instead accepts a time OFFSET. - (vc-default-annotate-current-time): Added. + (vc-default-annotate-current-time): Add. - * vc-cvs.el (vc-cvs-annotate-difference): Removed to generic + * vc-cvs.el (vc-cvs-annotate-difference): Remove to generic version in vc.el. - (vc-cvs-annotate-current-time): Added, as override of default. - (vc-cvs-annotate-time): Added. Taken mostly from the (now removed) + (vc-cvs-annotate-current-time): Add, as override of default. + (vc-cvs-annotate-time): Add. Taken mostly from the (now removed) `vc-cvs-annotate-difference'. 2001-10-22 Gerd Moellmann === modified file 'lisp/ChangeLog.11' --- lisp/ChangeLog.11 2014-03-09 23:55:11 +0000 +++ lisp/ChangeLog.11 2014-08-28 22:18:39 +0000 @@ -40,8 +40,8 @@ * progmodes/fortran.el (fortran-mode): Use mode-require-final-newline. * progmodes/f90.el (f90-mode): Use mode-require-final-newline. * progmodes/cperl-mode.el (cperl-mode): Use mode-require-final-newline. - * progmodes/cfengine.el (cfengine-mode): Use - mode-require-final-newline. + * progmodes/cfengine.el (cfengine-mode): + Use mode-require-final-newline. * progmodes/ada-mode.el (ada-mode): Use mode-require-final-newline. * textmodes/text-mode.el (text-mode): Use mode-require-final-newline. * textmodes/texinfo.el (texinfo-mode): Use mode-require-final-newline. @@ -438,8 +438,8 @@ * net/tramp-smb.el (tramp-smb-advice-PC-do-completion): Make the advice less fragile. Surround temporary redefinition of - `substitute-in-file-name' with `unwind-protect'. Suggested by - Matt Hodges . + `substitute-in-file-name' with `unwind-protect'. + Suggested by Matt Hodges . 2004-12-17 Juri Linkov @@ -1608,9 +1608,9 @@ 2004-11-24 Jay Belanger - * calc/calc.el (calc-embedded-active): Removed unnecessary + * calc/calc.el (calc-embedded-active): Remove unnecessary declaration. - (calc-show-banner): Removed redundant declaration. + (calc-show-banner): Remove redundant declaration. * calc/calc-graph.el (calc-gnuplot-default-device) (calc-gnuplot-default-output, calc-gnuplot-print-device) @@ -1662,7 +1662,7 @@ (math-nri-n): New variable. (math-nth-root-integer, math-nth-root-int-iter): Replace variable n by declared variable. - (calcFunc-log): Removed misplaced condition. + (calcFunc-log): Remove misplaced condition. 2004-11-24 Stefan Monnier @@ -3366,8 +3366,8 @@ 2004-10-24 Kai Grossjohann - * simple.el (process-file): Accept nil for INFILE. Reported by - Luc Teirlinck. + * simple.el (process-file): Accept nil for INFILE. + Reported by Luc Teirlinck. 2004-10-24 Masatake YAMATO @@ -3969,7 +3969,7 @@ * indent.el (set-left-margin, set-right-margin): Rename `lm' arg to `width' for consistency with docstring. Doc fix. -2004-10-01 Martin Stjernholm +2004-10-01 Martin Stjernholm * progmodes/cc-langs.el: Load cl here since cc-defs doesn't do it. This is necessary for derived modes. @@ -4330,8 +4330,8 @@ (calc-mode): Compare `calc-settings-file' to `user-init-file' rather than "\\.emacs" to determine if it is the user-init-file. - * calc/calc-embed.el (calc-embedded-set-modes): Use - `calc-mode-var-list' correctly. + * calc/calc-embed.el (calc-embedded-set-modes): + Use `calc-mode-var-list' correctly. 2004-09-15 Thien-Thi Nguyen @@ -5129,7 +5129,7 @@ (speedbar-directory): New image (unused pixmap already existed). (speedbar-expand-image-button-alist): Use it. -2004-08-11 Martin Stjernholm +2004-08-11 Martin Stjernholm CC Mode update to 5.30.9: @@ -5212,7 +5212,7 @@ Fix bug that could cause an error from `after-change-functions' when the changed region is at bob. -2004-08-11 Alan Mackenzie +2004-08-11 Alan Mackenzie CC Mode update to 5.30.9: @@ -5503,8 +5503,8 @@ since Emacs 22.1 only (XEmacs has it). Implementation rewritten in order to avoid this function. (tramp-handle-write-region): Set current buffer. If connection - wasn't open, `file-modes' has changed it accidentally. Reported by - David Kastrup . + wasn't open, `file-modes' has changed it accidentally. + Reported by David Kastrup . (tramp-enter-password, tramp-read-passwd): New arguments USER and HOST. (tramp-action-password, tramp-multi-action-password): Apply it. @@ -8532,8 +8532,8 @@ 2004-04-16 Dave Love - * progmodes/python.el (python-compilation-line-number): Fix - braindamage. + * progmodes/python.el (python-compilation-line-number): + Fix braindamage. (python-load-file): Fix python-orig-start setting. * progmodes/compile.el: Doc fixes. @@ -9482,8 +9482,8 @@ 2004-03-22 Luc Teirlinck - * autorevert.el (global-auto-revert-non-file-buffers): Expand - docstring. + * autorevert.el (global-auto-revert-non-file-buffers): + Expand docstring. (buffer-stale-function): New variable. (auto-revert-list-diff, auto-revert-dired-file-list) (auto-revert-dired-changed-p, auto-revert-buffer-p): Delete. @@ -10230,8 +10230,8 @@ * progmodes/ebnf-abn.el: New file, implements an ABNF parser. - * progmodes/ebnf2ps.el: Doc fix. Accept ABNF (Augmented BNF). New - arrow shapes: semi-up-hollow, semi-up-full, semi-down-hollow and + * progmodes/ebnf2ps.el: Doc fix. Accept ABNF (Augmented BNF). + New arrow shapes: semi-up-hollow, semi-up-full, semi-down-hollow and semi-down-full. Fix a bug on productions like test = {"test"}* | ( "tt" ["test"] ). Reported by Markus Dreyer . @@ -10568,7 +10568,7 @@ (ses-mode-map): Use them. (ses-read-number) New fun. Duplicates code from interactive "N" spec. -2004-02-14 Martin Stjernholm +2004-02-14 Martin Stjernholm * Makefile.in: Fix the CC Mode recompile kludge so it works when building in a different directory. @@ -10642,7 +10642,7 @@ * tar-mode.el (tar-extract): Fix for the case that a file doesn't have end-of-line. -2004-02-09 Martin Stjernholm +2004-02-09 Martin Stjernholm * Makefile.in: Added extra dependencies in the recompile target needed to cope with the compile time macro expansions in CC Mode. @@ -11034,8 +11034,8 @@ 2004-01-21 Jan Djärv - * term/x-win.el (x-clipboard-yank, menu-bar-edit-menu): Call - menu-bar-enable-clipboard and make Paste use clipboard first. + * term/x-win.el (x-clipboard-yank, menu-bar-edit-menu): + Call menu-bar-enable-clipboard and make Paste use clipboard first. 2004-01-20 Stefan Monnier @@ -11714,8 +11714,8 @@ 2003-11-30 Kai Grossjohann Version 2.0.38 of Tramp released. - * net/tramp.el (tramp-chunksize): Extend docstring. Suggested by - Charles Curley . + * net/tramp.el (tramp-chunksize): Extend docstring. + Suggested by Charles Curley . (tramp-multi-connection-function-alist): Add ssht entry which adds "-e none -t -t" to the list of ssh args. Suggested by Adrian Aichner. @@ -11932,7 +11932,7 @@ by returning the original value of 8 in all cases, but 99% of the time this is a waste of whitespace). -2003-11-16 Martin Stjernholm +2003-11-16 Martin Stjernholm * progmodes/cc-engine.el (c-guess-continued-construct) (c-guess-basic-syntax): Check a little more carefully if it's a @@ -12696,13 +12696,13 @@ * window.el (window-current-scroll-bars): New defun. -2003-09-24 Martin Stjernholm +2003-09-24 Martin Stjernholm * progmodes/cc-engine.el (c-parse-state): Fix bug that could cause errors when the state cache contains info on parts that have been narrowed out. -2003-09-24 Martin Stjernholm +2003-09-24 Martin Stjernholm * progmodes/cc-vars.el (c-comment-prefix-regexp): Document that `c-setup-paragraph-variables' has to be used when this variable is @@ -12712,7 +12712,7 @@ * progmodes/cc-styles.el (c-setup-paragraph-variables): Make it interactive. -2003-09-24 Martin Stjernholm +2003-09-24 Martin Stjernholm * progmodes/cc-fonts.el (c-font-lock-declarations): Fix recognition of constructors and destructors for classes whose @@ -12721,14 +12721,14 @@ * progmodes/cc-langs.el (c-type-list-kwds): If "operator" is followed by an identifier in C++ then it's a type. -2003-09-24 Martin Stjernholm +2003-09-24 Martin Stjernholm * progmodes/cc-fonts.el (c-font-lock-invalid-string): Fix eob problem that primarily affected XEmacs. Don't use faces to find unterminated strings since Emacs and XEmacs fontify strings differently - this function should now work better in XEmacs. -2003-09-24 Martin Stjernholm +2003-09-24 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-brace): Fix a bug in the `expand-abbrev' workaround which caused braces to misbehave inside @@ -12737,7 +12737,7 @@ * progmodes/cc-engine.el (c-forward-keyword-clause): Fix error handling. This bug could cause interactive font locking to bail out. -2003-09-24 Martin Stjernholm +2003-09-24 Martin Stjernholm * progmodes/cc-engine.el (c-just-after-func-arglist-p): Handle paren-style types in Pike. Also fixed some cases of @@ -13113,13 +13113,13 @@ * image.el (image-jpeg-p): Don't search beyond length of data. -2003-08-26 Martin Stjernholm +2003-08-26 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-brace): Work around for a misfeature in `expand-abbrev' which caused electric keywords like "else" to disappear if an open brace was typed directly afterwards. -2003-08-26 Martin Stjernholm +2003-08-26 Martin Stjernholm * progmodes/cc-vars.el (c-extra-types-widget): The doc string is mandatory in `define-widget'. @@ -13132,7 +13132,7 @@ (c-assignment-op-regexp): New language var used by `c-lineup-math'. -2003-08-26 Martin Stjernholm +2003-08-26 Martin Stjernholm * progmodes/cc-engine.el (c-just-after-func-arglist-p): Safeguard against unbalanced sexps. @@ -13467,12 +13467,12 @@ * textmodes/reftex.el (reftex-region-active-p): New function. - * textmodes/reftex-parse.el (reftex-locate-bibliography-files): Improved the + * textmodes/reftex-parse.el (reftex-locate-bibliography-files): Improve the regexp to find the \bibliography macro. - * textmodes/reftex-vars.el (reftex-section-levels): Removed subsubparagraph, + * textmodes/reftex-vars.el (reftex-section-levels): Remove subsubparagraph, which does not exist in LaTeX. - (reftex-cite-format-builtin): Added amsrefs support. + (reftex-cite-format-builtin): Add amsrefs support. (reftex-toc-confirm-promotion): New option * textmodes/reftex-toc.el @@ -13482,7 +13482,7 @@ (reftex-toc-promote-action, reftex-toc-extract-section-number) (reftex-toc-newhead-from-alist) (reftex-toc-load-all-files-for-promotion): New functions. - (reftex-toc-help): Added description of new keys. + (reftex-toc-help): Add description of new keys. (reftex-toc-split-windows-fraction): New option. (reftex-recenter-toc-when-idle): Search *toc* window on all visible frames. @@ -13498,8 +13498,8 @@ (reftex-toc-quit): Adapted to delete frame when called in dedicated frame. - * textmodes/reftex-index.el (reftex-index-phrase-match-is-indexed): Check - all enclosing macros. + * textmodes/reftex-index.el (reftex-index-phrase-match-is-indexed): + Check all enclosing macros. 2003-08-08 Vinicius Jose Latorre @@ -13618,7 +13618,7 @@ * calendar/holidays.el, calendar/lunar.el, calendar/solar.el: (displayed-month, displayed-year): Define for compiler. -2003-08-03 Martin Stjernholm +2003-08-03 Martin Stjernholm * progmodes/cc-mode.el (c-init-language-vars-for): Add argument MODE. Renamed from c-init-c-language-vars'. @@ -13632,7 +13632,7 @@ (pike-mode): Ditto. (awk-mode): Ditto. -2003-08-03 Martin Stjernholm +2003-08-03 Martin Stjernholm * progmodes/cc-engine.el (c-end-of-current-token): Return whether or not the point moved. @@ -13850,7 +13850,7 @@ * simple.el (current-word): Don't include punctuation char when `really-word' arg is non-nil. -2003-07-17 Martin Stjernholm +2003-07-17 Martin Stjernholm * progmodes/awk-mode.el: Obsoleted by the AWK support in CC Mode - moved to the directory obsolete. @@ -13865,12 +13865,12 @@ (syntax-ppss-after-change-function): New alias. Update uses. (syntax-ppss): Catch the case where the buffer is narrowed. -2003-07-16 Martin Stjernholm +2003-07-16 Martin Stjernholm * progmodes/cc-defs.el (c-langelem-sym, c-langelem-pos) (c-langelem-2nd-pos): Add accessor functions for syntactic elements. -2003-07-16 Martin Stjernholm +2003-07-16 Martin Stjernholm * progmodes/cc-engine.el (c-literal-faces): Declare as a variable since it might be modified. @@ -13964,8 +13964,8 @@ 2003-07-10 Vinicius Jose Latorre - * ps-print.el: Print line number correctly in a region. Reported by - Tim Allen . + * ps-print.el: Print line number correctly in a region. + Reported by Tim Allen . (ps-print-version): New version number (6.6.2). (ps-printing-region): Code fix. @@ -14004,24 +14004,24 @@ * dired.el (dired-move-to-filename-regexp): Allow quote in months. -2003-07-08 Martin Stjernholm +2003-07-08 Martin Stjernholm * progmodes/cc-engine.el (c-guess-basic-syntax): Do not do hidden buffer changes; there's third party code that calls this function directly. -2003-07-08 Martin Stjernholm +2003-07-08 Martin Stjernholm * progmodes/cc-fonts.el (javadoc-font-lock-keywords) (autodoc-font-lock-keywords): Don't byte compile on font lock initialization when running from byte compiled files. -2003-07-08 Alan Mackenzie +2003-07-08 Alan Mackenzie * progmodes/cc-engine.el: Fix AWK mode indentation when previous statement ends with auto-increment "++". -2003-07-08 Martin Stjernholm +2003-07-08 Martin Stjernholm * progmodes/cc-langs.el, progmodes/cc-styles.el (c-style-alist) (c-lang-variable-inits, c-lang-variable-inits-tail): The values of @@ -14110,13 +14110,13 @@ * info.el (Info-menu-entry-name-re): Add `:' to second [] part. This should fix the infinite loop when extracting menu names. -2003-07-05 Martin Stjernholm +2003-07-05 Martin Stjernholm * files.el (auto-mode-alist, interpreter-mode-alist): Remove entries to CC Mode modes to avoid duplicates; they are now added with autoload directives in cc-mode.el. -2003-07-05 Martin Stjernholm +2003-07-05 Martin Stjernholm * progmodes/cc-langs.el, progmodes/cc-styles.el (c-style-alist) (c-lang-variable-inits, c-lang-variable-inits-tail): The values of === modified file 'lisp/ChangeLog.12' --- lisp/ChangeLog.12 2014-01-22 01:43:37 +0000 +++ lisp/ChangeLog.12 2014-08-28 22:18:39 +0000 @@ -932,7 +932,7 @@ * international/quail.el (quail-setup-completion-buf): Make the completion buffer read-only. - (quail-completion): Adjusted for the above change. Leave the + (quail-completion): Adjust for the above change. Leave the modified flag nil. 2007-03-20 David Kastrup @@ -2371,8 +2371,8 @@ 2007-01-27 Eli Zaretskii * ls-lisp.el (ls-lisp-use-localized-time-format): New defcustom. - (ls-lisp-format-time-list): Doc fix. Mention - ls-lisp-use-localized-time-format. + (ls-lisp-format-time-list): Doc fix. + Mention ls-lisp-use-localized-time-format. (ls-lisp-format-time): Use ls-lisp-format-time-list if ls-lisp-use-localized-time-format is non-nil, even if a valid locale is defined. @@ -3410,8 +3410,8 @@ * wdired.el (wdired-change-to-wdired-mode, wdired-finish-edit) (wdired-search-and-rename): Simplify code. - (wdired-preprocess-files, wdired-preprocess-perms): Make - read-only property of preceding character rear-nonsticky to + (wdired-preprocess-files, wdired-preprocess-perms): + Make read-only property of preceding character rear-nonsticky to avoid that it can be modified. Put old-name and old-link properties on character preceding name and replace put-text-property by add-text-properties. @@ -3560,8 +3560,8 @@ 2006-12-04 Michael Albinus * net/tramp.el (tramp-methods): Add "ControlPath" and - "ControlMaster" to scp, scp1 and scp2 methods. Suggested by - Andreas Schwab . + "ControlMaster" to scp, scp1 and scp2 methods. + Suggested by Andreas Schwab . (tramp-do-copy-or-rename-file-out-of-band) (tramp-open-connection-rsh): Compute format spec for ?t. (tramp-process-actions): Trace command parameters. @@ -6782,9 +6782,9 @@ * mail/feedmail.el (feedmail-buffer-to-sendmail): Look for sendmail in several common directories. - * mail/sendmail.el (sendmail-program): Moved here from paths.el. + * mail/sendmail.el (sendmail-program): Move here from paths.el. - * paths.el (sendmail-program): Removed. + * paths.el (sendmail-program): Remove. 2006-09-04 Daiki Ueno @@ -6822,8 +6822,8 @@ * net/rcirc.el (rcirc-keywords): New variable. (rcirc-bright-nicks, rcirc-dim-nicks): New variables. - (rcirc-bright-nick-regexp, rcirc-dim-nick-regexp): Remove - variables. + (rcirc-bright-nick-regexp, rcirc-dim-nick-regexp): + Remove variables. (rcirc-responses-no-activity): New function. (rcirc-handler-generic): Check for responses in above. (rcirc-process-command): Add ?: character to arguments of raw @@ -6870,8 +6870,8 @@ 2006-08-31 Richard Stallman * cus-edit.el (custom-save-variables): Slight cleanup. - (Custom-no-edit): Renamed from custom-no-edit. - (Custom-newline): Renamed from custom-newline. + (Custom-no-edit): Rename from custom-no-edit. + (Custom-newline): Rename from custom-newline. (custom-mode-map): Use new names. * emacs-lisp/easy-mmode.el (define-minor-mode): Reference manual @@ -7465,7 +7465,7 @@ 2006-08-09 John Wiegley - * calendar/timeclock.el (timeclock-use-elapsed): Added a new + * calendar/timeclock.el (timeclock-use-elapsed): Add a new variable, which causes timeclock to report elapsed time worked, instead of just work remaining. @@ -8041,8 +8041,8 @@ instead of retired `allout-resumptions'. For hook functions, use `local' parameter so hook settings are created and removed as buffer-local settings. Revise (resumptions) setting - auto-fill-function so it is set only if already active. The - related fill-function settings are all made in either case, so + auto-fill-function so it is set only if already active. + The related fill-function settings are all made in either case, so that activating auto-fill-mode activity will have the custom allout-mode behaviors (hanging indent on topics, if configured for it). Remove all allout-exposure-category overlays on mode deactivation. @@ -9914,7 +9914,7 @@ * progmodes/idlw-shell.el (idlwave-shell-move-or-history): Remove spurious move to point-max (new comint behavior fixes). - * progmodes/idlwave.el (idlwave-push-mark): Removed obsolete + * progmodes/idlwave.el (idlwave-push-mark): Remove obsolete compatibility function (Emacs 18/19). (idlwave-is-continuation-line): Always return point at start of previous non-blank continuation line. @@ -9978,12 +9978,12 @@ `point'. (diff-hunk-text, diff-goto-source): Doc fix. - * startup.el (fancy-splash-screens, normal-splash-screen): Use - face `mode-line-buffer-id' for mode-line buffer face instead of + * startup.el (fancy-splash-screens, normal-splash-screen): + Use face `mode-line-buffer-id' for mode-line buffer face instead of hard-coded `(:weight bold)'. - * arc-mode.el (archive-set-buffer-as-visiting-file): Bind - buffer-undo-list to t (undo-ask is reproducible by visiting + * arc-mode.el (archive-set-buffer-as-visiting-file): + Bind buffer-undo-list to t (undo-ask is reproducible by visiting nested archives). 2006-05-09 Kim F. Storm @@ -9999,9 +9999,9 @@ 2006-05-09 Masatake YAMATO - * font-lock.el (cpp-font-lock-keywords-source-directives): Added - "warning" and "import". - (cpp-font-lock-keywords): Added "warning". + * font-lock.el (cpp-font-lock-keywords-source-directives): + Add "warning" and "import". + (cpp-font-lock-keywords): Add "warning". 2006-05-08 Dan Nicolaescu @@ -12213,41 +12213,41 @@ * progmodes/etags.el (tags-completion-table): Do completion from all the tables in the current list, as documented in the manual. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * CC Mode Update to 5.31.3. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-mode.el (c-postprocess-file-styles): Bind inhibit-read-only to t, around the call to c-remove-any-local-eval-or-mode-variables, so that it works on a RO file. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-awk.el: Correct a typo. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-cmds.el, progmodes/cc-mode.el: Rename c-hungry-backspace to c-hungry-delete-backwards, at the request of RMS. Leave the old name as an alias. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-mode.el: Correct a typo. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-defs.el: Update the version number to 5.31.3. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-cmds.el (c-electric-brace): Fix clean-up brace-else-brace (error due to mbeg, mend being undefined). -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-mode.el: File Local variables: Solve the problem where both `mode' and c-file-offsets are specified: `mode' will @@ -12257,7 +12257,7 @@ c-tentative-buffer-change, to splat `mode' and `eval' before the second hack-local-variables. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-mode.el: [Supersedes patch to cc-engine.el V 1.45] @@ -12272,7 +12272,7 @@ with save-match-data. It was being corrupted when Font Lock was not enabled. -2006-02-24 Alan Mackenzie +2006-02-24 Alan Mackenzie * progmodes/cc-langs.el (c-mode-menu): Add menu items for Electric Mode and Subword Mode. @@ -12292,7 +12292,7 @@ * progmodes/cc-cmds.el (c-electric-brace, c-electric-semi&comma) (c-electric-colon): Correct doc-strings: "/ln" -> "/la". -2006-02-24 Martin Stjernholm +2006-02-24 Martin Stjernholm * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Improve the error message when there's an evaluation error to show whether @@ -12630,8 +12630,8 @@ (Info-isearch-push-state): Add quote before Info-current-file and Info-current-node. (Info-isearch-pop-state): Use `equal' instead of `string='. - (Info-extract-pointer, Info-following-node-name): Use - `match-string-no-properties' instead of `match-string'. + (Info-extract-pointer, Info-following-node-name): + Use `match-string-no-properties' instead of `match-string'. (Info-up): Check `old-file' for `stringp'. (Info-history): Use `equal' instead of `string-equal'. Check `file' for `stringp'. @@ -12681,8 +12681,8 @@ (rcirc-get-buffer-create): Fix bug with setting the target. (rcirc-any-buffer): Rename from rcirc-get-any-buffer, and include test for rcirc-always-use-server-buffer-flag here. - (rcirc-response-formats): Add %N, which is a facified nick. %n - uses the default face. Change the ACTION format string. If the + (rcirc-response-formats): Add %N, which is a facified nick. + %n uses the default face. Change the ACTION format string. If the "nick" is the server, don't print anything for that field. Comment fixes. (rcirc-target-buffer): Don't test @@ -12707,7 +12707,7 @@ (allout-version): Incremented, corrected, revised, and refined module commentary. - (provide 'allout): Moved to the bottom, added a require of overlay. + (provide 'allout): Move to the bottom, added a require of overlay. (allout-encrypt-unencrypted-on-saves): Defaults to t instead of `except-current'. @@ -12730,19 +12730,19 @@ Clarify provision for various write-file hook var names. Adjusted for invisible-text overlays instead of selective-display. - (allout-depth): Really return 0 if not within any topic. This - rectifies `allout-beginning-of-level' and sequence numbering + (allout-depth): Really return 0 if not within any topic. + This rectifies `allout-beginning-of-level' and sequence numbering errors that occur when cutting and pasting numbered topics. Changed from a in-line subst to a regular function, as well. - (allout-pre-next-prefix): Renamed from allout-pre-next-preface. + (allout-pre-next-prefix): Rename from allout-pre-next-preface. (allout-end-of-subtree, allout-end-of-subtree) (allout-end-of-entry, allout-end-of-current-heading) (allout-next-visible-heading, allout-open-topic, allout-show-entry) (allout-show-children, allout-show-to-offshoot) - (allout-hide-current-entry, allout-show-current-entry): Rectified - handling of trailing blank lines between items. + (allout-hide-current-entry, allout-show-current-entry): + Rectified handling of trailing blank lines between items. (allout-line-boundary-regexp, set-allout-regexp, allout-depth) (allout-current-depth, allout-unprotected, allout-hidden-p) @@ -12753,11 +12753,11 @@ (allout-hide-region-body, allout-toggle-subtree-encryption) (allout-encrypt-string, allout-encrypted-key-info) (allout-next-topic-pending-encryption, allout-encrypt-decrypted) - (allout-file-vars-section-data): Adjusted for use with + (allout-file-vars-section-data): Adjust for use with invisible-text overlays instead of selective-display. (allout-kill-line, allout-kill-topic, allout-yank-processing): - Reworked for use with invisible text overlays. + Rework for use with invisible text overlays. (allout-current-topic-collapsed-p): New function. @@ -12777,8 +12777,8 @@ (allout-overlay-insert-in-front-handler) (allout-overlay-interior-modification-handler) - (allout-before-change-handler, allout-isearch-end-handler): New - functions to handle extraordinary actions affecting concealed + (allout-before-change-handler, allout-isearch-end-handler): + New functions to handle extraordinary actions affecting concealed text. (allout-flag-region): Use overlays instead of selective-display @@ -12810,8 +12810,8 @@ 2006-02-17 Agustín Martín - * textmodes/ispell.el (ispell-change-dictionary): Call - ispell-buffer-local-dict instead of + * textmodes/ispell.el (ispell-change-dictionary): + Call ispell-buffer-local-dict instead of ispell-accept-buffer-local-defs. (ispell-local-dictionary-alist): Accept as valid any coding-system supported by Emacs. @@ -12918,8 +12918,8 @@ (hack-local-variables): Construct list of variable-value pairs, and apply or reject them in one go. Ask for confirmation if variables are not known safe. - (hack-local-variables-confirm): Complete rewrite. Support - `safe-local-variable-values'. + (hack-local-variables-confirm): Complete rewrite. + Support `safe-local-variable-values'. (enable-local-variables): Update docstring to reflect new behavior. (ignored-local-variables): Ignore ignored-local-variables and @@ -13018,8 +13018,8 @@ 2006-02-12 Michael Albinus * net/tramp.el (tramp-remote-path): Add "/usr/xpg4/bin" on top, - because on Solaris a POSIX compatible "id" is needed. Reported by - Magnus Henoch . + because on Solaris a POSIX compatible "id" is needed. + Reported by Magnus Henoch . 2006-02-12 Juri Linkov @@ -13103,10 +13103,10 @@ * help.el (describe-key-briefly): Now a wrapper for describe-key-briefly-internal. Bind enable-disabled-menus-and-buttons to t. Populate yank-menu if empty. - (describe-key-briefly-internal): Renamed from describe-key-briefly. + (describe-key-briefly-internal): Rename from describe-key-briefly. (describe-key): Now a wrapper for describe-key-internal. Bind enable-disabled-menus-and-buttons to t. Populate yank-menu if empty. - (describe-key-internal): Renamed from describe-key. + (describe-key-internal): Rename from describe-key. 2006-02-11 Milan Zamazal @@ -13641,8 +13641,8 @@ 2006-01-22 Kenichi Handa - * international/mule.el (make-subsidiary-coding-system): Reset - `coding-system-define-form' property of subsidiaries to nil. + * international/mule.el (make-subsidiary-coding-system): + Reset `coding-system-define-form' property of subsidiaries to nil. Avoid duplicated entry in coding-system-alist. (make-coding-system): Avoid duplicated entry in coding-system-alist. @@ -13790,8 +13790,8 @@ (tramp-unload-file-name-handler-alist) (tramp-unload-tramp): New defuns. (tramp-advice-PC-expand-many-files): New defadvice. - (tramp-save-PC-expand-many-files, tramp-setup-complete): Defuns - removed. + (tramp-save-PC-expand-many-files, tramp-setup-complete): + Defuns removed. (tramp-handle-expand-file-name): Remove double slash. (tramp-handle-file-attributes-with-ls): Return t as 9th attribute. It doesn't matter, because it will be converted later on. @@ -13869,7 +13869,7 @@ 2006-01-20 Carsten Dominik - * textmodes/org.el (org-open-at-point): Fixed bug with matching a + * textmodes/org.el (org-open-at-point): Fix bug with matching a link. Fixed buggy argument sequence in call to `org-view-tags'. (org-compile-prefix-format): Set `org-prefix-has-tag'. (org-prefix-has-tag): New variable. @@ -13886,8 +13886,8 @@ images remain visible. (thumbs-file-alist): Construct list in thumbs-buffer and reverse order. - (thumbs-show-image-num): Get image from thumbs-file-alist. Set - mode name. + (thumbs-show-image-num): Get image from thumbs-file-alist. + Set mode name. (thumbs-next-image, thumbs-previous-image): Make them work. 2006-01-19 Luc Teirlinck @@ -14197,8 +14197,8 @@ 2006-01-12 Masatake YAMATO - * progmodes/ld-script.el (auto-mode-alist): Support - suffix conventions used in netbsd and eCos. + * progmodes/ld-script.el (auto-mode-alist): + Support suffix conventions used in netbsd and eCos. 2006-01-11 Luc Teirlinck @@ -15573,7 +15573,7 @@ * hi-lock.el (hi-lock-mode): Rename from hi-lock-buffer-mode; react if global-hi-lock-mode seems intended. - (global-hi-lock-mode): Renamed from hi-lock-mode. + (global-hi-lock-mode): Rename from hi-lock-mode. (hi-lock-archaic-interface-message-used) (hi-lock-archaic-interface-deduce): New variables. (turn-on-hi-lock-if-enabled, hi-lock-line-face-buffer) @@ -15723,7 +15723,7 @@ No need to check gud-comint-buffer is bound. (gdb): Prevent multiple debugging when first session uses gdba. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie CC Mode update to 5.31. @@ -15736,7 +15736,7 @@ New macros c-sentence-end and c-default-value-sentence end, to cope with Emacs 22's new function `sentence-end'. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-cmds.el (c-show-syntactic-information): Solve the compat issue using `c-put-overlay' and `c-delete-overlay'. @@ -15744,7 +15744,7 @@ * progmodes/cc-defs.el (c-put-overlay, c-delete-overlay): New compat macros to handle overlays/extents. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-fix.el: Add definitions of the macros push and pop (for GNU Emacs 20.4). @@ -15761,7 +15761,7 @@ call to the new macro c-int-to-char. This solves XEmacs's regarding characters as different from integers. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-fonts.el (c-make-syntactic-matcher): New internal helper. @@ -15777,7 +15777,7 @@ * progmodes/cc-fonts.el (c-negation-char-face-name): New variable to map to `font-lock-negation-char-face' in emacsen where it exists. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-mode.el: Bind c-subword-mode to C-c C-w. @@ -15787,12 +15787,12 @@ * progmodes/cc-mode.el: Added tty suitable bindings for C-c and C-c C-. (To the c-hungry- delete functions). -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-mode.el: Added autoload directive for `c-subword-move-mode' for use in older emacsen. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-mode.el: (i): Insert a binding for C-c C-backspace into @@ -15810,7 +15810,7 @@ * progmodes/cc-awk.el: Apply a tidy-up patch (from Stefan Monnier). -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-fonts.el, progmodes/cc-vars.el (gtkdoc-font-lock-doc-comments, gtkdoc-font-lock-doc-protection) @@ -15829,7 +15829,7 @@ key behavior in XEmacs according to `delete-forward-p'. C.f. `c-electric-delete'. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-mode.el: Give c-hungry-backspace and c-hungry-delete-forward permanent key bindings. @@ -15847,7 +15847,7 @@ response to a report from Joseph Kiniry that it was difficult to understand. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-engine.el (c-on-identifier): Fix bug when at the first char of an identifier. @@ -15855,7 +15855,7 @@ * progmodes/cc-engine.el (c-on-identifier): Handle the "operator +" syntax in C++. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el (c-mask-paragraph): Correct, so that auto-fill doesn't split a c-comment's last word from a hanging @@ -15871,7 +15871,7 @@ with blank comment-prefix, and a blank line as the comment's second line. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-fonts.el (c-cpp-matchers, c-basic-matchers-before): Incorporate the patterns added in the Emacs development branch @@ -15883,7 +15883,7 @@ * progmodes/cc-engine.el (c-literal-faces): Add `font-lock-comment-delimiter-face' which is new in Emacs 22. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el: Make C-c C-a (`c-toggle-auto-newline') forcibly enable c-electric-flag. @@ -15892,7 +15892,7 @@ `comment-close-slash' on c-electric-slash: if enabled, typing `/' just after the comment-prefix of a C-style comment will close that comment. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-fonts.el (c-basic-matchers-before) (c-complex-decl-matchers): Fix the "not-arrow-prefix" regexp used @@ -15956,11 +15956,11 @@ Enable heuristics below the point to cope with classes inside special brace lists in Pike. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el: Amend c-point-syntax to handle macros. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-guess.el (cc-guess-install): New function to install an already guessed style in another buffer. @@ -15969,7 +15969,7 @@ sets `inhibit-read-only' - `c-save-buffer-state' should be used anyway if the change always is undone. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie Implement togglable electricity: @@ -16009,7 +16009,7 @@ (c-electric-semi&comma, c-electric-colon, c-electric-paren): restructure a bit. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-cmds.el (c-show-syntactic-information): Show the anchor position(s) using faces. Thanks to Masatake YAMATO for the idea. @@ -16037,7 +16037,7 @@ (c-subword-move-mode): Minor mode that replaces all the standard word handling functions with their subword equivalences. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-vars.el (c-cleanup-list): Insert a customization entry for one-liner-defun. @@ -16064,7 +16064,7 @@ c-max-one-liner-length. In c-default-style, set the default style for AWK to "awk". -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-engine.el (c-forward-label): Fix fontification of macros inside labels. @@ -16139,7 +16139,7 @@ * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix a macro related issue. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-awk.el: Change the terminology of regexps: A char list is now [asdf], a char class [:alpha:]. @@ -16175,14 +16175,14 @@ c-string-par-start, c-string-par-separate to be more like Text Mode than Fundamental Mode. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-fonts.el (c-font-lock-declarations): Always narrow to the fontified region so that fontification doesn't occur outside it (could happen e.g. when fontifying a line with an unfinished declaration). -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-awk.el: Move regexps for analyzing AWK code to near the start of the file. ^L now separate sections of the file. @@ -16220,7 +16220,7 @@ * progmodes/cc-mode.el: Fix what's almost a semantic ambiguity in a comment. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-brace): Clean up using `c-tentative-buffer-changes'. @@ -16241,7 +16241,7 @@ avoid some false alarms. * progmodes/cc-engine.el, progmodes/cc-langs.el (c-looking-at-inexpr-block): - Fixed a situation where an error could be thrown for unbalanced + Fix a situation where an error could be thrown for unbalanced parens. Changed to make use of c-keyword-member' to avoid some repeated regexp matches. @@ -16279,7 +16279,7 @@ * progmodes/cc-defs.el (c-point): Add `bosws' and `eosws'. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el, progmodes/cc-styles.el: * progmodes/cc-vars.el: New variables @@ -16290,7 +16290,7 @@ * progmodes/cc-cmds.el (c-electric-brace): Don't delete a comment which precedes the newly inserted `{'. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-engine.el, progmodes/cc-langs.el: Rewrote the recognition function for declaration level blocks. It should now cope with @@ -16475,7 +16475,7 @@ when macros occur in obscure places. Optimized the sexp movement a bit. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie Enhancements for c-beginning-of-statement to work in AWK Mode: @@ -16498,7 +16498,7 @@ * progmodes/cc-mode.el: Put M-a and M-e into awk-mode-map. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-engine.el, progmodes/cc-fonts.el: * progmodes/cc-langs.el: Cleaned up the @@ -16650,13 +16650,13 @@ (c-lineup-math): Change to use `c-lineup-assignments'. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el: Fix some bugs in subfunctions of c-beginning-of-statement. New subfunctions c-in-comment-line-prefix-p, c-narrow-to-comment-innards. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-fonts.el, progmodes/cc-langs.el: Use `c-simple-ws' instead of hardcoded char classes wherever possible. Changed a couple of @@ -16688,7 +16688,7 @@ in `regexp-opt' in Emacs 20 and XEmacs when strings contain newlines. Allow and ignore nil elements in the list. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el: Comment out a (n almost certainly superfluous) check, (eq here (point-max)) in c-beginning-of-statement. @@ -16712,7 +16712,7 @@ c-beginning-of-statement, including new variable c-block-comment-start-regexp. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-langs.el (c-known-type-key): Optimize simple symbols from `*-font-lock-extra-types' so that there's no need to @@ -16731,7 +16731,7 @@ * progmodes/cc-vars.el (c-emacs-features): Remove compatibility with older emacsen: We now require `pps-extended-state'. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el: New function c-beginning-of-sentence, which obviates the need to hack sentence-end. This now handles @@ -16746,7 +16746,7 @@ * progmodes/cc-cmds.el: Restructure c-beginning-of-statement: Improve its doc-string. Improve the handling of certain specific cases. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-engine.el, progmodes/cc-fonts.el, progmodes/cc-langs.el (c-guess-basic-syntax): Change the way class-level labels are @@ -16857,16 +16857,16 @@ `template-args-cont' in nested template arglists. There's still much to be desired in this area, though. -2005-12-08 Alan Mackenzie +2005-12-08 Alan Mackenzie * progmodes/cc-cmds.el, progmodes/cc-engine.el: * progmodes/cc-langs.el, progmodes/cc-vars.el: Make the "Text Filling and Line Breaking" commands work for AWK buffers. -2005-12-08 Martin Stjernholm +2005-12-08 Martin Stjernholm * progmodes/cc-defs.el, progmodes/cc-engine.el (c-mode-is-new-awk-p): - Removed; (c-major-mode-is 'awk-mode) can be used instead now. + Remove; (c-major-mode-is 'awk-mode) can be used instead now. * progmodes/cc-mode.el: Always set up AWK mode since emacsen where it doesn't work no longer are supported. @@ -17613,7 +17613,7 @@ 2005-11-24 Chong Yidong - * hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'. + * hi-lock.el (hi-lock-buffer-mode): Rename from `hi-lock-mode'. Use define-minor-mode, and make it a local mode. Turn on font-lock. (hi-lock-mode): New global minor mode. (turn-on-hi-lock-if-enabled): New function. @@ -17659,8 +17659,8 @@ New functions. (org-move-item-down, org-move-item-up): New commands. (org-export-as-html): New classes for CSS support. Bug fix in - regular expression detecting fixed-width regions. Respect - `org-local-list-ordered-item-terminator'. + regular expression detecting fixed-width regions. + Respect `org-local-list-ordered-item-terminator'. (org-set-autofill-regexps, org-adaptive-fill-function): "1)" is also a list item. (org-metaup, org-metadown, org-shiftmetaup, org-shiftmetadown): @@ -17685,8 +17685,8 @@ (gdb-var-update-handler): Find values for all variable objects. (gdb-info-frames-custom): Identify frames by leading "#". - * progmodes/gud.el (gud-speedbar-menu-items): Add - gdb-speedbar-auto-raise as radio button. + * progmodes/gud.el (gud-speedbar-menu-items): + Add gdb-speedbar-auto-raise as radio button. (gud-speedbar-buttons): Raise speedbar if requested. Don't match on "char **...". (gud-speedbar-buttons): Add (pointer) value for non-leaves. @@ -20089,8 +20089,8 @@ 2005-10-17 Bill Wohler Move all remaining images from lisp/toolbar to etc/images, move - lisp/toolbar/tool-bar to lisp and "delete" lisp/toolbar. Place - the low resolution images in their own directory (low-color). + lisp/toolbar/tool-bar to lisp and "delete" lisp/toolbar. + Place the low resolution images in their own directory (low-color). * toolbar/attach.*, toolbar/cancel.*, toolbar/close.* * toolbar/copy.*, toolbar/cut.*, toolbar/diropen.*, toolbar/exit.* @@ -20357,8 +20357,8 @@ 2005-10-13 Jan Djärv * toolbar/diropen.xpm, toolbar/diropen.pbm: New versions made from - Gnome file-manager.png. Suggested by - Joachim Nilsson . + Gnome file-manager.png. + Suggested by Joachim Nilsson . * toolbar/README: Add diropen.xpm. @@ -20636,8 +20636,8 @@ trailing ":". Reported by Kurt Steinkraus . (tramp-chunksize): Improve docstring. (tramp-set-auto-save-file-modes): Octal integer code #o600 breaks - Emacs 20. Use `tramp-octal-to-decimal' therefore. Reported by - Christian Joergensen . + Emacs 20. Use `tramp-octal-to-decimal' therefore. + Reported by Christian Joergensen . 2005-10-07 Glenn Morris @@ -20792,8 +20792,8 @@ * emulation/viper-cmd.el (viper-normalize-minor-mode-map-alist) (viper-refresh-mode-line): Use make-local-variable to localize - some vars instead of make-variable-buffer-local. Suggested by - Stefan Monnier. + some vars instead of make-variable-buffer-local. + Suggested by Stefan Monnier. * emulation/viper-init.el (viper-make-variable-buffer-local): Delete alias. @@ -21035,23 +21035,23 @@ Frame management code (including timer, and mouse click specifics) moved to dframe.el: - (speedbar-attached-frame): Removed. Use dframe-attached-frame. - (speedbar-timer): Removed. Use dframe-timer. - (speedbar-close-frame): Removed. Use dframe-close-frame. - (speedbar-activity-change-focus-flag): Removed. Use - dframe-activity-change-focus-flag. - (speedbar-update-speed, speedbar-navigating-speed): Obsolete. Use - dframe-update-speed. + (speedbar-attached-frame): Remove. Use dframe-attached-frame. + (speedbar-timer): Remove. Use dframe-timer. + (speedbar-close-frame): Remove. Use dframe-close-frame. + (speedbar-activity-change-focus-flag): Remove. + Use dframe-activity-change-focus-flag. + (speedbar-update-speed, speedbar-navigating-speed): Obsolete. + Use dframe-update-speed. (speedbar-current-frame): New macro. Use this instead of the variable speedbar-frame. (speedbar-use-images, speedbar-expand-image-button-alist) - (speedbar-insert-image-button-maybe): Moved to sb-image.el. + (speedbar-insert-image-button-maybe): Move to sb-image.el. - (speedbar-find-image-on-load-path): Removed. Replaced by + (speedbar-find-image-on-load-path): Remove. Replaced by defezimage in ezimage.el. - (speedbar-expand-image-button-alist): Removed. Replaced by + (speedbar-expand-image-button-alist): Remove. Replaced by ezimage-expand-image-button-alist in ezimage.el. (speedbar-ignored-directory-regexp) @@ -21059,7 +21059,7 @@ (speedbar-ignored-directory-expressions) (speedbar-line-directory, speedbar-buffers-line-directory) (speedbar-directory-line, speedbar-buffers-line-directory): - Renamed, replacing `path' with `directory'. + Rename, replacing `path' with `directory'. (speedbar-create-directory, speedbar-expand-line-descendants) (speedbar-toggle-line-expansion) @@ -21617,8 +21617,8 @@ 2005-09-17 Milan Zamazal - * progmodes/glasses.el (glasses-make-readable): If - glasses-separator differs from underscore, put appropriate + * progmodes/glasses.el (glasses-make-readable): + If glasses-separator differs from underscore, put appropriate overlays over underscore characters. (glasses-convert-to-unreadable): If glasses-separator differs from underscore, try to convert glasses-separator characters to @@ -21975,7 +21975,7 @@ * custom.el (custom-known-themes): Clarify meaning of "standard". (custom-push-theme): Save old values in the standard theme. (disable-theme): Correct typo. - (custom-face-theme-value): Deleted unused function. + (custom-face-theme-value): Delete unused function. (custom-theme-recalc-face): Rewritten to treat enable/disable properly. 2005-09-05 Stefan Monnier @@ -25828,14 +25828,14 @@ (antlr-font-lock-default-face, antlr-font-lock-keyword-face) (antlr-font-lock-syntax-face, antlr-font-lock-ruledef-face) (antlr-font-lock-tokendef-face, antlr-font-lock-ruleref-face) - (antlr-font-lock-tokenref-face, antlr-font-lock-literal-face): New - backward-compatibility aliases for renamed faces. + (antlr-font-lock-tokenref-face, antlr-font-lock-literal-face): + New backward-compatibility aliases for renamed faces. (antlr-default-face, antlr-keyword-face, antlr-syntax-face) (antlr-ruledef-face, antlr-tokendef-face, antlr-ruleref-face) (antlr-tokenref-face, antlr-literal-face): Variables renamed to remove "font-lock-". Use renamed antlr-mode faces. - (antlr-font-lock-additional-keywords): Use renamed faces. Replace - literal face-names with face variable references. + (antlr-font-lock-additional-keywords): Use renamed faces. + Replace literal face-names with face variable references. * buff-menu.el (Buffer-menu-buffer): Remove "-face" suffix from face name. @@ -27387,7 +27387,7 @@ * emacs-lisp/cl.el (acons, pairlis): Add docstring. -2005-05-23 Martin Stjernholm +2005-05-23 Martin Stjernholm CC Mode update to 5.30.10: @@ -27417,7 +27417,7 @@ * progmodes/cc-engine.el (c-guess-basic-syntax): Fix anchoring in `objc-method-intro' and `objc-method-args-cont'. -2005-05-23 Alan Mackenzie +2005-05-23 Alan Mackenzie CC Mode update to 5.30.10: @@ -28294,8 +28294,8 @@ 2005-05-11 Stefan Monnier - * files.el (executable-find): Move from executable.el. Use - locate-file. + * files.el (executable-find): Move from executable.el. + Use locate-file. * progmodes/executable.el (executable-find): Move to files.el. * font-lock.el (font-lock-fontify-keywords-region): Use a marker @@ -28524,8 +28524,8 @@ * term/mac-win.el: Don't define or bind scroll bar functions if x-toolkit-scroll-bars is t. - (x-select-text, x-get-selection-value): Clear - x-last-selected-text-clipboard if x-select-enable-clipboard is + (x-select-text, x-get-selection-value): + Clear x-last-selected-text-clipboard if x-select-enable-clipboard is nil. (PRIMARY): Put mac-scrap-name property. (mac-select-convert-to-file-url): New function. @@ -30854,8 +30854,8 @@ Catch `dont-send' signal. (tramp-set-auto-save-file-modes): Set always permissions, because there might be an old auto-saved file belonging to another - original file. This could be a security threat. Reported by - Kjetil Kjernsmo . + original file. This could be a security threat. + Reported by Kjetil Kjernsmo . Check for Emacs 21.3.50 removed. * net/tramp-smb.el (all): Remove debug construct for @@ -31383,7 +31383,7 @@ 2005-03-07 Karl Chen - * align.el (align-rules-list): Added an alignment rule for CSS + * align.el (align-rules-list): Add an alignment rule for CSS declarations (applies to css-mode and html-mode buffers). 2005-03-07 Stefan Monnier @@ -32731,8 +32731,8 @@ * net/tramp-vc.el (tramp-vc-do-command, tramp-vc-do-command-new) (tramp-vc-simple-command): Call `tramp-handle-shell-command' but - `shell-command', because it isn't magic in XEmacs. Reported by - Adrian Aichner . + `shell-command', because it isn't magic in XEmacs. + Reported by Adrian Aichner . * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add entry for `substitute-in-file-name'. === modified file 'lisp/ChangeLog.15' --- lisp/ChangeLog.15 2014-03-07 00:01:19 +0000 +++ lisp/ChangeLog.15 2014-08-28 22:18:39 +0000 @@ -8502,7 +8502,7 @@ * tutorial.el (help-with-tutorial): Hack safe file-local variables after reading the tutorial. -2010-08-06 Alan Mackenzie +2010-08-06 Alan Mackenzie * progmodes/cc-cmds.el (c-mask-paragraph, c-fill-paragraph): Fix for the case that a C style comment has its delimiters alone on @@ -8844,9 +8844,9 @@ (sql-mode-menu): Add submenu to select connections. (sql-interactive-mode-menu): Add "Save Connection" item. (sql-add-product): Fix menu item. - (sql-get-product-feature): Improved error handling. + (sql-get-product-feature): Improve error handling. (sql--alt-buffer-part, sql--alt-if-not-empty): Remove. - (sql-make-alternate-buffer-name): Simplified. + (sql-make-alternate-buffer-name): Simplify. (sql-product-interactive): Handle missing product. (sql-connect): Support string keys, minor improvements. (sql-save-connection): New function. @@ -8908,7 +8908,7 @@ (sql-connection-alist): New variable. (sql-connect): New function. (sql--alt-buffer-part, sql--alt-if-not-empty) - (sql-make-alternate-buffer-name): Improved alternative buffer name. + (sql-make-alternate-buffer-name): Improve alternative buffer name. 2010-07-17 Thierry Volpiatto @@ -9383,7 +9383,7 @@ `compose-mail-user-agent-warnings', instead of to the nonexistent `compose-mail-check-user-agent'. -2010-06-21 Alan Mackenzie +2010-06-21 Alan Mackenzie Fix an indentation bug: @@ -9392,7 +9392,7 @@ of existing values. * progmodes/cc-engine.el (c-clear-<-pair-props-if-match-after) - (c-clear->-pair-props-if-match-before): now return t when they've + (c-clear->-pair-props-if-match-before): Now return t when they've cleared properties, nil otherwise. (c-before-change-check-<>-operators): Set c-new-beg/end correctly by taking account of the existing value. === modified file 'lisp/ChangeLog.16' --- lisp/ChangeLog.16 2014-06-26 00:34:54 +0000 +++ lisp/ChangeLog.16 2014-08-28 22:18:39 +0000 @@ -1,6 +1,6 @@ 2013-03-11 Glenn Morris - * Version 24.3 released. + * Version 24.3 released. 2013-03-11 Stefan Monnier @@ -17100,7 +17100,7 @@ * vc/ediff-init.el (ediff-toggle-read-only-function): Use toggle-read-only. -2011-10-22 Alan Mackenzie +2011-10-22 Alan Mackenzie Fix bug #9560, sporadic wrong indentation; improve instrumentation of c-parse-state. === modified file 'lisp/ChangeLog.3' --- lisp/ChangeLog.3 2014-01-16 06:24:06 +0000 +++ lisp/ChangeLog.3 2014-08-28 22:18:39 +0000 @@ -26,7 +26,7 @@ (find-file-read-only-other-window): Likewise. (find-file-read-only-other-frame): Likewise. - * timer.el (cancel-function-timers): Renamed from spurious duplicate + * timer.el (cancel-function-timers): Rename from spurious duplicate definition of cancel-timer. * add-log.el (find-change-log): Use file-chase-links. @@ -82,7 +82,7 @@ * paths.el (Info-default-directory-list): Take out ../../info. Avoid duplication. - (manual-formatted-dirlist, manual-formatted-dir-prefix): Deleted. + (manual-formatted-dirlist, manual-formatted-dir-prefix): Delete. * subr.el (baud-rate): Doc fix. @@ -137,7 +137,7 @@ Delete the "local thinking machines" definitions at the end since they caused compilation failure. - * cl.el (cl-member): Renamed from member. + * cl.el (cl-member): Rename from member. * time.el (display-time-day-and-date): Use defvar, not defconst. @@ -163,7 +163,7 @@ (timezone-make-date-sortable): Make autoload for this. (rmail-sort-by-recipient): Downcase the strings for sorting. (rmail-sort-by-recipient): Likewise. - (rmail-sort-by-lines): Renamed from rmail-sort-by-size-lines. + (rmail-sort-by-lines): Rename from rmail-sort-by-size-lines. Use numbers to sort by. (rmail-summary-...): New functions. Bind in rmail-summary-mode-map. (rmail-sort-from-summary): New function. @@ -172,10 +172,10 @@ Choose string< or < as predicate. Reorder messages by exchanging them, with inhibit-quit bound. (rmail-fetch-field): Start by widening. - (rmail-sortable-date-string): Deleted. + (rmail-sortable-date-string): Delete. (rmail-make-date-sortable): New function, used instead. - * paths.el (gnus-local-organization): Renamed from ...-your-... + * paths.el (gnus-local-organization): Rename from ...-your-... (gnus-local-domain): Likewise. 1993-05-26 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -185,8 +185,8 @@ (set-face-font): Only use x-resolve-font-name if FONT is a string. Copying a faces shouldn't resolve the font. - * paths.el (Info-default-directory-list): Add - configure-info-directory to this list. + * paths.el (Info-default-directory-list): + Add configure-info-directory to this list. 1993-05-26 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -247,15 +247,15 @@ 1993-05-25 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) - * term/x-win.el (command-switch-alist, x-switch-definitions): Treat - `-i' like `-itype', as in Emacs 18. + * term/x-win.el (command-switch-alist, x-switch-definitions): + Treat `-i' like `-itype', as in Emacs 18. 1993-05-25 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) * Version 19.8 released. - * startup.el (command-line-1): Don't handle `-i'. We're - abandoning the `insert file' meaning in favor of the `use a + * startup.el (command-line-1): Don't handle `-i'. + We're abandoning the `insert file' meaning in favor of the `use a bitmapped icon' meaning. * faces.el (set-face-font): Call x-resolve-font-name on the font @@ -265,8 +265,8 @@ * iso-syntax.el: Make downcase into a proper case table before passing it to set-standard-case-table. - * disp-table.el (standard-display-european): Doc fix. Make - it autoload. Make it respond to prefix arg like a minor mode. + * disp-table.el (standard-display-european): Doc fix. + Make it autoload. Make it respond to prefix arg like a minor mode. 1993-05-24 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -360,8 +360,8 @@ 1993-05-22 Jim Blandy (jimb@geech.gnu.ai.mit.edu) - * cl.el (cl-floor, cl-ceiling, cl-truncate, cl-round): Renamed - from floor, ceiling, truncate, and round; the old names conflict + * cl.el (cl-floor, cl-ceiling, cl-truncate, cl-round): + Rename from floor, ceiling, truncate, and round; the old names conflict with built-in functions. 1993-05-22 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -524,7 +524,7 @@ 1993-05-16 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * texinfo.el (texinfo-chapter-level-regexp): Copied here. + * texinfo.el (texinfo-chapter-level-regexp): Copy here. 1993-05-17 Roland McGrath (roland@geech.gnu.ai.mit.edu) @@ -536,7 +536,7 @@ * gnus.el, gnuspost.el, gnusmail.el, gnusmisc.el, * nntp.el, nnspool.el, mhspool.el: Version 3.15 from Umeda. - * frame.el (toggle-scroll-bar): Renamed from toggle-vertical-scroll... + * frame.el (toggle-scroll-bar): Rename from toggle-vertical-scroll... 1993-05-16 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -623,14 +623,14 @@ * menu-bar.el (menu-bar-mode): New command. Use for initialization. * faces.el (make-face): Add interactive spec. - (set-default-font): Deleted. + (set-default-font): Delete. * isearch.el (isearch-mode-map): Handle any length vector in keymap. (isearch-char-to-string): Handle non-character events properly. 1993-05-14 Jim Blandy (jimb@geech.gnu.ai.mit.edu) - * subr.el (overlay-start, overlay-end, overlay-buffer): Removed. + * subr.el (overlay-start, overlay-end, overlay-buffer): Remove. * vc.el (vc-version-diff): Match parens. @@ -643,26 +643,26 @@ * emerge.el: Installed version 5 from drw. Merged in previous FSF changes, plus new changes: - (emerge-count-matches-string): Renamed from count-matches-string. + (emerge-count-matches-string): Rename from count-matches-string. (emerge-command-prefix): Now C-c C-c. - (emerge-shadow-key-definition): Deleted. - Callers use substitute-key-definition. - (emerge-recursively-substitute-key-definition): Deleted. - Callers use substitute-key-definition. - (emerge-unselect-hook): Renamed from emerge-unselect-hooks. + (emerge-shadow-key-definition): Delete. + Callers use substitute-key-definition. + (emerge-recursively-substitute-key-definition): Delete. + Callers use substitute-key-definition. + (emerge-unselect-hook): Rename from emerge-unselect-hooks. (emerge-files-internal): Use file-local-copy to handle remote files. (emerge-files-with-ancestor-internal): Likewise. - (emerge-remote-file-p): Deleted. + (emerge-remote-file-p): Delete. (emerge-abort): New command. - (describe-mode): Deleted. - (emerge-hash-string-into-string): Renamed from hash-string-into-string. - (emerge-unslashify-name): Renamed from unslashify-name. + (describe-mode): Delete. + (emerge-hash-string-into-string): Rename from hash-string-into-string. + (emerge-unslashify-name): Rename from unslashify-name. (emerge-write-and-delete): Don't write-file if file-out is nil. (emerge-setup-fixed-keymaps): Put emerge-abort on C-]. - (emerge-find-difference-diff): Renamed from emerge-find-difference. + (emerge-find-difference-diff): Rename from emerge-find-difference. (emerge-find-difference): New command. Now on `.'. - (emerge-diff-ok-lines-regexp): Renamed from emerge-diff-ok-lines. - (emerge-diff3-ok-lines-regexp): Renamed from emerge-diff3-ok-lines. + (emerge-diff-ok-lines-regexp): Rename from emerge-diff-ok-lines. + (emerge-diff3-ok-lines-regexp): Rename from emerge-diff3-ok-lines. 1993-05-13 Paul Eggert (eggert@twinsun.com) @@ -877,9 +877,9 @@ * comint.el (comint-previous-matching-input): New command, on M-r. (comint-next-matching-input): New command, on M-s. - (comint-previous-similar-input): Commented out. + (comint-previous-similar-input): Comment out. (comint-next-similar-input): Likewise. - (comint-previous-input-matching): Deleted. + (comint-previous-input-matching): Delete. (comint-last-input-match): Var commented out. (comint-mode): Don't make comint-last-input-match local. @@ -911,8 +911,8 @@ * help.el (help-for-help): Use lower case letters for help options. - * rect.el (string-rectangle): Renamed from fill-rectangle. - (string-rectangle-line): Renamed from fill-rectangle-line. + * rect.el (string-rectangle): Rename from fill-rectangle. + (string-rectangle-line): Rename from fill-rectangle-line. 1993-05-01 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -944,8 +944,8 @@ FORCE argument non-nil, so that we don't get an error if the mark isn't set yet. - * edebug.el (global-edebug-prefix, global-edebug-map): Add - autoload cookies for these, so they are present when Emacs starts + * edebug.el (global-edebug-prefix, global-edebug-map): + Add autoload cookies for these, so they are present when Emacs starts up. * edebug.el (global-edebug-map): Bind `C-x X d' to edebug-defun in @@ -957,7 +957,7 @@ * complete.el: New file. - * vc.el (vc-match-substring): Renamed from match-substring. + * vc.el (vc-match-substring): Rename from match-substring. (vc-parse-buffer): Use new name. * shell.el (shell-prompt-pattern): Undo last change. @@ -965,7 +965,7 @@ * files.el (file-truename): Redo esr's change. * loaddefs.el: Put arrow key bindings back to the ordinary Emacs cmds. - * simple.el (up-arrow, down-arrow, left-arrow, right-arrow): Deleted. + * simple.el (up-arrow, down-arrow, left-arrow, right-arrow): Delete. * simple.el (kill-line, next-line-add-newlines): Doc fix. (kill-whole-line): Doc fix. @@ -1089,42 +1089,42 @@ * gud.el: Set no-byte-compile local variable t to work around a byte-compiler bug. - (gud-def, global-map): Move C-x C-a commands to global map. Restore - original C-x SPC global binding. + (gud-def, global-map): Move C-x C-a commands to global map. + Restore original C-x SPC global binding. * vc.el (vc-diff): Get proper error message when you run this with no prefix arg on an empty buffer. (vc-directory): Better directory format --- replace the user and group IDs with locking-user (if any). - (vc-finish-logentry, vc-next-comment, vc-previous-comment): Replace - *VC-comment-buffer* with a ring vector. + (vc-finish-logentry, vc-next-comment, vc-previous-comment): + Replace *VC-comment-buffer* with a ring vector. 1993-04-25 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) - * simple.el (down-arrow): New function. Uses - next-line-add-newlines to suppress addition of new lines at end of + * simple.el (down-arrow): New function. + Uses next-line-add-newlines to suppress addition of new lines at end of buffer. (up-arrow): Alias of previous-line, added for consistency. These changes complete terminal-type-independent support for arrow keys. - * tex-mode.el (tex-compilation-parse-errors): Added. At the + * tex-mode.el (tex-compilation-parse-errors): Add. At the moment, this would have to be applied manually. It's not worth trying to integrate this with the rest of the mode more tightly until we decide whether and how compile's interface is going to change away from a closed subsystem. - * files.el (cd): Changed to use to resolve relative cd calls. - (cd-absolute): Added. This is actually the old cd code with a + * files.el (cd): Change to use to resolve relative cd calls. + (cd-absolute): Add. This is actually the old cd code with a changed doc string. - (parse-colon-path): Added. Path-to-string exploder --- may be + (parse-colon-path): Add. Path-to-string exploder --- may be useful elsewhere. * ring.el: Added and fixed documentation. (ring-rotate): Nuked. It was (a) unused, and (b) totally broken (as in, any attempt to use it died with a type error, and when I patched it to fix that I found its algorithm was broken). - (ring-ref): Added doc string. + (ring-ref): Add doc string. 1993-04-25 Jim Blandy (jimb@totoro.cs.oberlin.edu) @@ -1144,7 +1144,7 @@ 1993-04-23 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) - * bytecomp.el (define-function): Changed name back to defaliases + * bytecomp.el (define-function): Change name back to defaliases to get things in a known-good state. The unload patch had been half-applied, leading to lossage. @@ -1158,7 +1158,7 @@ * telnet.el: Commentary added. (telnet): Doc fix. - (rsh): Added entry point for rsh to remote host, per suggestion by + (rsh): Add entry point for rsh to remote host, per suggestion by Michael McNamara . No change to any other code. * info.el (Info-find-node, Info-insert-subfile): Do the right @@ -1166,15 +1166,15 @@ saving me lots of disk space. * simple.el: All fsets changed to defaliases. - (kill-forward-chars, kill-backward-chars): Deleted. These were + (kill-forward-chars, kill-backward-chars): Delete. These were internal subroutines used by delete-char and delete-backward-char before those functions were moved into the C kernel. Now nothing uses them. - (kill-line): Added kill-whole-line variable. Defaults to nil; a + (kill-line): Add kill-whole-line variable. Defaults to nil; a non-nil value causes a kill-line at the beginning of a line to kill the newline as well as the line. I find it very convenient. Emulates Unipress' &kill-lines-magic variable. - (next-line): Added next-line-add-newlines variable. If nil, + (next-line): Add next-line-add-newlines variable. If nil, next-line will not insert newlines when invoked at the end of a buffer. This obviates three LCD packages. (left-arrow, right-arrow): New functions. These do backward-char @@ -1182,7 +1182,7 @@ left or right as necessary to make sure point is visible. * loaddefs.el: All fsets changes to defaliases. - (global-map): Changed bindings of [left] and [right] to left-arrow and + (global-map): Change bindings of [left] and [right] to left-arrow and right-arrow respectively. 1993-04-22 Roland McGrath (roland@mole.gnu.ai.mit.edu) @@ -1240,7 +1240,7 @@ 1993-04-16 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) * electric.el (shrink-window-if-larger-than-buffer): - Moved to window.el. + Move to window.el. 1993-04-16 Jim Blandy (jimb@totoro.cs.oberlin.edu) @@ -1267,12 +1267,12 @@ 1993-04-14 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * resume.el (resume-suspend-hook): Renamed from empty-args-file. + * resume.el (resume-suspend-hook): Rename from empty-args-file. Add autoload cookie. - (resume-emacs-args-buffer): Renamed. - (resume-write-buffer-to-file): Renamed. + (resume-emacs-args-buffer): Rename. + (resume-write-buffer-to-file): Rename. - * two-column.el (tc-dissociate): Renamed from tc-kill-association. + * two-column.el (tc-dissociate): Rename from tc-kill-association. Move binding to C-x 6 d. 1993-04-14 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -1291,7 +1291,7 @@ * gud.el (gud-mode): Created C-c synonym bindings in the GUD buffer's local map. - (gud-key-prefix): Changed to C-x C-a. + (gud-key-prefix): Change to C-x C-a. 1993-04-14 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) @@ -1307,11 +1307,11 @@ ability to browse package commentary sections and a completely point-and-shoot interface similar to Dired's. - * window.el (shrink-window-if-larger-than-buffer): Moved from + * window.el (shrink-window-if-larger-than-buffer): Move from electric.el to windows.el, minor bug fix. This is to avoid code duplication between vc.el, electric.el, and finder.el. - (ctl-x-map): Added C-x - and C-x + as experimental bindings for + (ctl-x-map): Add C-x - and C-x + as experimental bindings for shrink-window-if-larger-than-buffer and balance-windows respectively. Since shrink-window-if-larger-than-buffer has to live here anyhow, let users use it to manage screen space. @@ -1354,7 +1354,7 @@ 1993-04-10 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) - * gud.el (gdb, sdb, dbx): Improved prompting a la grep. + * gud.el (gdb, sdb, dbx): Improve prompting a la grep. * comint.el: Clean up cmu* uses in header comments. @@ -1380,8 +1380,8 @@ 1993-04-09 Jim Blandy (jimb@totoro.cs.oberlin.edu) - * subr.el (overlay-start, overlay-end, overlay-buffer): New - defsubsts. + * subr.el (overlay-start, overlay-end, overlay-buffer): + New defsubsts. * finder.el (finder-by-keyword): Build an alist to pass to completing-read, instead of building an invalid obarray. @@ -1443,7 +1443,7 @@ (compile-internal): Make it the process's filter. * compile.el (compilation-error-regexp-alist): - Fixed MIPS CC regexp to match file + Fix MIPS CC regexp to match file names longer than one char. (compilation-parse-errors): Error if compilation-error-regexp-alist is nil. @@ -1473,7 +1473,7 @@ * compile.el (compilation-filter): New function. (compile-internal): Make it the process's filter. - * compile.el (compilation-error-regexp-alist): Fixed MIPS CC + * compile.el (compilation-error-regexp-alist): Fix MIPS CC regexp to match file names longer than one char. (compilation-parse-errors): Error if compilation-error-regexp-alist is nil. @@ -1492,7 +1492,7 @@ (add-change-log-entry): FILE-NAME frobnicating code moved there; call it. * vc.el (vc-comment-to-change-log): - Renamed from vc-comment-to-changelog. + Rename from vc-comment-to-changelog. Take optional arg and pass it to find-change-log. Added docstring and interactive spec. @@ -1505,7 +1505,7 @@ Apollo cc regexp: make "s optional, and don't anchor to bol. * compile.el (compilation-error-regexp-alist): - Changed MIPS RISC CC regexp (last one) to + Change MIPS RISC CC regexp (last one) to be anchored at bol, and to never match multiple lines. 1993-04-03 Eric S. Raymond (eric@geech.gnu.ai.mit.edu) @@ -1528,7 +1528,7 @@ * mpuz.el (mpuz-try-letter): Use read-char to read digit. Use message directly also. Use downcase. - (mpuz-read-map): Deleted. + (mpuz-read-map): Delete. * dired.el (dired-unmark-all-files): Read the arg as just a char. @@ -1614,7 +1614,7 @@ 1993-03-29 Eric S. Raymond (eric@geech.gnu.ai.mit.edu) * vc.el (vc-next-action, vc-print-log, vc-diff, vc-revert-buffer): - Improved logic for parent buffer finding. + Improve logic for parent buffer finding. (vc-cancel-version): Bug fix. @@ -1627,7 +1627,7 @@ * fill.el (fill-individual-paragraphs): When skipping mail headers, skip to a blank line. - * env.el (setenv): Renamed back from putenv. + * env.el (setenv): Rename back from putenv. * replace.el (regexp-history): New history list. (occur, flush-lines, keep-lines, how-many): Use it. @@ -1638,7 +1638,7 @@ 1993-03-28 Noah Friedman (friedman@splode.com) * setenv.el: Renamed to env.el. Provide `env', not `setenv'. - (setenv): Renamed to `putenv', which is the more proper complement + (setenv): Rename to `putenv', which is the more proper complement of `getenv'. `setenv' retained as an alias. Make VALUE parameter optional; if not set, remove VARIABLE from process-environment. @@ -1664,10 +1664,10 @@ * makefile.el: Added autoload cookie for entry point. - * files.el (auto-mode-alist): Added pairs for .ms, .man, .mk, + * files.el (auto-mode-alist): Add pairs for .ms, .man, .mk, [Mm]akefile, .lex. - * electric.el (shrink-window-if-larger-than-buffer): Added doc + * electric.el (shrink-window-if-larger-than-buffer): Add doc string. Made argument optional, because window-buffer does the right thing with nil. @@ -1691,8 +1691,8 @@ * rlogin.el: Updated copyright year and added autoload cookies. (rlogin): Set process marker to beginning of buffer. - (rlogin-filter): Use unwind-protect to restore match-data. Use - insert-before-markers instead of insert to keep input and output + (rlogin-filter): Use unwind-protect to restore match-data. + Use insert-before-markers instead of insert to keep input and output from getting garbled. Delete spurious ?\C-m chars in output instead of replacing them with ?\ . @@ -1710,26 +1710,26 @@ 1993-03-27 Eric S. Raymond (eric@geech.gnu.ai.mit.edu) - * lpr.el (printify-buffer): Added, debugged from Roland McGrath's + * lpr.el (printify-buffer): Add, debugged from Roland McGrath's printify-buffer code in LCD. - * cookie.el (cookie): Enhanced it to handle both LINS files and + * cookie.el (cookie): Enhance it to handle both LINS files and UNIX fortune files. - * rect.el (fill-rectangle): Added. Inspired by Lynn Slater's + * rect.el (fill-rectangle): Add. Inspired by Lynn Slater's insert-box package in LCD, but the interface and implementation are different. - * loaddefs.el (ctl-x-map): Added binding for fill-rectangle. + * loaddefs.el (ctl-x-map): Add binding for fill-rectangle. - * buff-menu.el (Buffer-menu-toggle-read-only): Added, per Rob + * buff-menu.el (Buffer-menu-toggle-read-only): Add, per Rob Austein's suggestion in the LCD package bm-toggle.el. - * subr.el (add-hook): Added optional arg to cause hook to be + * subr.el (add-hook): Add optional arg to cause hook to be appended rather than prepended to the hook list. This obviates the 23 different hook-bashing packages in LCD. - * subr.el (current-word): Added. Lots of help and default-generator + * subr.el (current-word): Add. Lots of help and default-generator functions in LCD use it, and it's remarkably difficult to get right, especially given the new syntax primitives. @@ -1741,8 +1741,8 @@ 1993-03-26 Eric S. Raymond (eric@geech.gnu.ai.mit.edu) - * yow.el (psychoanalyze-pinhead): Needed a prefrontal lobotomy. I - gave it one. + * yow.el (psychoanalyze-pinhead): Needed a prefrontal lobotomy. + I gave it one. * two-column.el: Added Commentary. @@ -1754,13 +1754,13 @@ 1993-03-25 Eric S. Raymond (eric@geech.gnu.ai.mit.edu) - * lisp-mnt.el (lm-last-modified-date): Fixed return bug. + * lisp-mnt.el (lm-last-modified-date): Fix return bug. (lm-author, lm-maintainer): These now return cons pairs, not strings. * shell.el: Brent Benson's patch to support `cd -'. - * mh-e.el (mh-unshar): Added. + * mh-e.el (mh-unshar): Add. * emacsbug.el: Added a (provide 'emacsbug); lisp-mnt.el needs this. @@ -1873,8 +1873,8 @@ * time.el (display-time): Doc fix. - * isearch.el (isearch-switch-frame-handler): Call - handle-switch-frame instead of select-frame; it has been renamed. + * isearch.el (isearch-switch-frame-handler): + Call handle-switch-frame instead of select-frame; it has been renamed. * simple.el (comment-indent-function): New variable, intended to replace comment-indent-hook. @@ -1930,7 +1930,7 @@ 1993-03-18 Richard Stallman (rms@geech.gnu.ai.mit.edu) - * frame.el (make-frame): Renamed from new-frame. + * frame.el (make-frame): Rename from new-frame. (new-frame): Alias for make-frame. 1993-03-18 Edward M. Reingold (reingold@emr.cs.uiuc.edu) @@ -2048,8 +2048,8 @@ 1993-03-14 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) - * sort.el (sort-float-fields, sort-numeric-fields): Use - string-to-number, not string-to-float or string-to-int. + * sort.el (sort-float-fields, sort-numeric-fields): + Use string-to-number, not string-to-float or string-to-int. * sort.el (sort-float-fields): Make this autoloaded. @@ -2080,7 +2080,7 @@ 1993-03-12 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) - * loaddefs.el (global-map): Fixed a typo in the binding of + * loaddefs.el (global-map): Fix a typo in the binding of [kp-backtab]. * term/x-win.el: Added library headers back in. Didn't touch @@ -2122,8 +2122,8 @@ and featureful interface across many different keyboard types. * loaddefs.el (global-map): Natural default keybindings set up for - almost all supported keysyms other than function keys. All - other keysyms are now default-bound to a function which explains + almost all supported keysyms other than function keys. + All other keysyms are now default-bound to a function which explains that the key is not bound to anything, then raises an error. * term/README: Terminal package conventions and standard keysym @@ -2144,8 +2144,8 @@ * term/news.el: Cleaned up, headers added. - * term/sun.el: Headers added, [again] changed to [redo]. This - package is a hairball and should probably be scrapped if we + * term/sun.el: Headers added, [again] changed to [redo]. + This package is a hairball and should probably be scrapped if we can find or built a better one. * term/tvi970.el: Headers added, [enter] changed to [kp-enter]. @@ -2170,7 +2170,7 @@ * help.el: Added binding and menu line for new `P' package-finder command. Won't actually take effect till the next Emacs build. - * vc.el (vc-backend-checkin): Fixed bizarre POM-dependent bug + * vc.el (vc-backend-checkin): Fix bizarre POM-dependent bug introduced into VC by a bad patch. This was one for the books....badly corrupted vc-checkin code somehow mostly functioned for three days. The Code That Would Not Die... @@ -2252,7 +2252,7 @@ 1993-03-08 Richard Stallman (rms@mole.gnu.ai.mit.edu) * subr.el (posn-timestamp, posn-col-row, posn-point, posn-window) - (event-end, event-start, mouse-movement-p): Moved from mouse.el. + (event-end, event-start, mouse-movement-p): Move from mouse.el. * mouse.el: Functions moved to subr.el. 1993-03-07 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -2363,7 +2363,7 @@ 1993-03-05 Richard Stallman (rms@mole.gnu.ai.mit.edu) * disp-table.el: Add autoload comments. - (rope-to-vector): Deleted. + (rope-to-vector): Delete. (describe-display-table): Don't use rope-to-vector. * compare-w.el (compare-windows): Use compare-buffer-substrings. @@ -2424,7 +2424,7 @@ (rmail-undelete-previous-message, rmail-delete-forward) (rmail-get-new-mail, rmail-show-message): Update summary buffer if any. Call rmail-maybe-display-summary to put it back on screen. - (rmail-only-expunge): Renamed from rmail-expunge. + (rmail-only-expunge): Rename from rmail-expunge. (rmail-expunge): New function. (rmail-message-recipients-p, rmail-message-regexp-p): New functions. (rmail-summary-exists, rmail-summary-displayed): New functions. @@ -2470,7 +2470,7 @@ 1993-03-01 Richard Stallman (rms@mole.gnu.ai.mit.edu) * frame.el: Doc fixes. - (set-pointer-color): Renamed to set-mouse-color. + (set-pointer-color): Rename to set-mouse-color. (set-border-color): New function. * info.el (Info-insert-dir): Make menu items in Top node @@ -2510,8 +2510,8 @@ 1993-02-26 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * frame.el (auto-raise-mode): Renamed from toggle-auto-raise. - (auto-lower-mode): Renamed from toggle-auto-lower. + * frame.el (auto-raise-mode): Rename from toggle-auto-raise. + (auto-lower-mode): Rename from toggle-auto-lower. 1993-02-26 Jim Blandy (jimb@totoro.cs.oberlin.edu) @@ -2550,8 +2550,8 @@ * gud.el (gud-break): With a prefix argument, set a temporary breakpoint. - (gud-apply-from-source): New argument ARGS, to pass to FUNC. Now - it's really like `apply'. + (gud-apply-from-source): New argument ARGS, to pass to FUNC. + Now it's really like `apply'. (gud-set-break): Add another argument to this method. Document it in the section describing how the methods are supposed to be used. @@ -2614,11 +2614,11 @@ * frame.el (frame-initialize): Fix error syntax. (toggle-horizontal-scroll-bar): Likewise. - (toggle-horizontal-scroll-bar): Renamed from set-horizontal-bar. + (toggle-horizontal-scroll-bar): Rename from set-horizontal-bar. (toggle-vertical-scroll-bar): Likewise. (toggle-auto-lower, toggle-auto-raise): Likewise. (set-foreground-color, set-background-color): - Renamed from set-frame-{fore,back}ground. + Rename from set-frame-{fore,back}ground. 1993-02-15 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -2674,7 +2674,7 @@ 1993-02-11 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * flow-ctrl.el (enable-flow-control...): Renamed from evade... + * flow-ctrl.el (enable-flow-control...): Rename from evade... (enable-flow-control): Add autoload. 1993-02-10 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -2691,7 +2691,7 @@ * fortran.el (fortran-prepare-abbrev-list-buffer): Put quote in front of first argument to `insert-abbrev-table-description'. - * fortran.el (fortran-is-in-string-p): Fixed incorrect behavior + * fortran.el (fortran-is-in-string-p): Fix incorrect behavior when in first statement of a buffer. 1993-02-08 Roland McGrath (roland@geech.gnu.ai.mit.edu) @@ -2737,7 +2737,7 @@ 1993-02-05 Roland McGrath (roland@geech.gnu.ai.mit.edu) - * comint.el (make-comint): Added docstring. + * comint.el (make-comint): Add docstring. 1993-02-05 Roland McGrath (roland@geech.gnu.ai.mit.edu) @@ -2766,7 +2766,7 @@ 1993-01-31 Roland McGrath (roland@geech.gnu.ai.mit.edu) * mailabbrev.el (mail-abbrev-end-of-buffer): - Changed interactive spec from "P" to "p". + Change interactive spec from "P" to "p". 1993-01-29 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -2789,7 +2789,7 @@ x-own-selection has been renamed to x-set-selection, and the order of its arguments has been reversed, for consistency with other lisp functions like put and aset. - * term/x-win.el (x-select-text): Adjusted. + * term/x-win.el (x-select-text): Adjust. (x-cut-buffer-or-selection-value): Check the primary selection, using x-selection, instead of checking the cut buffer again. @@ -2804,7 +2804,7 @@ x-own-selection has been renamed to x-set-selection, and the order of its arguments has been reversed, for consistency with other lisp functions like put and aset. - * term/x-win.el (x-select-text): Adjusted. + * term/x-win.el (x-select-text): Adjust. (x-cut-buffer-or-selection-value): Check the primary selection, using x-selection, instead of checking the cut buffer again. @@ -3070,13 +3070,13 @@ * etags.el: Many comments added and docstrings fixed. (tags-table-list): Elt of nil is not special. (tags-expand-table-name): Value of nil is not special. - (tags-next-table): Removed arg RESET; no caller used it. + (tags-next-table): Remove arg RESET; no caller used it. (visit-tags-table-buffer): Don't need to do tags-expand-table-name in or form. When table is invalid, only set tags-file-name to nil globally if its global value contained the losing table file name. (find-tag-tag): Return a string, not a list. (find-tag-noselect, find-tag, find-tag-other-window) - (find-tag-other-frame): Changed callers. + (find-tag-other-frame): Change callers. (etags-recognize-tags-table): Call etags-verify-tags-table, rather than duplicating its functionality. (visit-tags-table-buffer): When CONT is 'same, set it to nil after the @@ -3153,7 +3153,7 @@ 1992-12-09 Roland McGrath (roland@wookumz.gnu.ai.mit.edu) - * info.el (Info-{first,second,third,fourth,fifth}-menu-item): Removed. + * info.el (Info-{first,second,third,fourth,fifth}-menu-item): Remove. (Info-nth-menu-item): New function; bound to 1..9. 1992-12-08 Jim Blandy (jimb@totoro.cs.oberlin.edu) @@ -3167,8 +3167,8 @@ Just that. * ls-lisp.el (insert-directory): Just that. - * ange-ftp.el (ange-ftp-unhandled-file-name-directory): New - function. Set ange-ftp's `unhandled-file-name-property' to its + * ange-ftp.el (ange-ftp-unhandled-file-name-directory): + New function. Set ange-ftp's `unhandled-file-name-property' to its name. 1992-12-07 Jim Blandy (jimb@totoro.cs.oberlin.edu) @@ -3238,7 +3238,7 @@ * paths.el (rmail-spool-directory): Add dgux-unix to the list of systems which put their mail in "/usr/mail". - * lpr.el (lpr-command, lpr-switches): Removed strings starting + * lpr.el (lpr-command, lpr-switches): Remove strings starting with \newline; this file is loaded in loaddefs.el, and doesn't need to follow that convention. @@ -3351,8 +3351,8 @@ * fortran.el: Version 1.28.7a. Cleaned up some doc strings. - (fortran-abbrev-help, fortran-prepare-abbrev-list-buffer): Use - `insert-abbrev-table-description' and make buffer in abbrevs-mode. + (fortran-abbrev-help, fortran-prepare-abbrev-list-buffer): + Use `insert-abbrev-table-description' and make buffer in abbrevs-mode. * fortran.el: Version 1.28.7. Many changes since version 1.28.3. Added auto-fill-mode, support @@ -3366,7 +3366,7 @@ New functions to implement auto fill. (fortran-indent-line, fortran-reindent-then-newline-and-indent): - Added auto fill support. + Add auto fill support. (find-comment-start-skip, is-in-fortran-string-p): New functions. @@ -3376,7 +3376,7 @@ (fortran-indent-to-column): Use find-comment-start-skip instead of searching for `comment-start-skip'. - (fortran-mode, calculate-fortran-indent): Added indentation + (fortran-mode, calculate-fortran-indent): Add indentation for fortran 90 statements. (fortran-next-statement, fortran-previous-statement): Bug fixes. @@ -3431,7 +3431,7 @@ 1992-10-31 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * files.el (make-directory): Renamed from make-directory-path. + * files.el (make-directory): Rename from make-directory-path. Optional argument says whether to create parent dirs. Invoke file-name handler here. (after-find-file): Delete code that offers to create dir. @@ -3469,7 +3469,7 @@ * info.el: Rename buffer-flush-undo to buffer-disable-undo. (Info-goto-emacs-key-command-node): Fix typo. - (Info-menu-item-sequence): Commented out. + (Info-menu-item-sequence): Comment out. (Info-follow-nearest-node): Use new event format. Select the window clicked on. @@ -3561,9 +3561,9 @@ * mailabbrev.el: Delete version 18 compatibility stuff. (mail-abbrevs, build-mail-abbrevs, rebuild-mail-abbrevs) - (merge-mail-abbrevs): Renamed `mail-aliases' to `mail-abbrevs'. - (mail-abbrev-end-of-buffer): Renamed from abbrev-hacking-end-of-buffer. - (mail-abbrev-next-line): Renamed from abbrev-hacking-next-line. + (merge-mail-abbrevs): Rename `mail-aliases' to `mail-abbrevs'. + (mail-abbrev-end-of-buffer): Rename from abbrev-hacking-end-of-buffer. + (mail-abbrev-next-line): Rename from abbrev-hacking-next-line. * isearch-mode.el (isearch-mode-map): Use sparse keymaps. Start printing-char loop at SPC. @@ -3729,7 +3729,7 @@ 1992-10-05 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * ls-lisp.el (insert-directory): Renamed from dired-ls. + * ls-lisp.el (insert-directory): Rename from dired-ls. All other functions renamed to start with ls-lisp. * ls-lisp.el: New file from Kremer. @@ -3748,7 +3748,7 @@ * mouse.el: Begin adapting this to the new event format. (event-window, event-point, mouse-coords, mouse-timestamp): - Removed. + Remove. (event-start, event-end, posn-window, posn-point, posn-col-row) (posn-timestamp): New accessors; these are defsubsts. (mouse-delete-window, mouse-delete-other-windows) @@ -3783,7 +3783,7 @@ 1992-09-30 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) - * gud.el (gud-last-frame): Added defvar for this. + * gud.el (gud-last-frame): Add defvar for this. 1992-09-29 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -3814,8 +3814,8 @@ Use x-get-cut-buffer and x-set-cut-buffer, instead of expecting x-selection-value to manipulate the cut buffers. - * term/x-win.el (x-cut-buffer-or-selection-value): Treat - selections whose value is the empty string like unset selections. + * term/x-win.el (x-cut-buffer-or-selection-value): + Treat selections whose value is the empty string like unset selections. This allows us to truncate cut buffers to the empty string (if the text is too large, say) without causing interprogram-paste-function to wipe out the latest kill. @@ -3841,13 +3841,13 @@ latter doesn't exist. (gud-dbx-debugger-setup): Use the argument `f', not the variable `file', which happens to be bound in the caller. - (gud-filter-insert): The variable `start' is never used. The - variable `moving' is unnecessary. The variable `old-buffer' and + (gud-filter-insert): The variable `start' is never used. + The variable `moving' is unnecessary. The variable `old-buffer' and the unwind-protect form are unneeded, since save-excursion can do their work. The binding of output-after-point should be done after switching to the process's buffer, not in whatever random buffer - happens to be current when the process filter is called. There's - no need to set the process mark if we've just inserted at its + happens to be current when the process filter is called. + There's no need to set the process mark if we've just inserted at its location using insert-before-markers. (gud-read-address): Don't bother setting the variable `result'; it is never used. @@ -3920,8 +3920,8 @@ * two-column.el (tc-window-width, tc-separator, tc-other): Add permanent-local property. - (tc-two-columns): Renamed from tc-split. - (tc-split): Renamed from tc-unmerge. Put it on C-x 6 s. + (tc-two-columns): Rename from tc-split. + (tc-split): Rename from tc-unmerge. Put it on C-x 6 s. Use make-local-variable on tc-separator. * spook.el (spook): Make it autoload. @@ -3929,7 +3929,7 @@ * gomoku.el (gomoku): Make it autoload. * mpuz.el: Fix setup of mpuz-read-map not to depend on keymap format. - (mpuz): Renamed from mult-puzzle. Make it autoload. + (mpuz): Rename from mult-puzzle. Make it autoload. * setenv.el (setenv): Doc fix. Make it autoload. @@ -3969,9 +3969,9 @@ * texinfo.el (texinfo-mode): Capitalize the mode name string. - * mail-extr.el (mail-undo-backslash-quoting): Renamed from undo-... - (mail-safe-move-sexp): Renamed from safe-... - (mail-variant-method): Renamed from variant-method. + * mail-extr.el (mail-undo-backslash-quoting): Rename from undo-... + (mail-safe-move-sexp): Rename from safe-... + (mail-variant-method): Rename from variant-method. * tq.el: Doc fixes. Make tq-create autoload. @@ -3994,7 +3994,7 @@ * prompt.el: File deleted. - * find-dired.el (start-process-shell-command): Deleted. + * find-dired.el (start-process-shell-command): Delete. * diff.el (diff-switches): Default is now -c. (diff-parse-differences): Use line beg as location of message. @@ -4028,7 +4028,7 @@ (search-last-string, search-last-regexp): Vars deleted. (search-highlight): No longer a user option. - * subr.el (baud-rate): Defined. + * subr.el (baud-rate): Define. (substitute-key-definition): Understand today's keymap format. New arg OLDMAP. Operate recursively on prefix keys. @@ -4060,7 +4060,7 @@ 1992-09-16 Joseph Arceneaux (jla@churchy.gnu.ai.mit.edu) - * isearch-mode.el (isearch-ring-advance-edit): Added missing + * isearch-mode.el (isearch-ring-advance-edit): Add missing closing paren to end of this function. 1992-09-16 Roland McGrath (roland@geech.gnu.ai.mit.edu) @@ -4087,7 +4087,7 @@ * simple.el (previous-history-element): Doc fix. * isearch-mode.el (isearch-event-data-type): - Renamed from isearch-events-exist. + Rename from isearch-events-exist. (isearch-frames-exist): Set properly in Emacs 18. (isearch-mode): Use baud-rate as variable, not function. (isearch-abort): Use nil as 2nd arg to `signal'. @@ -4137,8 +4137,8 @@ Don't try using length of keymap. (isearch-update): Handle unread-command-char properly for Emacs 19. (isearch-switch-frame-handler): Use select-frame to switch frames. - (isearch-pre-command-hook): Commented out. - (search-upper-case): Renamed from search-caps-disable-folding. + (isearch-pre-command-hook): Comment out. + (search-upper-case): Rename from search-caps-disable-folding. 1992-09-14 Roland McGrath (roland@geech.gnu.ai.mit.edu) @@ -4240,7 +4240,7 @@ * dired-aux.el (dired-add-entry, dired-insert-subdir-doinsert): Use insert-directory. * dired.el (dired-readin-insert): Use insert-directory. - (dired-ls, dired-ls-program): Deleted. + (dired-ls, dired-ls-program): Delete. 1992-09-12 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4264,7 +4264,7 @@ * term/x-win.el (scroll-bar-mode): New function (and variable too). - * dired.el (dired-next-subdir, dired-subdir-index): Moved here + * dired.el (dired-next-subdir, dired-subdir-index): Move here * dired-aux.el: From here. * dired.el (dired-build-subdir-alist): Don't print msg after each dir. Clarify final message. @@ -4296,7 +4296,7 @@ 1992-09-08 Joseph Arceneaux (jla@geech.gnu.ai.mit.edu) - * mailabbrev.el (sendmail-pre-abbrev-expand-hook): Changed the + * mailabbrev.el (sendmail-pre-abbrev-expand-hook): Change the structure of this function: don't check to call mail-resolve-all-aliases unless we are actually in a header field where an abbrev should be expanded. @@ -4345,7 +4345,7 @@ 1992-09-02 Jim Blandy (jimb@pogo.cs.oberlin.edu) - * c-mode.el (c-auto-newline): Added backslashed before quotes in + * c-mode.el (c-auto-newline): Add backslashed before quotes in docstring. 1992-09-01 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4446,7 +4446,7 @@ (mail-signature-file): This, since this is the way all the other lisp packages do it, and it's how people always say they want it on the mailing lists. - (mail-setup, mail-signature): Adjusted accordingly. + (mail-setup, mail-signature): Adjust accordingly. (mail): Doc fix. 1992-08-17 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4544,9 +4544,9 @@ * calendar.el (calendar-interval): Fix doc string. - * calendar.el (calendar): Changed use of prefix arg--now it causes + * calendar.el (calendar): Change use of prefix arg--now it causes prompting for the month and year. - (regenerate-calendar-window): Renamed generate-calendar-window. + (regenerate-calendar-window): Rename generate-calendar-window. Changed optional argument from an offset from the current month to a month, year pair. (redraw-calendar, calendar-current-month, scroll-calendar-left) @@ -4562,7 +4562,7 @@ 1992-08-08 Jim Blandy (jimb@pogo.cs.oberlin.edu) - * frame.el (set-screen-width, set-screen-height): Changed these + * frame.el (set-screen-width, set-screen-height): Change these from fset aliases to actual functions, since they aren't supposed to take a frame argument, while set-frame-{width,height} do. @@ -4595,8 +4595,8 @@ * appt.el (appt-issue-message, appt-message-warning-time) (appt-audible, appt-visible, appt-display-mode-line) - (appt-msg-window, appt-display-duration, appt-display-diary): Added - ;;;###autoload cookies for these variables, since they are options + (appt-msg-window, appt-display-duration, appt-display-diary): + Add ;;;###autoload cookies for these variables, since they are options for the user to set. * tex-mode.el (tex-shell-file-name, tex-directory, tex-offer-save) (tex-run-command, latex-run-command, latex-block-names) @@ -4610,29 +4610,29 @@ * add-log.el (add-log-current-defun): Use eq instead of = when one side might be nil. - * compile.el (compilation-mode-map): Change - compilation-previous/next-file bindings to M-{ and M-}. + * compile.el (compilation-mode-map): + Change compilation-previous/next-file bindings to M-{ and M-}. 1992-08-05 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) * cl.el (*cl-valid-named-list-accessors*, *cl-valid-nth-offsets*) - (byte-compile-named-accessors): Deleted. + (byte-compile-named-accessors): Delete. (first, second, ... tenth, rest): Define these with defsubst, to get the same effect. - (byte-compile-ca*d*r): Deleted. + (byte-compile-ca*d*r): Delete. (caar, cadr, ..., cddddr): Define these using defsubst. Installed changes from Zawinski-Furuseth 2.04 to 2.07: * byte-run.el (dont-compile): Doc fix. (make-obsolete-variable): New function. - * bytecomp.el (byte-compile-log-1): Added new optional argument, + * bytecomp.el (byte-compile-log-1): Add new optional argument, FILL; if it is non-nil, reformat the error message. (byte-compile-warn): Use that flag. (byte-recompile-directory): Offer to recompile subdirectories. If prefix argument is zero, create .elc files for those .el files which lack them, without asking. - (byte-compile-output-form, byte-compile-output-docform): Disable - print-gensym while writing the form. + (byte-compile-output-form, byte-compile-output-docform): + Disable print-gensym while writing the form. (byte-compile-form): Warn if t or nil are called as functions. (byte-compile-variable-ref): Check for, and warn about, obsolete variable uses. @@ -4649,7 +4649,7 @@ * inf-lisp.el (inferior-lisp-filter-regexp, inferior-lisp-program) (inferior-lisp-load-command, inferior-lisp-prompt) - (inferior-lisp-mode-hook, inferior-lisp): Added ;;;###autoload + (inferior-lisp-mode-hook, inferior-lisp): Add ;;;###autoload cookies for these. * bytecomp.el (byte-compile-warnings): When choosing the default @@ -4685,8 +4685,8 @@ * info.el (Info-mode): scroll-up, scroll-down now do the right thing for preorder browsing when the beginning/end of the node - is visible. RET now goes to the next preorder node. These - changes make sequential reading of info subtrees easier. + is visible. RET now goes to the next preorder node. + These changes make sequential reading of info subtrees easier. 1992-08-04 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -4698,7 +4698,7 @@ * vc.el (vc-next-action, vc-register, vc-diff, vc-insert-headers) (vc-directory, vc-create-snapshot, vc-retrieve-snapshot) (vc-print-log, vc-revert-buffer, vc-cancel-version) - (vc-update-change-log): Added the ;;;###autoload cookies to these + (vc-update-change-log): Add the ;;;###autoload cookies to these functions, since they get bound to keys in the global keymap. * loadup.el: Load vc-hooks.el. @@ -4773,7 +4773,7 @@ (medit-zap-define-to-mdl): Change `medit-save-defun' to `medit-save-define'. (medit-save-region, medit-save-buffer, medit-zap-define-to-mdl): - Changed `medit-go-to-mdl' to `medit-goto-mdl'. Did anyone ever + Change `medit-go-to-mdl' to `medit-goto-mdl'. Did anyone ever try this code? 1992-08-02 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -4805,13 +4805,13 @@ (dired-create-files, dired-handle-overwrite): Rename overwrite-confirmed to dired-overwrite-confirmed. (dired-do-kill-lines): Handle prefix arg as number of lines to kill. - (dired-kill-line-or-subdir): Deleted. + (dired-kill-line-or-subdir): Delete. 1992-08-01 Roland McGrath (roland@churchy.gnu.ai.mit.edu) - * mailabbrev.el [from jwz] (mail-interactive-insert-alias): Do - mail-aliases-setup if necessary before completing for interactive. - (build-mail-aliases): Changed parsing regexp. + * mailabbrev.el [from jwz] (mail-interactive-insert-alias): + Do mail-aliases-setup if necessary before completing for interactive. + (build-mail-aliases): Change parsing regexp. * compile.el (compilation-parse-errors): Take 2nd arg FIND-AT-LEAST. If non-nil, stop after parsing that many new errors. @@ -4826,7 +4826,7 @@ * comint.el: ring-* functions deleted--get them from ring.el. - * ring.el (ring-mod): Renamed from comint-mod. + * ring.el (ring-mod): Rename from comint-mod. Provide `ring', not history'. (make-ring, ring-p): Add autoloads. * history.el: Link deleted. @@ -4846,7 +4846,7 @@ Use buffer-disable-undo instead of buffer-flush-undo; the latter is obsolete. - * lpr.el (print-region-new-buffer): Added arguments START and END; + * lpr.el (print-region-new-buffer): Add arguments START and END; this used to use dynamic scope, but it makes things less readable. (print-region-1): Always call this with two arguments, not sometimes two and sometimes none. @@ -4877,7 +4877,7 @@ * hideif.el (hif-endif-to-ifdef): Fix munged comment which was interfering with parsing. - * hexl.el (hexl-next-line): Fixed up malformed let binding. + * hexl.el (hexl-next-line): Fix up malformed let binding. * bytecomp.el (byte-compile-file): Catch errors that occur during compilation, and record them in the compilation log. This allows @@ -5042,10 +5042,10 @@ 1992-07-28 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * files.el (backup-extract-version): Copied from Emacs 18. + * files.el (backup-extract-version): Copy from Emacs 18. (find-backup-file-name): Use that. - * dired-aux.el (dired-clean-directory): Moved here. + * dired-aux.el (dired-clean-directory): Move here. (dired-map-dired-file-lines, dired-collect-file-versions) (dired-trample-file-versions): Likewise. * dired.el: Moved from here. @@ -5070,7 +5070,7 @@ * compile.el (compile-goto-error): Doc fix. - * etags.el (find-tag): Fixed prompt. + * etags.el (find-tag): Fix prompt. (tag-exact-match-p): Rewritten (again). * startup.el (command-line): Load site-start here. @@ -5082,7 +5082,7 @@ * completion.el: Moved to external-lisp. - * diff.el (diff-rcs, diff-sccs): Deleted. + * diff.el (diff-rcs, diff-sccs): Delete. 1992-07-27 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) @@ -5127,9 +5127,9 @@ 1992-07-26 Richard Stallman (rms@mole.gnu.ai.mit.edu) * diff.el (diff-backup): New function. - (diff-last-backup-file): Renamed from dired-last-backup-file. + (diff-last-backup-file): Rename from dired-last-backup-file. * dired-aux.el (dired-backup-diff): Use diff-backup. - (dired-last-backup-file): Moved and renamed. + (dired-last-backup-file): Move and renamed. * dired.el, dired-aux.el (dired-diff, dired-backup-diff): Doc fixes. * help.el (command-apropos): Fix call to apropos for new arg. @@ -5185,9 +5185,9 @@ * replace.el (perform-replace): Fix typo: match-after => match-again. (map-query-replace-regexp): Delete duplicate definition. - * subr.el (defun-inline): Commented out. + * subr.el (defun-inline): Comment out. - * comint.el (comint-input-ring*): Renamed from input-ring*. + * comint.el (comint-input-ring*): Rename from input-ring*. (ring-remove, ring-rotate): Use setcar, not set-car. * co-isearch.el: input-ring* renamed to comint-input-ring*. @@ -5227,7 +5227,7 @@ 1992-07-22 Richard Stallman (rms@mole.gnu.ai.mit.edu) * emerge.el (emerge-startup-hook, emerge-quit-hook): - Renamed from ...-hooks. + Rename from ...-hooks. * dired.el (dired-display-file): New command, on C-o. @@ -5282,15 +5282,15 @@ * c-mode.el (c-backslash-region): New command. (c-append-backslash, c-delete-backslash): New functions. * c++-mode.el (c++-macroize-region, backslashify-current-line): - Deleted. - (c++-comment-region, c++-uncomment-region): Deleted. + Delete. + (c++-comment-region, c++-uncomment-region): Delete. comment-region works just fine. - (c++-beginning-of-defun, c++-end-defun, c++-indent-defun): Deleted. - (c++-point-bol): Renamed from point-bol. - (c++-within-string-p): Renamed from within-string-p. - (c++-count-char-in-string): Renamed from count-char-in-string. - (fill-c++-comment): Renamed from fill-C-comment. - (c++-insert-header): Deleted. + (c++-beginning-of-defun, c++-end-defun, c++-indent-defun): Delete. + (c++-point-bol): Rename from point-bol. + (c++-within-string-p): Rename from within-string-p. + (c++-count-char-in-string): Rename from count-char-in-string. + (fill-c++-comment): Rename from fill-C-comment. + (c++-insert-header): Delete. 1992-07-21 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -5329,7 +5329,7 @@ * simple.el (end-of-buffer): If buffer end is on screen, don't scroll. - * c-mode.el (set-c-style): Deleted the first version of this function. + * c-mode.el (set-c-style): Delete the first version of this function. It was badly written. Modified the remaining version by adding new argument GLOBAL and setting the parameters locally if GLOBAL is nil. @@ -5343,7 +5343,7 @@ 1992-07-21 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) - * frame.el (get-frame): Renamed to get-other-frame; get-frame + * frame.el (get-frame): Rename to get-other-frame; get-frame sounds like a parallel to get-buffer or get-process. * c-mode.el (set-c-style): Remove the extraneous copy of this @@ -5352,7 +5352,7 @@ * c++-mode.el (within-string-p): Use `%', not `mod', as the name of the modulus function. - * frame.el (frame-height, frame-width): Fixed several confusions + * frame.el (frame-height, frame-width): Fix several confusions here. * blackbox.el: When building blackbox-mode-map, locally rebind all @@ -5384,7 +5384,7 @@ (visit-tags-file): If find-file-noselect changed the file name, propagate the change to tags-file-name and tags-table-list. - * startup.el (command-line): Fixed typo in comment. + * startup.el (command-line): Fix typo in comment. 1992-07-20 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -5406,7 +5406,7 @@ (frame-configuration-to-register): New function. * loaddefs.el: Put them on C-x r w, C-x r f. * window.el (window-config-to-register, register-to-window-config): - Deleted, along with keybindings C-x 6 and C-x 7. + Delete, along with keybindings C-x 6 and C-x 7. 1992-07-19 Edward M. Reingold (reingold@emr.cs.uiuc.edu) @@ -5431,7 +5431,7 @@ (calendar-mode-map): Put it on a key. (calendar-mode): Describe it. - * cal-french.el (diary-french-date): Moved from diary.el and fixed + * cal-french.el (diary-french-date): Move from diary.el and fixed accent. * diary.el: Move dairy-french-date to cal-french.el and autoload it. @@ -5469,7 +5469,7 @@ * files.el (auto-mode-alist): Recognize .texi. - * rmail.el (rmail-delete-forward): Removed the feature + * rmail.el (rmail-delete-forward): Remove the feature of moving back if there's nowhere to go forward. 1992-07-17 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -5519,12 +5519,12 @@ form so that it returns a list containing the filename and the prefix argument, not just the prefix argument by itself. - * bytecomp.el (byte-compile-file): Changed reference to + * bytecomp.el (byte-compile-file): Change reference to byte-compile-report-call-tree to use display-call-tree. * bytecomp.el (byte-recompile-directory, byte-compile-file) (batch-byte-compile, byte-compile, compile-defun) - (display-call-tree): Added autoload cookies for these functions. + (display-call-tree): Add autoload cookies for these functions. 1992-07-16 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -5533,7 +5533,7 @@ 1992-07-16 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) - * byte-run.el (defsubst): Removed extra closing paren at the end + * byte-run.el (defsubst): Remove extra closing paren at the end of this function. 1992-07-16 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) @@ -5567,7 +5567,7 @@ * bytecomp.el: Deleted support for running compiler in Emacs 18. Spell "Emacs 18" properly. (byte-compile-version): FSF 2.1. - (byte-compiler-valid-options): Deleted. + (byte-compiler-valid-options): Delete. (byte-compile-single-version): Always return nil. (byte-compiler-version-cond): Always return the argument. @@ -5588,7 +5588,7 @@ * buff-menu.el, bg-mouse.el, appt.el, abbrevlist.el, term/x-win.el, * term/wyse50.el, term/vt200.el, term/vt100.el: All uses changed. * screen.el (screen-height, screen-width, set-screen-height) - (set-screen-width): Defined as aliases for frame-height, + (set-screen-width): Define as aliases for frame-height, frame-width, set-frame-height, and set-frame-width. (set-frame-height, set-frame-width): Functions deleted; they are defined in frame.c. @@ -5613,8 +5613,8 @@ * rmailsort.el: Change copyright to FSF; update permission notice. * byte-run.el: Delete compatibility definition of make-byte-code. - (byte-compiler-options): Commented out. - (proclaim-inline, proclaim-notinline): Commented out. + (byte-compiler-options): Comment out. + (proclaim-inline, proclaim-notinline): Comment out. * byte-opt.el: Change several doc strings to comments. They had the wrong format anyway. @@ -5623,22 +5623,22 @@ * disass.el: Require just bytecomp, not byte-opt. * bytecomp.el (emacs-lisp-file-regexp): - Renamed from elisp-source-file-re. All uses changed. + Rename from elisp-source-file-re. All uses changed. (byte-compile-dest-file): Don't use that var. - (compile-defun): Renamed from elisp-compile-defun. + (compile-defun): Rename from elisp-compile-defun. (byte-compile-report-ops): Define unconditionally. It's a bad idea to make function definitions of moderate size conditional on anything. - (byte-compile-and-load-file): Commented out. + (byte-compile-and-load-file): Comment out. (byte-compiler-valid-options): - Renamed from byte-compiler-legal-options. + Rename from byte-compiler-legal-options. (byte-compile-overwrite-file): Variable deleted. (byte-compile-file): Don't use that var. (byte-compile-compatibility): - Renamed from byte-compile-emacs18-compatibility. + Rename from byte-compile-emacs18-compatibility. (byte-compile-generate-emacs19-bytecodes): Variable deleted. Use byte-compile-compatibility instead. - (byte-compiler-options-handler): Deleted. + (byte-compiler-options-handler): Delete. (byte-compile-body-do-effect, byte-compile-form-do-effect): Use defsubst, not proclaim-inline. @@ -5694,7 +5694,7 @@ * disass.el: New version of the disassembler, to fit with the new compiler. - * mouse.el (mouse-select-buffer-line): Removed extraneous setting + * mouse.el (mouse-select-buffer-line): Remove extraneous setting of the variable `the-buffer'; it's never used elsewhere. * mouse.el (mouse-kill): Don't set the mark; pass point and the @@ -5702,7 +5702,7 @@ 1992-07-09 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) - * abbrev.el (write-abbrev-file): Removed extraneous interactive spec. + * abbrev.el (write-abbrev-file): Remove extraneous interactive spec. * screen.el (current-screen-configuration, set-screen-configuration): New functions. @@ -5713,8 +5713,8 @@ instead of `deiconify-screen'; the latter no longer exists. * files.el (find-backup-file-name): Replace the reference to - `backup-extract-version' with a literal `function' form. This - eliminates the use of dynamic binding, and allows us to remove + `backup-extract-version' with a literal `function' form. + This eliminates the use of dynamic binding, and allows us to remove backup-extract-version, which doesn't really want to be its own function. (backup-extract-version): Function removed. @@ -5766,7 +5766,7 @@ * tex-mode.el: Require comint instead of oshell. (tex-start-shell): Use comint, not oshell. - (tex-filter): Deleted function; no filter is now longer needed. + (tex-filter): Delete function; no filter is now longer needed. * tex-mode.el (tex-run-command, latex-run-command, slitex-run-command) (tex-bibtex-run-command, tex-dvi-print-command) @@ -5843,7 +5843,7 @@ 1992-06-28 Jim Blandy (jimb@pogo.cs.oberlin.edu) * completion.el (completion-separator-self-insert-autofilling): - Changed references to `auto-fill-hook' to `auto-fill-function'. + Change references to `auto-fill-hook' to `auto-fill-function'. * mh-e.el (mh-letter-mode): Same thing. * texinfo-upd.el (texinfo-update-node, texinfo-sequential-node-update): Same thing. @@ -5863,7 +5863,7 @@ calendar-daylight-savings-starts, calendar-daylight-savings-ends. Add autoload of calendar-sunrise-sunset. (calendar-mode): Add description of sunrise/sunset capability. - (calendar-version): Changed to 5. + (calendar-version): Change to 5. * diary.el: Autoload diary-sunrise-sunset and diary-sabbath-candles. @@ -5915,10 +5915,10 @@ (all-christian-calendar-holidays, all-islamic-calendar-holidays) (list-diary-entries-hook, diary-display-hook) (nongregorian-diary-listing-hook, nongregorian-diary-marking-hook) - (diary-list-include-blanks): Added autoload cookie for these; + (diary-list-include-blanks): Add autoload cookie for these; Reingold's distribution suggests that these variables are ones that you are especially likely to want to customize. - * holiday.el (holidays): Added autoload cookie for this. + * holiday.el (holidays): Add autoload cookie for this. 1992-06-25 Edward M. Reingold (reingold@emr.cs.uiuc.edu) @@ -5953,7 +5953,7 @@ * dired.el: Complete rewrite, mostly by sk@thp.uni-koeln.de. * dired-aux.el: Other parts of dired. - * files.el (enable-local-eval): Renamed from `ignore-local-eval'; + * files.el (enable-local-eval): Rename from `ignore-local-eval'; now has values like `enable-local-variables'. (hack-local-variables): Test `enable-local-eval' properly. @@ -5974,7 +5974,7 @@ 1992-06-21 Jim Blandy (jimb@pogo.cs.oberlin.edu) - * screen.el (ctl-x-5-map): Removed declaration and initialization + * screen.el (ctl-x-5-map): Remove declaration and initialization of this here; it's done in subr.el, alongside ctl-x-4-map. * autoload.el (generate-file-autoloads): If FILE is in the same @@ -6003,7 +6003,7 @@ 1992-06-18 Jim Blandy (jimb@pogo.cs.oberlin.edu) - * edebug.el (edebug-debug): Added autoload cookie for this. + * edebug.el (edebug-debug): Add autoload cookie for this. * etags.el (find-tag-other-frame): New function. Bind it to `C-x 5 .'. @@ -6043,7 +6043,7 @@ now the keymap `isearch-mode-map' controls special characters in isearch-mode. - * blackbox.el (blackbox): Added ;;;###autoload cookie. + * blackbox.el (blackbox): Add ;;;###autoload cookie. * add-log.el (change-log-mode): Integrated some code from the `change-log-mode' function in `text-mode.el'. Docstring now @@ -6085,7 +6085,7 @@ 1992-06-12 Joseph Arceneaux (jla@churchy.gnu.ai.mit.edu) - * simple.el (current-kill): Fixed misnamed parameter and + * simple.el (current-kill): Fix misnamed parameter and reorganized code slightly. 1992-06-11 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -6122,7 +6122,7 @@ 1992-06-08 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * csharp.el (c-find-nesting): Renamed from csharp-find-nesting. + * csharp.el (c-find-nesting): Rename from csharp-find-nesting. Add autoload. All other functions in this file renamed to start with c-find-nesting. @@ -6204,7 +6204,7 @@ 1992-06-02 Roland McGrath (roland@geech.gnu.ai.mit.edu) * add-log.el: Fixed copyright years to not use a range. - (change-log-mode): Added docstring. + (change-log-mode): Add docstring. (add-change-log-entry): Put a space between the file name and "(function name):". Put a colon after the file name if we have found no function name. @@ -6247,7 +6247,7 @@ * fill.el (fill-region-as-paragraph): Treat } like closeparen. If a fill prefix is specified globally, always use that one. - * flow-ctrl.el (evade-flow-control-memstr=): Renamed from memstr=. + * flow-ctrl.el (evade-flow-control-memstr=): Rename from memstr=. 1992-05-31 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) @@ -6258,7 +6258,7 @@ 1992-05-31 Noah Friedman (friedman@splode.com) - * subr.el (lambda): Added docstring. + * subr.el (lambda): Add docstring. 1992-05-31 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) @@ -6286,7 +6286,7 @@ of writing out its code. * comint.el: Merged with Olin Shivers' comint version 2.03. - (comint-version): Changed accordingly. + (comint-version): Change accordingly. (comint-previous-input-matching): Bind this to c-m-r, rather than c-c c-r. (comint-exec-hook): Make this variable buffer-local. @@ -6300,8 +6300,8 @@ to "Non-echoed text: ". This conforms with the convention used by existing prompts, and gives more room to type stuff. - * comint.el (comint-last-input-start): New variable. In - particular, this helps support subprocesses that insist on echoing + * comint.el (comint-last-input-start): New variable. + In particular, this helps support subprocesses that insist on echoing their input. Added comments to porting guide indicating that this should probably not be used for implementing history stuff. (comint-mode): Create and initialize comint-last-input-start as a @@ -6340,9 +6340,9 @@ 1992-05-24 Edward M. Reingold (reingold@emr.cs.uiuc.edu) * calendar.el (list-yahrzeit-dates): New function. - (hebrew-calendar-yahrzeit): Moved from diary.el. + (hebrew-calendar-yahrzeit): Move from diary.el. - * diary.el (hebrew-calendar-yahrzeit): Moved to calendar.el. + * diary.el (hebrew-calendar-yahrzeit): Move to calendar.el. (diary-ordinal-suffix): Give correct suffix for 111, 112, 113, 211, 212, 213, etc. @@ -6361,7 +6361,7 @@ below instead of manipulating the kill ring directly, since the functions correctly deal with interprogram cutting and pasting. (kill-new): New function. - (kill-append): Added doc string. Be sure to call the + (kill-append): Add doc string. Be sure to call the interprogram-cut-function on the new string. (current-kill): New function. (rotate-yank-pointer): New optional argument do-not-move, to @@ -6388,7 +6388,7 @@ how many characters were saved, and it's hard to interpret intuitively. - * screen.el (ctl-x-3-map): Renamed to ctl-x-5-map, and now bound + * screen.el (ctl-x-3-map): Rename to ctl-x-5-map, and now bound to C-x 5, not C-x 3. This makes a nicer analogy with C-x 4. Moving split-window-horizontally to C-x 3 also makes a nicer analogy with C-x 2. @@ -6503,7 +6503,7 @@ 1992-04-21 Jim Blandy (jimb@pogo.cs.oberlin.edu) - * doctor.el (doctor-svo): Deleted second expression from top let + * doctor.el (doctor-svo): Delete second expression from top let binding; it used to read "(let ((foo sent)) ...)"; let bindings can only have one expression. @@ -6649,7 +6649,7 @@ * compile.el (compilation-mode-hook): New variable. (compilation-mode): Run it. (compilation-search-path): Made user variable, added autoload cookie. - (compilation-window-height): Added autoload cookie. + (compilation-window-height): Add autoload cookie. 1992-02-27 Jim Blandy (jimb@pogo.cs.oberlin.edu) @@ -6720,7 +6720,7 @@ 1992-01-08 Jim Blandy (jimb@occs.cs.oberlin.edu) - * simple.el (temporary-goal-column): Added missing closing paren. + * simple.el (temporary-goal-column): Add missing closing paren. 1991-12-25 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -6752,7 +6752,7 @@ 1991-12-14 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) - * etags.el (find-tag-noselect): Fixed subtle bug due to + * etags.el (find-tag-noselect): Fix subtle bug due to save-excursion. (tags-tag-match): New function, made smarter about exact matches. @@ -6803,7 +6803,7 @@ 1991-12-08 Richard Stallman (rms@mole.gnu.ai.mit.edu) * diff.el (diff-internal-diff): New subroutine. - (diff): Removed from here. + (diff): Remove from here. (diff-sccs, diff-rcs): New commands using diff-internal-diff. (diff-rcs-extension): New variable. @@ -6855,7 +6855,7 @@ 1991-11-06 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) * screen.el (screen-initialize, screen-notice-user-settings): - Renamed global-minibuffer-screen to default-minibuffer-screen. + Rename global-minibuffer-screen to default-minibuffer-screen. 1991-11-05 Edward M. Reingold (reingold@emr.cs.uiuc.edu) @@ -6864,8 +6864,8 @@ 1991-10-31 Richard Mlynarik (mly@peduncle) - * ebuff-menu.el (electric-buffer-menu-mode-map): Define - < and > to scroll-left and scroll-right per user suggestion. + * ebuff-menu.el (electric-buffer-menu-mode-map): + Define < and > to scroll-left and scroll-right per user suggestion. 1991-10-31 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) @@ -6881,7 +6881,7 @@ * cmushell.el: This is now the real shell.el. Removed the "cmu" prefix from names. - (shell): Marked this to be autoloaded. + (shell): Mark this to be autoloaded. 1991-10-29 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) @@ -6902,8 +6902,8 @@ 1991-10-26 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) * disass.el (disassemble): Correctly distinguish functions with no - interactive spec and functions that are (interactive). Correctly - extract components of explicit calls to byte-code (old-style + interactive spec and functions that are (interactive). + Correctly extract components of explicit calls to byte-code (old-style compiled functions). Correctly pass byte code of function to disassemble-1. (disassemble-1): Use nth to extract components of explicit call to @@ -6923,14 +6923,14 @@ 1991-10-15 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) - * info.el (Info-follow-nearest-node): Adjusted for new return + * info.el (Info-follow-nearest-node): Adjust for new return value format from coordinates-in-window-p. 1991-10-08 Roland McGrath (roland@albert.gnu.ai.mit.edu) * add-log.el (change-log-name): New fn. - (add-change-log-entry, add-change-log-entry-other-window): All - args optional. FILE-NAME defaults to new var + (add-change-log-entry, add-change-log-entry-other-window): + All args optional. FILE-NAME defaults to new var `change-log-default-name'. Give this var a local value in the buffer we were run from, pointing to the file we found. @@ -6972,7 +6972,7 @@ 1991-09-26 Roland McGrath (roland@churchy.gnu.ai.mit.edu) - * map-ynp.el (map-y-or-n-p): Fixed for lists containing nil. + * map-ynp.el (map-y-or-n-p): Fix for lists containing nil. 1991-09-10 Roland McGrath (roland@wookumz.gnu.ai.mit.edu) @@ -7034,7 +7034,7 @@ * rmail.el (rmail-convert-to-babyl-format): Roland added the missing paren in the wrong place; fixed. - * screen.el (screen-initialize): Added missing `function' around + * screen.el (screen-initialize): Add missing `function' around lambda expression. 1991-08-20 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -7063,7 +7063,7 @@ 1991-08-17 Roland McGrath (roland@geech.gnu.ai.mit.edu) * doctor.el (doctor-strangelove): New fn. - (doctor-member): Removed. + (doctor-member): Remove. (doctor-doc): Use member instead of doctor-member. (doctor-rms): Restored. @@ -7073,7 +7073,7 @@ 1991-08-15 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) - * screen.el (screen-create-initial-screen): Renamed to + * screen.el (screen-create-initial-screen): Rename to screen-initialize. Arrange to cause errors if people try to create screens when no window system is running. @@ -7085,14 +7085,14 @@ * loaddefs.el (ctl-x-4-map): Move definition from here... * subr.el (ctl-x-4-map): To here. (ctl-x-3-map): New prefix. - (mouse-map): Deleted. + (mouse-map): Delete. * screen.el (new-screen-x-delta, new-screen-y-delta) - (new-screen-position): Removed. - (new-screen): Simplified. - (split-to-other-screen): Removed. + (new-screen-position): Remove. + (new-screen): Simplify. + (split-to-other-screen): Remove. (switch-to-buffer-other-screen, find-file-other-screen) - (find-file-read-only-other-screen, mail-other-screen): Moved, along + (find-file-read-only-other-screen, mail-other-screen): Move, along with their keybindings, to... * files.el (switch-to-buffer-other-screen, find-file-other-screen) (find-file-read-only-other-screen): Here... @@ -7136,11 +7136,11 @@ * screen.el, term/x-win.el: Renamed screen-default-alist to default-screen-alist. - (default-screen-alist): Moved declaration to screen.c; the + (default-screen-alist): Move declaration to screen.c; the screen creation subrs should consult this transparently. - * term/x-win.el (x-get-resources, x-pop-initial-window): Functions - deleted. Don't call them at the bottom of the file anymore. + * term/x-win.el (x-get-resources, x-pop-initial-window): + Functions deleted. Don't call them at the bottom of the file anymore. 1991-08-12 Roland McGrath (roland@geech.gnu.ai.mit.edu) @@ -7152,15 +7152,15 @@ 1991-08-12 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) * window.el (split-window-keep-point): New user option. - (split-window-vertically): Modified to support it. + (split-window-vertically): Modify to support it. * startup.el (command-line): Choose a default value for split-window-keep-point according to the baud rate. * term/x-win.el: Set split-window-keep-point. 1991-08-10 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) - * term/x-win.el (x-daemon-mode, x-establish-daemon-mode): Removed - these functions; we do this differently now. + * term/x-win.el (x-daemon-mode, x-establish-daemon-mode): + Remove these functions; we do this differently now. 1991-08-07 Roland McGrath (roland@geech.gnu.ai.mit.edu) @@ -7169,7 +7169,7 @@ 1991-08-05 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) - * screen.el (screen-creation-func): Renamed to + * screen.el (screen-creation-func): Rename to screen-creation-function, as per the convention. * screen.el (screen-creation-func): Do not initialize this @@ -7184,7 +7184,7 @@ * startup.el (pre-init-hook): New variable. (window-setup-hook): Doc fix. (command-line): Call pre-init-hook. - (command-line-1): Updated copyright date. + (command-line-1): Update copyright date. 1991-07-31 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) @@ -7193,7 +7193,7 @@ 1991-07-31 Roland McGrath (roland@churchy.gnu.ai.mit.edu) - * screen.el (auto-new-screen-function): Renamed to + * screen.el (auto-new-screen-function): Rename to pop-up-screen-function. (buffer-in-other-screen): Use pop-up-screens, not auto-new-screen. @@ -7239,12 +7239,12 @@ * view.el: (define-key "C-xv" 'view-file). (view-file-other-window, view-buffer-other-window): New functions. - (view-prev-buffer): Renamed to view-return-here. + (view-prev-buffer): Rename to view-return-here. (view-exit): If view-return-here is a buffer, switch to it; if it is a window configuration, apply it. - * subr.el (search-forward-regexp, search-backward-regexp): Added - alternate names. + * subr.el (search-forward-regexp, search-backward-regexp): + Add alternate names. 1991-07-24 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) @@ -7256,7 +7256,7 @@ * isearch.el (isearch): If the user switches to a different screen, exit the isearch. - * isearch.el (isearch): Changed reference to `cmds' to use + * isearch.el (isearch): Change reference to `cmds' to use variable's new name `history'. 1991-07-23 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -7264,7 +7264,7 @@ * rmail.el (rmail-first-unseen-message): Make loop looking for unseen msgs not skip the first one. - * rmail.el (rmail-widen-to-current-msgbeg): Added missing close paren. + * rmail.el (rmail-widen-to-current-msgbeg): Add missing close paren. 1991-07-21 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) @@ -7286,7 +7286,7 @@ 1991-07-19 Roland McGrath (roland@albert.gnu.ai.mit.edu) - * files.el (save-some-buffers): Added save-excursions around code + * files.el (save-some-buffers): Add save-excursions around code that does set-buffer. 1991-07-15 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -7297,7 +7297,7 @@ (find-tag-tag): Pass 'tags-completion-alist as TABLE to completing-read, so the table is built on demand. - * sendmail.el (mail-do-fcc): Added missing close paren. + * sendmail.el (mail-do-fcc): Add missing close paren. 1991-07-15 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) @@ -7313,8 +7313,8 @@ * fortran.el version 1.28.3 Now works in either mode when `tab-width' is not 8. - (fortran-electric-line-number, fortran-indent-to-column): Use - `fortran-minimum-statement-indent' instead of 8. + (fortran-electric-line-number, fortran-indent-to-column): + Use `fortran-minimum-statement-indent' instead of 8. (fortran-current-line-indentation): Now skips over line number and whitespace correctly when tab-width is not 8. @@ -7331,7 +7331,7 @@ * startup.el (command-line): Remove the arguments from command-line-args as we process them. - (command-line-1): Removed code to ignore the arguments processed + (command-line-1): Remove code to ignore the arguments processed in command-line, because they're all deleted now. * replace.el (occur): Set tem to the location of the match before @@ -7351,7 +7351,7 @@ 1991-07-09 Roland McGrath (roland@albert.gnu.ai.mit.edu) - * map-ynp.el (map-y-or-n-p): Fixed lossage on ? or random char. + * map-ynp.el (map-y-or-n-p): Fix lossage on ? or random char. 1991-07-08 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -7368,8 +7368,8 @@ * fortran.el: Added ;;;###autoload definition for fortran-tab-mode-default variable. - * fortran.el (fortran-numerical-continuation-char): Replace - (backward-line 1) with (forward-line -1) since backward-line is + * fortran.el (fortran-numerical-continuation-char): + Replace (backward-line 1) with (forward-line -1) since backward-line is defined only in edt. (fortran-previous-statement): Fix error in parens. (fortran-indent-to-column): Likewise. @@ -7378,7 +7378,7 @@ * files.el (save-some-buffers): Use map-y-or-n-p return value. - * map-ynp.el (map-y-or-n-p): Fixed bug that caused first elt on ! + * map-ynp.el (map-y-or-n-p): Fix bug that caused first elt on ! hit not get acted on. 1991-07-04 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -7390,7 +7390,7 @@ 1991-07-01 Roland McGrath (roland@churchy.gnu.ai.mit.edu) - * map-ynp.el (map-y-or-n-p): Fixed misplaced paren. + * map-ynp.el (map-y-or-n-p): Fix misplaced paren. Fixed list-eating bug. 1991-07-01 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -7425,7 +7425,7 @@ 1991-06-20 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) - * subr.el (ignore): Added docstring for this; it appears as a key + * subr.el (ignore): Add docstring for this; it appears as a key binding, so it ought to be described. 1991-06-19 Roland McGrath (roland@albert.gnu.ai.mit.edu) @@ -7443,16 +7443,16 @@ 1991-06-12 Roland McGrath (roland@albert.gnu.ai.mit.edu) - * upd-copyr.el (update-copyright): Fixed typo in help text. + * upd-copyr.el (update-copyright): Fix typo in help text. 1991-05-26 Roland McGrath (roland@albert.gnu.ai.mit.edu) - * disass.el (disassemble-internal): Fixed typo string? -> stringp. + * disass.el (disassemble-internal): Fix typo string? -> stringp. 1991-05-26 Edward M. Reingold (reingold@emr.cs.uiuc.edu) - * holiday.el (calendar-holiday-function-passover-etc): Correct - date and spelling of Yom HaAtzma'ut. + * holiday.el (calendar-holiday-function-passover-etc): + Correct date and spelling of Yom HaAtzma'ut. 1991-05-23 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) @@ -7501,14 +7501,14 @@ screen-default-alist alone; don't use x-switches-specified. (x-read-resources): New function to read the X defaults and put them in screen-default-alist. Call this function at the bottom. - * screen.el (death-function): Removed, because this is now handled + * screen.el (death-function): Remove, because this is now handled better in startup.el. (pop-initial-screen): Don't do a condition-case to call death-function. 1991-05-18 Jim Blandy (jimb@pogo.gnu.ai.mit.edu) - * macros.el (apply-macro-to-region-lines): Added a save-excursion + * macros.el (apply-macro-to-region-lines): Add a save-excursion around the macro invocation, so that the macro doesn't need to stay on the same line. @@ -7614,7 +7614,7 @@ * find-dired.el (find-dired-filter): Don't search; use forward-line instead. - (find-dired-filter, find-dired-sentinel): Changed docstrings to + (find-dired-filter, find-dired-sentinel): Change docstrings to comments. 1991-05-11 Roland McGrath (roland@albert.gnu.ai.mit.edu) @@ -7755,8 +7755,8 @@ Now supports tab or fixed format style of continuation control and indentation. In tab style, lines start with a tab, or a line number followed by a tab. If the first character after the tab is - a digit from 1 to 9, the line is a continuation line. When - entering fortran mode for a file, the first line that begins with + a digit from 1 to 9, the line is a continuation line. + When entering fortran mode for a file, the first line that begins with 6 spaces or a tab is found. The buffer is then set respectively to either fixed format or tab format style. The mode may be toggled with the command fortran-tab-mode. @@ -7965,7 +7965,7 @@ 1991-02-25 Paul Hilfinger (hilfingr@hilfinger.cs.nyu.edu) - * fill.el (fill-individual-paragraphs): Changed response to mailp + * fill.el (fill-individual-paragraphs): Change response to mailp to effect only leading lines in a region (was getting confused about colons embedded in ordinary text). Changed method of moving to next paragraph in the main loop to use forward-paragraph @@ -7978,7 +7978,7 @@ 1991-02-23 Roland McGrath (mcgrath@cygint.cygnus.com) - * compile.el (next-error): Fixed bug in rms's optimization. + * compile.el (next-error): Fix bug in rms's optimization. 1991-02-23 Richard Stallman (rms@mole.ai.mit.edu) @@ -8040,7 +8040,7 @@ 1991-02-04 Jim Blandy (jimb@gnu.ai.mit.edu) - * simple.el (eval-current-buffer): Removed, since it has been + * simple.el (eval-current-buffer): Remove, since it has been reintroduced to the C code. 1991-02-02 Jim Blandy (jimb@gnu.ai.mit.edu) @@ -8114,8 +8114,8 @@ * bibtex.el: Expanded the various bibtex-field-* patterns to allow fields like 'title = poft # "Fifth Triquaterly" # random-conf,'. Needs to have more work done to accept all cases. Added code for - the bibtex 'crossref' command, which subsumes other options. Made - field ordering different when this option on. Also allow user to + the bibtex 'crossref' command, which subsumes other options. + Made field ordering different when this option on. Also allow user to have a list of field to be added to all entries (bibtex-mode-user-optional-fields). Merged in Bengt Martensson's changes. @@ -8148,13 +8148,13 @@ 1991-01-08 Roland McGrath (roland@albert.ai.mit.edu) - * compile.el (compilation-parse-errors): Fixed maintenance of + * compile.el (compilation-parse-errors): Fix maintenance of last-linenum, so dups are really found. 1991-01-08 Jim Blandy (jimb@pogo.ai.mit.edu) - * bytecomp.el (byte-compile-byte-code-maker): Since - byte-compile-lambda is free to return the original lambda + * bytecomp.el (byte-compile-byte-code-maker): + Since byte-compile-lambda is free to return the original lambda expression, we'd better be prepared to handle things that aren't bytecode objects. @@ -8242,8 +8242,8 @@ 1990-12-20 Chris Hanson (cph@kleph) - * texnfo-upd.el (texinfo-update-menu-region-beginning): Change - code that searches for "top" node so it returns the position of + * texnfo-upd.el (texinfo-update-menu-region-beginning): + Change code that searches for "top" node so it returns the position of the beginning of the node line. Always search from the buffer's start when looking for that node. (texinfo-make-one-menu): Bump forward over the outer node line. @@ -8317,7 +8317,7 @@ 1990-12-12 Roland McGrath (roland@albert.ai.mit.edu) - * compile.el (compilation-error-buffer): Removed. + * compile.el (compilation-error-buffer): Remove. (compilation-last-buffer): Now last buffer in which any of: started compilation; C-x `; C-c C-c; was done. (compile-internal): Don't set compilation-error-buffer. @@ -8340,7 +8340,7 @@ error-message, and regexp-alist. (compile-internal): Do it here, after calling compilation-mode. - * compile.el (compilation-error-list): Changed elt format. + * compile.el (compilation-error-list): Change elt format. (compilation-parse-errors): Don't find files when parsing. Instead record ((DIR . FILE) . LINENO) structures to describe each error. @@ -8401,35 +8401,35 @@ 1990-11-30 Mike Newton (newton@gumby.cs.caltech.edu) - * bibtex.el (start comments): Added earlier comments of Bengt + * bibtex.el (start comments): Add earlier comments of Bengt Martensson. Some of the changes listed below are originally his (including clean-entry, OPTkey and OPTannote, the function renaming and the preamble code). - * bibtex.el (bibtex-field-* patterns): Expanded to allow fields + * bibtex.el (bibtex-field-* patterns): Expand to allow fields like 'title = poft # "Fifth Triquaterly" # random-conf,'. Needs to have more work done to accept all cases. - * bibtex.el (bibtex-clean-entry-zap-empty-opts): Added. + * bibtex.el (bibtex-clean-entry-zap-empty-opts): Add. - * bibtex.el (bibtex-include-OPTcrossref): Added. If set, changes + * bibtex.el (bibtex-include-OPTcrossref): Add. If set, changes order of the lists presented to luser. - * bibtex.el (bibtex-include-OPTkey & bibtex-include-OPTannote): Added. + * bibtex.el (bibtex-include-OPTkey & bibtex-include-OPTannote): Add. * bibtex.el (bibtex-mode-user-optional-fields): Can be set to a list of field the user wants to add to entries. - * bibtex.el (bibtex-mode documentation string): Updated for new changes, + * bibtex.el (bibtex-mode documentation string): Update for new changes, DEAthesis added back in, bibtex-preamble call added. * bibtex.el (bibtex-entry): Add OPTkey/annote. If OPTcrossref set then put it in. - * bibtex.el (bibtex-make-entry): Renamed bibtex-make-field. + * bibtex.el (bibtex-make-entry): Rename bibtex-make-field. - * bibtex.el (bibtex-make-optional-entry): Renamed - bibtex-make-optional-field. + * bibtex.el (bibtex-make-optional-entry): + Rename bibtex-make-optional-field. * bibtex.el (bibtex-Article): Change order of presentation if OPTcrossref is set. @@ -8443,16 +8443,16 @@ * bibtex.el (bibtex-InProceedings): Change order of presentation if OPTcrossref is set. - * bibtex.el (bibtex-MastersThesis): Added "note". + * bibtex.el (bibtex-MastersThesis): Add "note". - * bibtex.el (bibtex-preamble): Added. + * bibtex.el (bibtex-preamble): Add. * bibtex.el (bibtex-inside-field): Only go backwards if quote is there. - * bibtex.el (bibtex-clean-entry): Added call to + * bibtex.el (bibtex-clean-entry): Add call to bibtex-clean-entry-zap-empty-opts, OPT field testing for errors. - * bibtex.el (bibtex-x-help): Added options Conference and preamble, + * bibtex.el (bibtex-x-help): Add options Conference and preamble, restored DEAthesis. 1990-11-30 Richard Stallman (rms@mole.ai.mit.edu) @@ -8552,7 +8552,7 @@ (insert-hebrew-diary-entry, insert-monthly-hebrew-diary-entry) (insert-yearly-hebrew-diary-entry, insert-islamic-diary-entry) (insert-monthly-islamic-diary-entry) - (insert-yearly-islamic-diary-entry): Modified so that if a prefix arg + (insert-yearly-islamic-diary-entry): Modify so that if a prefix arg is supplied these make nonmarking diary entries; otherwise the entries made are marking. (insert-block-diary-entry, insert-anniversary-diary-entry) @@ -8572,27 +8572,27 @@ 1990-11-06 Ed Reingold (reingold@emr.cs.uiuc.edu) * calendar.el (sexp-diary-entry-symbol): New variable. - (cursor-to-iso-calendar-date): Simplified, slightly. - (cursor-to-calendar-day-of-year): Fixed punctuation. - (cursor-to-french-calendar-date): Moved French names to arrays. + (cursor-to-iso-calendar-date): Simplify, slightly. + (cursor-to-calendar-day-of-year): Fix punctuation. + (cursor-to-french-calendar-date): Move French names to arrays. * diary.el (list-sexp-diary-entries, diary-sexp-entry, diary-cyclic) (diary-hebrew-date, diary-iso-date, diary-day-of-year) (diary-float, diary-islamic-date, diary-anniversary, diary-block) (diary-french-date, diary-omer, diary-yahrzeit, diary-parasha) (diary-rosh-hodesh, hebrew-calendar-parasha-name): New functions. - (list-diary-entries): Added call to (list-sexp-diary-entries) and + (list-diary-entries): Add call to (list-sexp-diary-entries) and fixed an obscure error that caused a diary entry to be missed if it was preceded by an empty entry of the same style. - (list-hebrew-diary-entries, list-islamic-diary-entries): Fixed an + (list-hebrew-diary-entries, list-islamic-diary-entries): Fix an obscure error that caused a diary entry to be missed if it was preceded by an empty entry of the same style. - (mark-islamic-calendar-date-pattern): Renamed some local variables + (mark-islamic-calendar-date-pattern): Rename some local variables more appropriately. 1990-11-05 Roland McGrath (roland@geech.ai.mit.edu) - * compile.el (compilation-window-height): Added defconst for this, + * compile.el (compilation-window-height): Add defconst for this, since it somehow disappeared. * compile.el: Unoverhauled. Restored from old 19 compile.el, plus @@ -8622,7 +8622,7 @@ called to generate a name for a compilation buffer. Passed one arg, the name of the major mode of the buffer. (compile-internal): Use it. [From tale's changes:] - (compile): Moved window enlarging to compile-internal. + (compile): Move window enlarging to compile-internal. (compile-internal): Don't use with-output-to-temp-buffer. Use display-buffer instead. @@ -8704,10 +8704,10 @@ 1990-10-23 David Lawrence (tale@pogo.ai.mit.edu) - * emerge.el (emerge-setup, emerge-setup-with-ancestor): Moved - insert-buffer calls back before call to emerge-extract-diffs where + * emerge.el (emerge-setup, emerge-setup-with-ancestor): + Move insert-buffer calls back before call to emerge-extract-diffs where the merge-buffer really needs to have something in it. - (emerge-extract-diffs,emerge-extract-diffs3): Moved errant + (emerge-extract-diffs,emerge-extract-diffs3): Move errant kill-buffer which interfered with return value of functions. 1990-10-22 David Lawrence (tale@pogo.ai.mit.edu) @@ -8782,7 +8782,7 @@ (texinfo-menu-locate-entry-p, texinfo-copy-menu-title) (texinfo-update-menu-region-beginning, texinfo-update-menu-region-end): Handle `@ifinfo' as well as comment line following node line. - (texinfo-multiple-files-update and aux. files): Added to handle + (texinfo-multiple-files-update and aux. files): Add to handle multi-file Texinfo sources. 1990-10-18 Richard Stallman (rms@mole.ai.mit.edu) @@ -8830,9 +8830,9 @@ * dired.el (dired-compress, dired-uncompress): Put output from subprocess in a buffer to display it. - * appt.el (fix-time): Deleted. - (appt-select-lowest-window): Renamed from select-lowest-window. - (appt-visible): Renamed from appt-visable. + * appt.el (fix-time): Delete. + (appt-select-lowest-window): Rename from select-lowest-window. + (appt-visible): Rename from appt-visable. * time.el (display-time-filter): Run display-time-hook. @@ -8842,10 +8842,10 @@ 1990-10-08 Ed Reingold (reingold@emr.cs.uiuc.edu) - * holiday.el (calendar-holiday-function-hebrew): Fixed minor problem + * holiday.el (calendar-holiday-function-hebrew): Fix minor problem with the code to short-circuit the calculations to save time. - * diary.el (mark-hebrew-calendar-date-pattern): Fixed minor problem + * diary.el (mark-hebrew-calendar-date-pattern): Fix minor problem with the code to short-circuit the calculations to save time. 1990-10-08 Richard Stallman (rms@mole.ai.mit.edu) @@ -8957,7 +8957,7 @@ 1990-09-18 Richard Stallman (rms@mole.ai.mit.edu) - * doctor.el (doctor-caddr, doctor-cadr, doctor-cddr): Renamed. + * doctor.el (doctor-caddr, doctor-cadr, doctor-cddr): Rename. 1990-09-13 Richard Stallman (rms@mole.ai.mit.edu) @@ -8979,7 +8979,7 @@ 1990-09-10 Ed Reingold (reingold@emr.cs.uiuc.edu) * diary.el (list-diary-entries, list-hebrew-diary-entries) - (list-islamic-diary-entries): Fixed to use add-to-diary-list. + (list-islamic-diary-entries): Fix to use add-to-diary-list. 1990-09-10 Chris Hanson (cph@kleph) @@ -9039,7 +9039,7 @@ * diary.el (mark-diary-entries, mark-islamic-diary-entries) (mark-hebrew-diary-entries): Eliminated use of constant alists for month and day names. - (prepare-fancy-diary-buffer): Fixed the way holidays are displayed + (prepare-fancy-diary-buffer): Fix the way holidays are displayed when there are no diary entries but lots of holidays. (ordinary-list-diary-hook, add-to-diary-list): New functions. @@ -9049,21 +9049,21 @@ Changed reference at beginning of file from the report to the published version of the paper. Changed all calls to `mod' to call `%' to avoid problem with cl. - (calendar-date-string): Added optional parameter `nodayname'. - (cursor-to-islamic-calendar-date): Fixed so that + (calendar-date-string): Add optional parameter `nodayname'. + (cursor-to-islamic-calendar-date): Fix so that calendar-date-string doesn't try find the day name. - (cursor-to-hebrew-calendar-date): Fixed so that + (cursor-to-hebrew-calendar-date): Fix so that calendar-date-string doesn't try find the day name. nongregorian-diary-marking-hook: Fixed typo in doc string. - (calendar-mode): Fixed a typo in doc string. + (calendar-mode): Fix a typo in doc string. (cursor-to-iso-calendar-date): Made message consistent with similar functions for Julian, Islamic, Hebrew, and French calendars. - (calendar-absolute-from-gregorian): Simplified calculation. - (calendar-mark-today): Changed today mark to `=' to avoid + (calendar-absolute-from-gregorian): Simplify calculation. + (calendar-mark-today): Change today mark to `=' to avoid confusion with the default holiday mark. (calendar-julian-from-absolute): Rewrote parallel to other functions. (calendar-islamic-from-absolute): Rewrote parallel to other functions. - (calendar-forward-day): Fixed movement when cursor is not on a date + (calendar-forward-day): Fix movement when cursor is not on a date and arg is negative. Added description of new `if' form to doc string for calendar-holidays. @@ -9074,10 +9074,10 @@ * holiday.el: Changed all calls to `mod' to call `%' to avoid problem with cl. - (calendar-holiday-function-rosh-hashanah-etc): Fixed grammatical + (calendar-holiday-function-rosh-hashanah-etc): Fix grammatical error in a comment. - (calendar-holiday-function-hebrew): Fixed typo in doc string. - (calendar-holiday-function-islamic): Fixed typo in doc string. + (calendar-holiday-function-hebrew): Fix typo in doc string. + (calendar-holiday-function-islamic): Fix typo in doc string. (calendar-holiday-function-if): New function. 1990-09-06 Richard Stallman (rms@mole.ai.mit.edu) @@ -9114,12 +9114,12 @@ * loaddefs.el: (gnus, gnus-post-news): Autoload gnus. (sendnews, postnews): fset to gnus-post-news instead of news-post-news. - (rnews, news-post-news): Removed autoloads. + (rnews, news-post-news): Remove autoloads. * gnus.el: New file. - (gnus-make-newsrc-file): Removed. + (gnus-make-newsrc-file): Remove. (gnus-read-newsrc-file): Work without above. - (gnus-Info-directory): Removed. + (gnus-Info-directory): Remove. (gnus-Info-find-node): Work without above. (lots of variables): Made non-interactive. Some doc fixes. @@ -9151,7 +9151,7 @@ (fortran-current-line-indentation): Only skip over continuation char or line number for statements. It was giving back wrong values for statements which started in columns 1-6. - (fortran-mode-version): Removed. + (fortran-mode-version): Remove. 1990-08-28 David Lawrence (tale@pogo.ai.mit.edu) @@ -9161,8 +9161,8 @@ copy-vector. Calling copy-sequence does the job. (defsetf for point): Point's inverse is goto-char. Of course, what do we do with the other basic types of Emacs Lisp? - (member): Another, perhaps counterproductive, speed hack. When - test or testnot are symbols (hopefully, non-null), they are + (member): Another, perhaps counterproductive, speed hack. + When test or testnot are symbols (hopefully, non-null), they are replaced by their symbol-function slots. This presumably reduces one indirection per each funcall in the inner loop. (byte-compile-named-list-accessors): Another byte-compile @@ -9172,7 +9172,7 @@ (with-keyword-args): Macro that simplifies most of the handling of klists. The only neglected functionality is that no supplied-p forms exist (although that is true also of lambda lists in Emacs Lisp). - (cl-eval-print-last-sexp): Added half-hearted support for -, +, + (cl-eval-print-last-sexp): Add half-hearted support for -, +, ++, +++, *, **, ***, /, //, ///; and cleared the mvalues mechanism at every call. (declare, proclaim, the): Make some more CL codes easy to load. @@ -9183,7 +9183,7 @@ (byte-compile-ca*d*r): New function, used as a handler from byte-compile-form to eliminate the extra call to the c*r functions in compiled code. - (adjoin, map): Changed to use `memq' instead of `member', too. + (adjoin, map): Change to use `memq' instead of `member', too. (case, ecase): Via a change in case-clausify, these macros now generate tests using the primitive `memq', instead of the heavier `member'. @@ -9203,8 +9203,8 @@ functions. (build-klist): Better error messages. (psetf): Rewrote, patterned after the new psetq. - (psetq): Added early check for even number of arguments. This - causes a better error message than previously. + (psetq): Add early check for even number of arguments. + This causes a better error message than previously. (defstruct, parse$defstruct$options): asp@CS.CMU.EDU (James Aspnes) reported that defstruct wasn't handling properly the use of accessors of an :included definition applied to instances of @@ -9252,8 +9252,8 @@ *Completions* not *Help*. * help.el (describe-mode): Use Dale Worley's version to also show - minor mode documentation if argument is given. Fset - defining-keyboard-macro to start-keyboard-macro so its + minor mode documentation if argument is given. + Fset defining-keyboard-macro to start-keyboard-macro so its documentation can be found. Currently does not work with auto-fill-mode because of the hook nature of its minor mode indicator variable. @@ -9357,7 +9357,7 @@ 1990-07-26 David Lawrence (tale@pogo.ai.mit.edu) * c-mode.el (c-auto-newline): Doc addition. - (electric-c-terminator): Removed bogus set-marker. + (electric-c-terminator): Remove bogus set-marker. (electric-c-sharp-sign): Make sure c-auto-newline is nil for call to electric-c-terminator. @@ -9464,7 +9464,7 @@ * compile.el (grep): Use `grep-command' to also hold args for grep, like compile-command. - * simple.el (kill-ring-save): Fixed to not reference free + * simple.el (kill-ring-save): Fix to not reference free variable `verbose' but to just unconditionally echo message. (shell-command): Use new `last-shell-command' interactively. (shell-command-on-region): Use new `last-shell-command-on-region' @@ -9478,7 +9478,7 @@ 1990-06-23 Randall Smith (randy@substantia-nigra) - * dired.el (dired-flag-regexp-files): Added function to flag all + * dired.el (dired-flag-regexp-files): Add function to flag all files matching a REGEXP for deletion. (): Bound this function to key "F" in dired-mode ("D" was already taken). @@ -9506,8 +9506,8 @@ * isearch.el (isearch): Do exit on meta keys. Also exit on function keys and mouse clicks. * loaddefs.el (search-exit-char): Change back to escape. - (search-ring-advance-char): Moved from isearch.el. - (search-ring-retreat-char): Renamed from ...-recline-char and moved. + (search-ring-advance-char): Move from isearch.el. + (search-ring-retreat-char): Rename from ...-recline-char and moved. * float.el: Provide 'float. @@ -9561,7 +9561,7 @@ updated all existing menus (very time consuming). (texinfo-all-menus-update, texinfo-every-node-update): - Added a save-excursion to each so that point does not move when + Add a save-excursion to each so that point does not move when you update the menus or nodes. * texinfmt.el (texinfo-format-parse-args): Expand arguments so @@ -9572,16 +9572,16 @@ * backquote.el (bq-splicequote): Correctly splice in elements when followed by constant elements; don't list the constant elements. - * add-log.el (add-change-log-entry): Fixed match test for full name. + * add-log.el (add-change-log-entry): Fix match test for full name. - * lpr.el (print-buffer): Removed an extra trailing parenthesis. + * lpr.el (print-buffer): Remove an extra trailing parenthesis. 1990-05-30 David Lawrence (tale@geech) * comint.el (comint-load-hook): Superseded by eval-after-load. - * inf-lisp.el (lisp-eval-region, lisp-compile-region): Use - temporary files instead of send-string to avoid problems with pty + * inf-lisp.el (lisp-eval-region, lisp-compile-region): + Use temporary files instead of send-string to avoid problems with pty buffering. * tex-mode.el (tex-close-latex-block): Allow whitespace after @@ -9629,7 +9629,7 @@ * informat.el (Info-tagify): Give status messages before and after tagifying. - (batch-info-validate): Removed status messages around Info-tagify. + (batch-info-validate): Remove status messages around Info-tagify. * rmailout.el (rmail-output): Check for From:, Really-From: and Sender: fields, in that order, and run mail-strip-quoted-names on @@ -9637,13 +9637,13 @@ 1990-05-21 Richard Stallman (rms@mole.ai.mit.edu) - * buff-menu.el (Buffer-menu-buffer): Simplified. + * buff-menu.el (Buffer-menu-buffer): Simplify. Set Buffer-menu-buffer-column initially. 1990-05-18 Robert J. Chassell (bob@apple-gunkies) * page-ext.el (pages-addresses-file-name): - Renamed from addresses-file-name. + Rename from addresses-file-name. 1990-05-17 Robert J. Chassell (bob@apple-gunkies) @@ -9990,12 +9990,12 @@ * screen.el (iconify-function, iconify-emacs, deiconify-function): New functions. - * files.el (save-some-buffers): Removed last parameter skip-list. + * files.el (save-some-buffers): Remove last parameter skip-list. Now this checks for buffer-local variable save-buffers-skip to determine whether or not to avoid asking to save the buffer. - * rmail.el (rmail-mode): Removed skip-list stuff. + * rmail.el (rmail-mode): Remove skip-list stuff. (rmail-variables): make-local-variable save-buffers-skip. - * compile.el (compile): Removed additional parameter to save-buffers. + * compile.el (compile): Remove additional parameter to save-buffers. 1990-02-26 David Lawrence (tale@pogo.ai.mit.edu) @@ -10004,21 +10004,21 @@ display-time-string. (rmail-pop-up): Default display-time-hook to automatically retrieve new mail if the variable rmail-pop-up is non-nil. - (add-clock-handler): Removed; superseded by timer.el. + (add-clock-handler): Remove; superseded by timer.el. * loaddefs.el: Removed add-clock-handler. 1990-02-25 David Lawrence (tale@pogo.ai.mit.edu) * c++-mode.el: New file. - (point-bol): Removed this function. + (point-bol): Remove this function. * loaddefs.el: Autoload C++-mode. (auto-mode-alist): c++-mode for .C and .cc files. 1990-02-25 Joseph Arceneaux (jla@gnu.ai.mit.edu) - * lisp-mode.el (indent-sexp): Changed opoint to last-point. + * lisp-mode.el (indent-sexp): Change opoint to last-point. Very strange, I thought I'd already fixed this. * screen.el: New file. @@ -10048,11 +10048,11 @@ * files.el (file-newest-backup): Return either the name of an existing backup file or nil if none exists. - * server.el (server-program): Renamed from "server" to "emacsserver". + * server.el (server-program): Rename from "server" to "emacsserver". 1990-02-20 Joseph Arceneaux (jla@gnu.ai.mit.edu) - * fill.el (fill-region-as-paragraph): Fixed regexp typo in call to + * fill.el (fill-region-as-paragraph): Fix regexp typo in call to re-search-forward. 1990-02-19 David Lawrence (tale@pogo.ai.mit.edu) @@ -10110,9 +10110,9 @@ * calendar.el (french-calendar-leap-year-p): Rewritten with corrected rule. - (calendar-absolute-from-french): Fixed comments. + (calendar-absolute-from-french): Fix comments. (calendar-french-from-absolute): Rewrote using calendar-sum. - (cursor-to-french-calendar-date): Simplified and corrected spelling. + (cursor-to-french-calendar-date): Simplify and corrected spelling. 1990-02-06 Richard Stallman (rms@mole.ai.mit.edu) @@ -10151,9 +10151,9 @@ 1990-01-27 Ed Reingold (reingold@emr.cs.uiuc.edu) - * calendar.el (scroll-calendar-left): Fixed so it works when the cursor + * calendar.el (scroll-calendar-left): Fix so it works when the cursor is not positioned on a day. - (cursor-to-calendar-day-of-year): Fixed so that "day" is properly + (cursor-to-calendar-day-of-year): Fix so that "day" is properly pluralized, depending how many days remain in the year. (french-calendar-leap-year-p): New function. (french-calendar-last-day-of-month): New function. @@ -10222,14 +10222,14 @@ 1990-01-11 Ed Reingold (reingold@emr.cs.uiuc.edu) - * diary.el (list-diary-entries): Deleted several lines of extraneous + * diary.el (list-diary-entries): Delete several lines of extraneous code and added `nongregorian-diary-listing-hook' to the list of hooks called@the end; this is for use in including Hebrew, Islamic, Julian, or ISO diary entries. A similar `nongregorian-diary-marking-hook' was added to the list of hooks called at the end of mark-diary-entries for the same reason. - (diary-name-pattern): Fixed the documentation and added an optional + (diary-name-pattern): Fix the documentation and added an optional parameter FULLNAME which insists on the full spelling of the name; this is also for use in marking Hebrew or Islamic diary entries (those month names are not unique in the first three characters). @@ -10241,8 +10241,8 @@ (list-islamic-diary-entries): New function. (mark-islamic-calendar-date-pattern): New function. - (list-diary-entries): Added nongregorian-diary-listing-hook. - (mark-diary-entries): Added nongregorian-diary-marking-hook. + (list-diary-entries): Add nongregorian-diary-listing-hook. + (mark-diary-entries): Add nongregorian-diary-marking-hook. * calendar.el: Added documentation for the hooks described above. @@ -10256,7 +10256,7 @@ 1990-01-08 Robert J. Chassell (bob@apple-gunkies.ai.mit.edu) * texnfo-upd.el (texinfo-update-node, texinfo-sequential-node-update): - Fixed auto-fill-hook bug. + Fix auto-fill-hook bug. 1990-01-08 Joseph Arceneaux (jla@spiff) @@ -10265,7 +10265,7 @@ 1990-01-08 Ed Reingold (reingold@emr.cs.uiuc.edu) * calendar.el (calendar-date-is-visible-p): - Fixed so it does not switch to the calendar buffer. + Fix so it does not switch to the calendar buffer. * diary.el (prepare-fancy-diary-buffer): Compute the list of holidays only once for each three-month period, not once for each date @@ -10275,12 +10275,12 @@ 1990-01-07 Ed Reingold (reingold@emr.cs.uiuc.edu) * calendar.el: Fixed the value of list-diary-entries-hook. - (regenerate-calendar-window): Changed (update-display) to (sit-for 0). + (regenerate-calendar-window): Change (update-display) to (sit-for 0). Corrected several instances of "dairy" to "diary". - (describe-calendar-mode): Added this function to issue the message + (describe-calendar-mode): Add this function to issue the message "Preparing..." to `?' key in calendar-mode because it's so incredibly slow for describe-mode to prepare the help buffer. - (calendar-holidays): Fixed the examples in the doc-string. + (calendar-holidays): Fix the examples in the doc-string. * diary.el: Corrected several instances of "dairy" to "diary". @@ -10323,7 +10323,7 @@ (calendar-iso-from-absolute): New function. (calendar-absolute-from-iso): New function. - (cursor-to-iso-calendar-date): Added `D' calendar command to give + (cursor-to-iso-calendar-date): Add `D' calendar command to give the day number in the Gregorian year and number of days remaining. (mark-diary-entries): Made two-digit abbreviated years acceptable in diary entries. Changed possible diary entry styles: DAY @@ -10338,11 +10338,11 @@ (all functions containing the word `hebrew'). (list-diary-entries, mark-diary-entries) (include-other-diary-files, mark-included-diary-files): - Added the possibility of `shared diary files' with a recursive + Add the possibility of `shared diary files' with a recursive include mechanism like the C preprocessor. (list-calendar-holidays): Eliminated the 'special class of holidays, rewriting the entire mechanism to make it more general. - (calendar-holiday-function-float): Changed the 'float class of + (calendar-holiday-function-float): Change the 'float class of holidays so that negative values count backward from end of month: 5 is no longer used for the last occurrence of a day in a month; -1 is used instead. @@ -10408,8 +10408,8 @@ 1989-12-11 David Lawrence (tale@cocoa-puffs) - * telnet.el: Converted to use comint. Removed - delete-char-or-send-eof and telnet-copy-last-input. Added + * telnet.el: Converted to use comint. + Removed delete-char-or-send-eof and telnet-copy-last-input. Added telnet-mode-hook. Modified telnet-filter to insert-before-markers at the process-mark. @@ -10418,8 +10418,8 @@ * prolog.el: Converted to use comint. Replaced copy-keymap for copy-alist of comint-mode-map. - * kermit.el: Converted to use comint. Replaced - kermit-clean-filter with a more efficient version. + * kermit.el: Converted to use comint. + Replaced kermit-clean-filter with a more efficient version. * comint.el: Added optional arguments ``terminator'' and ``delete'' to comint-send-input, for processes that want to see @@ -10449,7 +10449,7 @@ 1989-12-05 David Lawrence (tale@wheat-chex) * comint.el (new file): - Added FSF copyright. + Add FSF copyright. Moved bindings off of C-c LETTER. Cleaned up references to cmu* files. Made comint-send-input do unconditional end-of-line before processing. @@ -10594,7 +10594,7 @@ * x-mouse.el (x-paste-text): push-mark before inserting text. (x-insert-selection, x-select): - Moved these functions over from mouse.el. + Move these functions over from mouse.el. 1989-10-12 Richard Stallman (rms@mole.ai.mit.edu) @@ -10768,7 +10768,7 @@ 1989-09-11 Robert J. Chassell (bob@apple-gunkies.ai.mit.edu) * texinfo.el (texinfo-update-node, texinfo-make-menu) - (texinfo-master-menu, texinfo-sequential-node-update): Added functions + (texinfo-master-menu, texinfo-sequential-node-update): Add functions to insert or update the next, previous, and up node pointers in a Texinfo file, or alternatively to insert node pointers as a depth-first traversal---sequentially through the file, each pointing to the next @@ -10953,7 +10953,7 @@ 1989-07-12 Joseph Arceneaux (jla@spiff) - * lisp.el (insert-parentheses): Changed conditions for pre- and + * lisp.el (insert-parentheses): Change conditions for pre- and post- insertion of blanks. * bytecomp.el (byte-compile-file): If current buffer is in @@ -11072,7 +11072,7 @@ 1989-06-08 Joseph Arceneaux (jla@apple-gunkies.ai.mit.edu) - * term/x-win.el (new-screen): Added this function, which is the default + * term/x-win.el (new-screen): Add this function, which is the default auto-screen function. It uses new variables new-screen-x-delta and new-screen-y-delta. (next-multiscreen-window, previous-multiscreen-window): @@ -11200,7 +11200,7 @@ 1989-05-15 Joseph Arceneaux (jla@apple-gunkies.ai.mit.edu) - * tags.el (next-file): Fixed typo: " *next-file*" --> "*next-file*" + * tags.el (next-file): Fix typo: " *next-file*" --> "*next-file*" 1989-05-14 Richard Stallman (rms@mole.ai.mit.edu) @@ -11280,7 +11280,7 @@ confusing and incompatible with xterm. * mouse.el (mouse-scroll, mouse-del-char, mouse-kill-line) - (narrow-window-to-region, mouse-window-to-region): Added these + (narrow-window-to-region, mouse-window-to-region): Add these new functions. 1989-05-08 Richard Stallman (rms@mole.ai.mit.edu) @@ -11439,7 +11439,7 @@ * replace.el (occur-mode-goto-occurrence): Insure arg to count-lines is@start of line. - * replace.el (occur): Removed an extraneous save-excursion. + * replace.el (occur): Remove an extraneous save-excursion. * replace.el (perform-replace): Make ! undo as a unit. @@ -11530,7 +11530,7 @@ (view-exit): Restore old mode from those local variables. Apply specified fn to buffer that was viewed. This is on C-c and q. - (view-command-loop): Deleted. + (view-command-loop): Delete. (view-window-size): Now applies to selected window. * startup.el (normal-top-level): Use PWD envvar to set default dir. @@ -11651,8 +11651,8 @@ (bibtex-enclosing-reference, bibtex-enclosing-regexp, bibtex-flash-entr) (bibtex-flash-head, bibtex-inside-field, bibtex-make-optional-entry) (bibtex-remove-OPT): New functions. - (bibtex-find-it, bibtex-make-OPT-entry, bibtex-next-position): Deleted. - (kill-current-line): Deleted. + (bibtex-find-it, bibtex-make-OPT-entry, bibtex-next-position): Delete. + (kill-current-line): Delete. (bibtex-mode-map): C-c keys to make entries moved to C-c C-e. (general): Use regexps instead of simple-minded cursor motion. New keys include C-c C-p, C-c C-n, C-c C-k, C-c C-d, C-c C-c, TAB, LF. @@ -12400,7 +12400,7 @@ * compile.el (grep): Use grep-command for program. * loaddefs.el (grep-command): New variable. - (compile-command): Moved to compile.el. + (compile-command): Move to compile.el. * c-mode.el (electric-c-terminator): Make insertpos a marker. === modified file 'lisp/ChangeLog.7' --- lisp/ChangeLog.7 2014-01-15 03:06:07 +0000 +++ lisp/ChangeLog.7 2014-08-28 22:18:39 +0000 @@ -13,10 +13,10 @@ * speedbar.el (speedbar-timer-fn): Disable updating if the frame is an icon, or if the user is using the minibuffer. - (speedbar-key-map): Added Q binding to destroy the frame. - (speedbar-easymenu-definition-trailer): Added Quit item. + (speedbar-key-map): Add Q binding to destroy the frame. + (speedbar-easymenu-definition-trailer): Add Quit item. (speedbar-frame-mode): Set the frame position at creation time. - (speedbar-file-unshown-regexp): Added .# lock files. + (speedbar-file-unshown-regexp): Add .# lock files. 1998-08-18 Kenichi Handa @@ -56,8 +56,8 @@ 1998-08-17 Kenichi Handa - * international/mule-cmds.el (set-language-environment): Reset - syntax and case table to the defaults if the value of + * international/mule-cmds.el (set-language-environment): + Reset syntax and case table to the defaults if the value of unibyte-syntax key is nil. 1998-08-16 Richard Stallman @@ -86,8 +86,8 @@ * international/mule-cmds.el (language-info-alist): Doc-string modified. - (set-language-info-alist): Fix typo in doc-string. Update - setup-language-environment-map unconditionally. + (set-language-info-alist): Fix typo in doc-string. + Update setup-language-environment-map unconditionally. (mule-keymap): Key bindings for set-selection-coding-system and set-next-selection-coding-system. (set-coding-system-map): Add items of set-selection-coding-system @@ -110,13 +110,13 @@ 1998-08-14 Andreas Schwab - * international/mule-cmds.el (select-safe-coding-system): If - default-coding-system is no-conversion return that, it is always + * international/mule-cmds.el (select-safe-coding-system): + If default-coding-system is no-conversion return that, it is always safe. 1998-08-13 Eric Ludlam - * speedbar.el (speedbar-frame-parameters): Removed scroll-bar-width. + * speedbar.el (speedbar-frame-parameters): Remove scroll-bar-width. 1998-08-13 Richard Stallman @@ -124,9 +124,9 @@ * dired-aux.el (dired-do-rename-regexp): Doc fix. - * midnight.el (midnight-float-time): Renamed from float-time. - (midnight-time-float): Renamed from time-float. - (midnight-buffer-display-time): Renamed from buffer-display-time. + * midnight.el (midnight-float-time): Rename from float-time. + (midnight-time-float): Rename from time-float. + (midnight-buffer-display-time): Rename from buffer-display-time. (midnight-mode): Specify :initialize. Use nil as default value. * complete.el (PC-do-completion): Exclude ./ and ../ from completion. @@ -201,14 +201,14 @@ (read-language-name): Handle the case that the arg KEY is nil. (describe-language-environment): Handle input-method property. - * international/quail.el (quail-start-translation): If - enable-multibyte-characters is nil, convert multibyte character to + * international/quail.el (quail-start-translation): + If enable-multibyte-characters is nil, convert multibyte character to unibyte. (quail-start-conversion): Likewise. * language/: All files under this directory modified as below. - (setup-XXX-environment): Just call set-language-environment. If - they used to do some other jobs than what done by + (setup-XXX-environment): Just call set-language-environment. + If they used to do some other jobs than what done by set-language-environment, those jobs are done in setup-XXX-environment-internal now. ("LANGUAGE-ENVIRONMENT"): Delete property setup-function or change @@ -278,7 +278,7 @@ 1998-08-08 Eric M. Ludlam * speedbar.el (speedbar-edit-line, speedbar-buffer-kill-buffer) - (speedbar-buffer-revert-buffer): Updated buffer finding regex to + (speedbar-buffer-revert-buffer): Update buffer finding regex to handle the [?] tag. (speedbar-find-selected-file): New function. (speedbar-clear-current-file): Uses `speedbar-find-selected-file'. @@ -364,18 +364,18 @@ (quail-start-translation): Handle the case the arg KEY is nil. Bind echo-keystrokes and help-char. Initialize quail-current-str to "". If input-method-use-echo-area is non-nil, call - read-key-sequence with appropriate PROMPT arg. Setup - last-command-event by local variable `keyseq'. Generate an event + read-key-sequence with appropriate PROMPT arg. + Setup last-command-event by local variable `keyseq'. Generate an event list form quail-current-str. If input-method-exit-on-first-char is non-nil, return only the first event. - (quail-start-conversion): Likewise. Initialize - quail-conversion-str to "". Generate an event list form + (quail-start-conversion): Likewise. + Initialize quail-conversion-str to "". Generate an event list form quail-conversion-str. (quail-update-translation): Expect that the function given by (quail-update-translation-function) returns a new control-flag. - Handle the case the length of quail-current-key is 1. Use - string-as-unibyte if enable-multibyte-characters is nil. Always - assures that quail-current-str is Lisp string. + Handle the case the length of quail-current-key is 1. + Use string-as-unibyte if enable-multibyte-characters is nil. + Always assures that quail-current-str is Lisp string. (quail-self-insert-command): Use `or' instead of `unless'. (quail-update-current-translations): Always assures that quail-current-str is Lisp string. @@ -429,14 +429,14 @@ 1998-08-04 Eric Ludlam - * speedbar.el (speedbar-refresh): Removed special code to remove + * speedbar.el (speedbar-refresh): Remove special code to remove the speedbar update message. Not necessary here. (speedbar-timer-fn): Add code to remove the updating message and thus restore the minibuffer. - (speedbar-center-buffer-smartly): Fixed center error to handle + (speedbar-center-buffer-smartly): Fix center error to handle the whole buffer. (speedbar-delete-subblock): Rewrote to be more robust, less clever. - (speedbar-timer-fn): Removed short display time for messages. + (speedbar-timer-fn): Remove short display time for messages. 1998-08-04 Dave Love @@ -445,8 +445,8 @@ 1998-08-04 Eli Zaretskii - * international/mule.el (find-new-buffer-file-coding-system): When - inhibit-eol-conversion is non-nil and the buffer didn't already + * international/mule.el (find-new-buffer-file-coding-system): + When inhibit-eol-conversion is non-nil and the buffer didn't already set a fully-qualified coding system, force -unix eol-type. 1998-08-04 Richard Stallman @@ -469,15 +469,15 @@ 1998-08-03 Eric Ludlam - * info.el (Info-speedbar-hierarchy-buttons): Improved the speedbar + * info.el (Info-speedbar-hierarchy-buttons): Improve the speedbar frame management. - * speedbar.el (speedbar-update-current-file): Added call to + * speedbar.el (speedbar-update-current-file): Add call to `speedbar-center-buffer-smartly' to improve the display. (speedbar-center-buffer-smartly) Fixed off-by-one error in window height calculation. (speedbar-hack-buffer-menu): New function. - (speedbar-frame-parameters): Removed scroll bar width. + (speedbar-frame-parameters): Remove scroll bar width. (speedbar-frame-mode): Change pointer shape for X and W32 window-systems only. When window-system is pc, bind the speedbar frame name to "Speedbar", and select that frame so it is @@ -488,8 +488,8 @@ (speedbar-directory-buttons-follow): Support both upper- and lower-case drive letters. Use directory-sep-char instead of a literal backslash. - (speedbar-reconfigure-keymaps): Call - `easy-menu-remove' before reconfiguring for a new menu bar. + (speedbar-reconfigure-keymaps): + Call `easy-menu-remove' before reconfiguring for a new menu bar. (speedbar-previous-menu): New Variable. (speedbar-frame-plist): Remove pointers. (speedbar-refresh): Prevent the mark from being deactivated. @@ -505,8 +505,8 @@ * international/kkc.el (kkc-lookup-cache): Initialize it to nil. (kkc-lookup-cache-tag): New constant. - (kkc-lookup-key): If kkc-lookup-cache is nil, initialize it. Use - kkc-init-file-name. + (kkc-lookup-key): If kkc-lookup-cache is nil, initialize it. + Use kkc-init-file-name. (kkc-region): Fix previous change. Call kkc-error on error. (kkc-shorter-conversion, kkc-longer-phrase): New functions. (kkc-keymap): Bind them to "I" and "O" respectively. @@ -547,8 +547,8 @@ * language/cyril-util.el (cyrillic-encode-koi8-r-char): New function. (cyrillic-encode-alternativnyj-char): New function. - * language/cyrillic.el (cyrillic-koi8-r-decode-table): New - variable. + * language/cyrillic.el (cyrillic-koi8-r-decode-table): + New variable. (cyrillic-koi8-r-encode-table): Likewise. (ccl-decode-koi8): Use cyrillic-koi8-r-decode-table. (ccl-encode-koi8): Use cyrillic-koi8-r-encode-table. @@ -558,10 +558,10 @@ charset-origin-alist properties. (cyrillic-alternativnyj-decode-table): New variable. (cyrillic-alternativnyj-encode-table): Likewise. - (ccl-decode-alternativnyj): Use - cyrillic-alternativnyj-decode-table. - (ccl-encode-alternativnyj): Use - cyrillic-alternativnyj-encode-table. + (ccl-decode-alternativnyj): + Use cyrillic-alternativnyj-decode-table. + (ccl-encode-alternativnyj): + Use cyrillic-alternativnyj-encode-table. (ccl-encode-alternativnyj-font): Likewise. (cyrillic-alternativnyj-nonascii-translation-table): New variable. ("Cyrillic-ALT"): Add nonascii-translation-table and @@ -615,8 +615,8 @@ * emacs-lisp/cl-indent.el (lisp-indent-defun-method): New variable. (common-lisp-indent-function): Use it. (lisp-indent-259): Uncomment the `&lambda' code. - (top-level let): Remove duplicate `catch' and `block'. Use - `&lambda' when appropriate. Now the lambda lists are indented + (top-level let): Remove duplicate `catch' and `block'. + Use `&lambda' when appropriate. Now the lambda lists are indented appropriately. 1998-07-30 Richard Stallman @@ -697,7 +697,7 @@ 1998-07-27 Richard Stallman * textmodes/flyspell.el (flyspell-emacs-popup): - Renamed from flyspell-gnuemacs-popup. Callers changed. + Rename from flyspell-gnuemacs-popup. Callers changed. (push): Macro deleted. Callers changed to do it explicitly. (flyspell-incorrect-face, flyspell-duplicate-face): Use defface. (flyspell-incorrect-color): Variable deleted. @@ -705,7 +705,7 @@ (flyspell-underline-p): Variable deleted. (flyspell-font-lock-make-face): Function deleted. (flyspell-mark-duplications-flag): - Renamed from flyspell-doublon-as-error-flag. + Rename from flyspell-doublon-as-error-flag. (flyspell-mode-on): Delete the debugging message. (flyspell-mode-off): Delete the debugging message. (flyspell-mode-on): Set flyspell-generic-check-word-p @@ -796,16 +796,16 @@ 1998-07-25 Kenichi Handa * international/mule.el (auto-coding-alist): New variable. - (set-auto-coding): Argument FILENAME is added. Check - auto-coding-alist at first. + (set-auto-coding): Argument FILENAME is added. + Check auto-coding-alist at first. * international/kkc.el (kkc-region): Unwind-protect the conversion process. (kkc-show-conversion-list-update): Pay attention to the length of kkc-show-conversion-list-index-chars. - * international/mule-cmds.el (find-multibyte-characters): New - function. + * international/mule-cmds.el (find-multibyte-characters): + New function. (select-safe-coding-system): Highlight characters which can't be encoded. Show list of such characters also in *Warning* buffer. @@ -822,10 +822,10 @@ (crisp-last-last-command): Doc fix. (mark-something): Function deleted. (crisp-mark-line): Avoid using mark-something. - (crisp-region-active): Renamed from region-active. - (crisp-set-clipboard): Renamed from copy-primary-selection. - (crisp-kill-region): Renamed from kill-primary-selection. - (crisp-yank-clipboard): Renamed from yank-clipboard-selection. + (crisp-region-active): Rename from region-active. + (crisp-set-clipboard): Rename from copy-primary-selection. + (crisp-kill-region): Rename from kill-primary-selection. + (crisp-yank-clipboard): Rename from yank-clipboard-selection. * files.el (basic-save-buffer-2): New function. (basic-save-buffer-1): Use basic-save-buffer-2, @@ -850,8 +850,8 @@ 1998-07-23 Ken'ichi Handa - * international/quail.el (quail-start-translation): Call - this-single-command-raw-keys instead of this-single-command-keys. + * international/quail.el (quail-start-translation): + Call this-single-command-raw-keys instead of this-single-command-keys. (quail-start-conversion): Likewise. 1998-07-23 Kenichi Handa @@ -862,8 +862,8 @@ not isearch-printing-char, don't read multibyte chars from minibuffer, but just call isearch-process-search-char. - * international/quail.el (quail-start-translation): Use - this-single-command-keys to get raw events instead of + * international/quail.el (quail-start-translation): + Use this-single-command-keys to get raw events instead of listify-key-sequence. (quail-start-conversion): Likewise. @@ -878,7 +878,7 @@ (imenu-extract-index-name-function, imenu-default-goto-function) (imenu-sort-function, imenu-prev-index-position-function): Likewise. - * ange-ftp.el (ange-ftp-reread-dir): Renamed from `re-read'. + * ange-ftp.el (ange-ftp-reread-dir): Rename from `re-read'. Old name defined as alias. Doc fix. 1998-07-21 Kenichi Handa @@ -888,8 +888,8 @@ (kkc-terminate): Update kkc-overlay-head correctly. (kkc-cancel): Don't call kkc-terminate, but set kkc-converting to nil. - * international/quail.el (quail-simple-translation-keymap): Typo - in doc-string fixed. + * international/quail.el (quail-simple-translation-keymap): + Typo in doc-string fixed. (quail-start-translation): Check start position of quail-overlay before calling quail-overlay-region-events. (quail-start-conversion): Likewise. @@ -915,8 +915,8 @@ * isearch.el (isearch-input-method-function): New variable. (isearch-input-method-local-p): New variable. - (isearch-mode): Setup the above two variable. Set - input-method-function to nil locally. + (isearch-mode): Setup the above two variable. + Set input-method-function to nil locally. (isearch-done): Restore the previous value of input-method-function. @@ -939,7 +939,7 @@ * international/kkc.el (kkc-region): Fix the return value. * international/isearch-x.el - (isearch-toggle-specified-input-method): Adjusted for the change + (isearch-toggle-specified-input-method): Adjust for the change in isearch.el. (isearch-toggle-input-method): Likewise. (isearch-minibuffer-local-map): New variable. @@ -949,8 +949,8 @@ characters from minibuffer with the keymap isearch-minibuffer-local-map. - * international/mule-cmds.el (read-multilingual-string): Don't - activate an input method in the current buffer, but just bind + * international/mule-cmds.el (read-multilingual-string): + Don't activate an input method in the current buffer, but just bind current-input-method. * language/japan-util.el (japanese-replace-region): New function. @@ -964,7 +964,7 @@ 1998-07-17 Simon Marshall - * lazy-lock.el (lazy-lock-fontify-after-visage): Renamed from + * lazy-lock.el (lazy-lock-fontify-after-visage): Rename from lazy-lock-fontify-after-outline. (lazy-lock-install-hooks): Add it to hs-hide-hook too. (lazy-lock-unstall): Remove it from hs-hide-hook too. @@ -989,14 +989,14 @@ * international/kkc.el (kkc-show-conversion-list-index-chars): Default value changed. - (kkc-keymap): Renamed from kkc-mode-map. Key binding for + (kkc-keymap): Rename from kkc-mode-map. Key binding for kkc-non-kkc-command are deleted. (kkc-mode): This function deleted. (kkc-canceled): This variable deleted. (kkc-converting): New variable. (kkc-region): 3rd optional arg is deleted. Completely rewritten to adjust for the change in quail.el. - (kkc-terminate, kkc-cancel): Adjusted for the change of + (kkc-terminate, kkc-cancel): Adjust for the change of kkc-region. (kkc-non-kkc-command): This function deleted. (kkc-select-from-list): Use last-input-event instead of @@ -1008,16 +1008,16 @@ (quail-current-str, quail-current-translations): Likewise. (quail-reset-conversion-region): This variable deleted. (quail-use-package): Call quail-activate at the tail. - (quail-translation-keymap, quail-simple-translation-keymap): Key - bindings for quail-execute-non-quail-command deleted. + (quail-translation-keymap, quail-simple-translation-keymap): + Key bindings for quail-execute-non-quail-command deleted. (quail-conversion-keymap): Likewise. Add key bindings for quail-self-insert-command. (quail-delete-overlays): Check overlay-start for overlays before deleting them. (quail-mode): This function deleted. (quail-inactivate, quail-activate): New functions. - (quail-saved-current-map, quail-saved-current-buffer): These - variables deleted. + (quail-saved-current-map, quail-saved-current-buffer): + These variables deleted. (quail-toggle-mode-temporarily, quail-execute-non-quail-command): These functions deleted. (quail-exit-conversion-mode, quail-prefix-arg): These variables @@ -1032,9 +1032,9 @@ (quail-start-conversion): New function. (quail-terminate-translation): Just set quail-translating to nil. (quail-update-translation): Put some events back to - unread-input-method-events instead of unread-command-events. Call - quail-error instead of error. - (quail-self-insert-command): Adjusted for the change of + unread-input-method-events instead of unread-command-events. + Call quail-error instead of error. + (quail-self-insert-command): Adjust for the change of quail-start-translation. (quail-next-translation): Don't call quail-execute-non-quail-command, instead, put an event back of @@ -1079,7 +1079,7 @@ (crisp-mode-map): Make this a sparse keymap parented from current-global-map. (crisp-mode-original-keymap): Don't copy the keymap. - (crisp-last-last-command): Renamed from last-last-command. defvar it. + (crisp-last-last-command): Rename from last-last-command. defvar it. (crisp-mode): Honor ARG. (crisp-kill-line, crisp-copy-line): When a region isn't highlighted, @@ -1145,7 +1145,7 @@ 1998-07-12 Richard Stallman * international/mule.el (set-selection-coding-system): - Renamed from set-clipboard-coding-system. + Rename from set-clipboard-coding-system. Set the variable's new name, selection-coding-system. * mail/rmailout.el (rmail-output-to-rmail-file): @@ -1155,9 +1155,9 @@ * speedbspec.el: Deleted; now integrated into speedbar.el. * speedbar.el: More commentary. - (speedbar-xemacsp): Moved definition. - (speedbar-initial-expansion-mode-list): Was - `speedbar-initial-expansion-list' and now has multiple modes. + (speedbar-xemacsp): Move definition. + (speedbar-initial-expansion-mode-list): + Was `speedbar-initial-expansion-list' and now has multiple modes. (speedbar-stealthy-function-list): Now has mode labels. (speedbar-initial-expansion-list-name) (speedbar-previously-used-expansion-list-name) @@ -1165,27 +1165,27 @@ (speedbar-tag-hierarchy-method, speedbar-tag-split-minimum-length) (speedbar-tag-regroup-maximum-length) (speedbar-hide-button-brackets-flag): New variables. - (speedbar-special-mode-expansion-list): Updated documentation. + (speedbar-special-mode-expansion-list): Update documentation. (speedbar-navigating-speed, speedbar-update-speed): Phasing out. - (speedbar-vc-indicator): Removed space from this var. + (speedbar-vc-indicator): Remove space from this var. (speedbar-indicator-separator, speedbar-obj-do-check) (speedbar-obj-to-do-point, speedbar-obj-indicator, speedbar-obj-alist) (speedbar-indicator-regex): New variables. (speedbar-directory-unshown-regexp): New variable. - (speedbar-supported-extension-expressions): Added more extensions. + (speedbar-supported-extension-expressions): Add more extensions. (speedbar-add-supported-extension) (speedbar-add-ignored-path-regexp): Made interactive. (speedbar-update-flag): Nil w/ no window system. - (speedbar-file-key-map): Moved some key bindings from + (speedbar-file-key-map): Move some key bindings from `speedbar-key-map' to this map. (speedbar-make-specialized-keymap): New function. (speedbar-file-key-map): New key map. - (speedbar-easymenu-definition-special): Updated to new functions. - (speedbar-easymenu-definition-trailer): Changed conditional part. - (speedbar-frame-mode): Removed commented code, fixed W32 cursor + (speedbar-easymenu-definition-special): Update to new functions. + (speedbar-easymenu-definition-trailer): Change conditional part. + (speedbar-frame-mode): Remove commented code, fixed W32 cursor bug, Updated to better handle terminal frames. (speedbar-switch-buffer-attached-frame): New function. - (speedbar-mode): Updated documentation, no local keymap, + (speedbar-mode): Update documentation, no local keymap, correct `temp-buffer-show-function' use, enable mouse-tracking. (speedbar-show-info-under-mouse): New function. (speedbar-reconfigure-keymaps): Was `speedbar-reconfigure-menubar'. @@ -1195,9 +1195,9 @@ (speedbar-restricted-move, speedbar-restricted-next) (speedbar-restricted-prev, speedbar-navigate-list) (speedbar-forward-list, speedbar-backward-list): New commands. - (speedbar-refresh): Updated message printing & verbosity. - (speedbar-item-load): Updated message. - (speedbar-item-byte-compile): Updated doc & reset scanners. + (speedbar-refresh): Update message printing & verbosity. + (speedbar-item-load): Update message. + (speedbar-item-byte-compile): Update doc & reset scanners. (speedbar-item-info): Overhauled with more details. (speedbar-item-copy): Update messages. (speedbar-generic-item-info): New function. @@ -1245,7 +1245,7 @@ * mail/rmail.el: No longer depends on speedbspec for byte compile. (rmail-speedbar-match-folder-regexp): New variable. - (rmail-speedbar-menu-items): Updated speedbar menu items. + (rmail-speedbar-menu-items): Update speedbar menu items. (rmail-speedbar-key-map): New keymap. (rmail-install-speedbar-variables): New function. Install speedbar keymap only when speedbar is loaded. @@ -1264,13 +1264,13 @@ * gud.el (gud-speedbar-key-map): New variable. (gud-install-speedbar-variables): New function Install speedbar keymap only when speedbar is loaded. - (gud-gdb-get-stackframe): Added ":" to regex for c++. + (gud-gdb-get-stackframe): Add ":" to regex for c++. 1998-07-09 Sam Steingold * emacs-lisp/cl-indent.el: Indent `handler-case' correctly. - * font-lock.el (lisp-font-lock-keywords): Fontify - `handler-case', `ccase', `ctypecase', `assert', `error'. + * font-lock.el (lisp-font-lock-keywords): + Fontify `handler-case', `ccase', `ctypecase', `assert', `error'. 1998-07-09 Andrew Innes @@ -1342,8 +1342,8 @@ 1998-07-05 Richard Stallman - * mail/mail-utils.el (rmail-dont-reply-to): Understand - about doublequotes; don't be fooled by commas inside them. + * mail/mail-utils.el (rmail-dont-reply-to): + Understand about doublequotes; don't be fooled by commas inside them. 1998-07-04 Richard Stallman @@ -1378,7 +1378,7 @@ 1998-07-03 Espen Skoglund - * pascal.el (pascal-insert-block): Fixed space-deletion bug in + * pascal.el (pascal-insert-block): Fix space-deletion bug in front of the "begin" string. (pascal-beg-of-defun): Used to locate the beginning of a function incorrectly when a function contained several begin-end blocks. @@ -1398,7 +1398,7 @@ * dos-vars.el (dos-printer): Obsolete variable deleted. (dos-ps-printer): Likewise. - * dos-w32.el (direct-print-region-function): Renamed from + * dos-w32.el (direct-print-region-function): Rename from dos-print-region-function. Added &rest keyword. (print-region-function): Set to direct-print-region-function. (lpr-headers-switches): Initialize. @@ -1441,12 +1441,12 @@ 1998-07-03 Eric Ludlam - * emacs-lisp/checkdoc.el (checkdoc): Updated commentary. - (checkdoc-autofix-flag): Updated doc. - (checkdoc-force-docstrings-flag): Updated doc. + * emacs-lisp/checkdoc.el (checkdoc): Update commentary. + (checkdoc-autofix-flag): Update doc. + (checkdoc-force-docstrings-flag): Update doc. (checkdoc-force-history-flag): New flag. - (checkdoc-triple-semi-comment-check-flag): Fixed name. - (checkdoc-spellcheck-documentation-flag): Fixed doc. + (checkdoc-triple-semi-comment-check-flag): Fix name. + (checkdoc-spellcheck-documentation-flag): Fix doc. (checkdoc-ispell-lisp-words): Update default value. (checkdoc-generate-compile-warnings-flag, checkdoc-proper-noun-list) (checkdoc-proper-noun-regexp, checkdoc-symbol-words): New variables. @@ -1458,22 +1458,22 @@ Cursor now sits next to the error, forcing scrolling if needed, and using a better centering algorithm, and much better error navigation after choosing "f"ix. - (checkdoc-next-error): Added parameter ENABLE-FIX. + (checkdoc-next-error): Add parameter ENABLE-FIX. (checkdoc-next-message-error, checkdoc-recursive-edit): New functions. (checkdoc-start): Was `checkdoc', uses new note taking system. (checkdoc-current-buffer, checkdoc-continue, checkdoc-comments): - Updated to use new note taking system. + Update to use new note taking system. (checkdoc-rogue-spaces, checkdoc-rogue-space-check-engine): - Added INTERACT parameter, uses new warnings functions. + Add INTERACT parameter, uses new warnings functions. (checkdoc-message-text, checkdoc-defun): - Updated to use new note taking system. + Update to use new note taking system. (checkdoc-ispell-current-buffer, checkdoc-ispell-interactive): Fix doc. (checkdoc-ispell-message-text, checkdoc-ispell-start): New function. (checkdoc-create-error, checkdoc-error-text, checkdoc-error-start) (checkdoc-error-end, checkdoc-error-unfixable): New functions. - (checkdoc-minor-keymap): Updated keybinds to new interactive functions, + (checkdoc-minor-keymap): Update keybinds to new interactive functions, completely re-arranged the minor-mode menu. - (checkdoc-this-string-valid): Moved no doc-string warning here, + (checkdoc-this-string-valid): Move no doc-string warning here, and added autofix if a comment already exists there. (checkdoc-this-string-valid-engine): Fix doc, robusted doc finder. All previously returned errors now call `checkdoc-create-error'. @@ -1497,7 +1497,7 @@ for history and commentary. All previously returned errors now call `checkdoc-create-error'. Message spelling and format. (checkdoc-message-text-search): - Moved parts to `checkdoc-message-text-next-string'. + Move parts to `checkdoc-message-text-next-string'. (checkdoc-message-text-next-string): New function. (checkdoc-message-text-engine): All previously returned errors now call `checkdoc-create-error'. Can find/skip 'format' call @@ -1506,12 +1506,12 @@ (checkdoc-y-or-n-p): New function. (checkdoc-autofix-ask-replace): Update doc. Protect match-data. Correctly handle `checkdoc-autofix-flag' of 'never. New behavior - with `checkdoc-autofix-flag' of 'automatic-then-never. Better - overlay handling. - (checkdoc-output-font-lock-keywords): Updated to new output format. + with `checkdoc-autofix-flag' of 'automatic-then-never. + Better overlay handling. + (checkdoc-output-font-lock-keywords): Update to new output format. (checkdoc-pending-errors): New variable. - (checkdoc-find-error): Updated to new output format. - (checkdoc-start-section, checkdoc-error): Improved the output. + (checkdoc-find-error): Update to new output format. + (checkdoc-start-section, checkdoc-error): Improve the output. (checkdoc-show-diagnostics): Smarter show algorithm. 1998-07-03 Kenichi Handa @@ -1563,12 +1563,12 @@ * derived.el (derived-mode-hooks-name): Use -hook, not -hooks, in mode hook name. - (derived-mode-hook-name): Renamed from ...-hooks; caller changed. + (derived-mode-hook-name): Rename from ...-hooks; caller changed. 1998-07-01 Ken'ichi Handa - * international/mule.el (mule-version): Changed to 4.0. - (mule-version-date): Updated. + * international/mule.el (mule-version): Change to 4.0. + (mule-version-date): Update. 1998-06-30 Richard Stallman @@ -1679,7 +1679,7 @@ * language/korea-util.el (isearch-toggle-korean-input-method) (isearch-hangul-switch-symbol-ksc, isearch-hangul-switch-hanja): New functions. - (korean-key-bindings): Renamed from exit-korean-environment-data. + (korean-key-bindings): Rename from exit-korean-environment-data. Initialized appropriately. (setup-korean-environment): Setup key bindings according to korean-key-bindings. @@ -1714,10 +1714,10 @@ of `find-function-noselect'. (find-function-search-for-symbol): `regexp-quote' the symbol name: needed to find-function `mapcar*' for example. - (find-function-noselect): Improved docstring. Don't include + (find-function-noselect): Improve docstring. Don't include `library' in let. Use `symbol-file' instead of `describe-symbol-find-file'. - (find-function-read): Renamed from `find-function-read-function'. + (find-function-read): Rename from `find-function-read-function'. With optional arg now read a variable. (find-function-read): Separate `completing-read' calls for variables and functions. @@ -1746,7 +1746,7 @@ (find-variable-other-window): Remove most of docstring and add reference to `find-variable' instead. (find-variable-other-frame): Ditto. - (find-function-on-key): Simplified. Removed stuff now taken care + (find-function-on-key): Simplify. Removed stuff now taken care of by interactive "k". (find-function-at-point): New function. (find-variable-at-point): Ditto. @@ -1768,7 +1768,7 @@ 1998-06-24 Andrew Innes - * dos-w32.el (null-device): Renamed from grep-null-device. + * dos-w32.el (null-device): Rename from grep-null-device. 1998-06-24 Richard Stallman @@ -1795,8 +1795,8 @@ (ange-ftp-generate-anonymous-password): Use `other' widget type. * autoinsert.el (auto-insert, auto-insert-query): Use `other' widget type. - * bookmark.el (bookmark-save-flag, bookmark-version-control): Use - `other' widget type. + * bookmark.el (bookmark-save-flag, bookmark-version-control): + Use `other' widget type. * comint.el (comint-input-autoexpand): Use `other' widget type. * complete.el (PC-first-char): Use `other' widget type. * cus-edit.el (custom-magic-show): Use `other' widget type. @@ -1855,8 +1855,8 @@ 1998-06-23 Ken'ichi Handa - * international/fontset.el (x-style-funcs-alist): Remove - duplicated code. + * international/fontset.el (x-style-funcs-alist): + Remove duplicated code. 1998-06-23 Richard Stallman @@ -1896,8 +1896,8 @@ `composition'. Add property `jisx0208' to Japanese hankaku characters. (japanese-kana-table): Add more data. (japanese-symbol-table): Change the order of elements. - (japanese-katakana-region): Adjusted for the above changes. Check - character code properties directly here. + (japanese-katakana-region): Adjust for the above changes. + Check character code properties directly here. (japanese-hiragana-region): Likewise. (japanese-hankaku-region): Likewise. (japanese-zenkaku-region): Likewise. @@ -1983,8 +1983,8 @@ 1998-06-20 Kenichi Handa - * international/fontset.el (x-style-funcs-alist): If - x-make-font-demibold or x-make-font-bold return nil, don't try + * international/fontset.el (x-style-funcs-alist): + If x-make-font-demibold or x-make-font-bold return nil, don't try further style modification. * international/encoded-kb.el (encoded-kbd-self-insert-sjis): @@ -2003,8 +2003,8 @@ ethio-mode-map, and function ethio-mode. (exit-ethiopic-environment-data): New variable. (setup-ethiopic-environment): Recode information of changed key - bindings in exit-ethiopic-environment-data. Add - ethio-select-a-translation to quail-mode-hook. + bindings in exit-ethiopic-environment-data. + Add ethio-select-a-translation to quail-mode-hook. (exit-ethiopic-environment): New function. (ethio-find-file): Don't check ethio-mode. (ethio-write-file): Likewise. @@ -2067,7 +2067,7 @@ * international/mule.el (set-auto-coding): Redo the previous change. - * tar-mode.el (tar-extract): Adjusted for the change of the spec + * tar-mode.el (tar-extract): Adjust for the change of the spec of set-auto-coding-function. 1998-06-14 Richard Stallman @@ -2154,8 +2154,8 @@ * faces.el (set-face-font): Pay attention to fontset. (set-face-font-auto): Call resolve-fontset-name. - * international/fontset.el (instantiate-fontset): Delete - duplicated call of x-complement-fontset-spec. Call new-fontset + * international/fontset.el (instantiate-fontset): + Delete duplicated call of x-complement-fontset-spec. Call new-fontset with a correct argument. (x-compose-font-name): Argument name adjusted for the doc-string. (x-complement-fontset-spec): Don't alter the contents of the @@ -2163,8 +2163,8 @@ (x-style-funcs-alist): The format changed. (x-modify-font-name): New function. (create-fontset-from-fontset-spec): The arg STYLE-VARIANT-P is - changed to STYLE-VARIANT, the format also changed. Use - x-modify-font-name instead of calling functions in + changed to STYLE-VARIANT, the format also changed. + Use x-modify-font-name instead of calling functions in x-style-funcs-alist directly. (instantiate-fontset): Use x-modify-font-name instead of calling functions in x-style-funcs-alist directly. @@ -2283,8 +2283,8 @@ 1998-06-09 Ed Reingold - * calendar/cal-tex.el (cal-tex-list-diary-entries): Set - diary-display-hook correctly. + * calendar/cal-tex.el (cal-tex-list-diary-entries): + Set diary-display-hook correctly. * calendar/cal-menu.el (calendar-mouse-holidays) (calendar-mouse-view-diary-entries) @@ -2342,8 +2342,8 @@ 1998-06-08 Andrew Innes - * ange-ftp.el (ange-ftp-file-name-completion): Use - ange-ftp-this-dir instead of literal "/" when calling real + * ange-ftp.el (ange-ftp-file-name-completion): + Use ange-ftp-this-dir instead of literal "/" when calling real completion function. 1998-06-08 Richard Stallman @@ -2450,8 +2450,8 @@ 1998-06-05 Andrew Innes - * jka-compr.el (jka-compr-write-region): Ensure - `last-coding-system-used' is updated, so that basic-save-buffer + * jka-compr.el (jka-compr-write-region): + Ensure `last-coding-system-used' is updated, so that basic-save-buffer sees the right value. 1998-06-05 Richard Stallman @@ -2531,8 +2531,8 @@ * docref.el: Deleted in view of current approach to doc strings. - * startup.el (normal-top-level-add-subdirs-to-load-path): Ignore - CVS directories too. + * startup.el (normal-top-level-add-subdirs-to-load-path): + Ignore CVS directories too. 1998-06-02 Richard Stallman @@ -2571,15 +2571,15 @@ 1998-06-01 Per Starbäck - * apropos.el (apropos-variable): Fixed argument to apropos-command. + * apropos.el (apropos-variable): Fix argument to apropos-command. (apropos-command): Let `var-predicate' have higher priority than `do-all'. 1998-06-01 Dave Love * textmodes/sgml-mode.el (sgml-font-lock-keywords-1): Add -. as - NMCHARs. Elide upper case (see font-lock-defaults). Generalize - comment declaration not to exclude markup. + NMCHARs. Elide upper case (see font-lock-defaults). + Generalize comment declaration not to exclude markup. 1998-05-31 Richard Stallman @@ -2602,8 +2602,8 @@ 1998-05-31 Alan Shutko - * emacs-lisp/easy-mmode.el (easy-mmode-define-minor-mode): Add - missing format arg. + * emacs-lisp/easy-mmode.el (easy-mmode-define-minor-mode): + Add missing format arg. 1998-05-30 Dave Love @@ -2626,17 +2626,17 @@ 1998-05-30 Michael Kifer * ediff-mult.el (ediff-mark-for-hiding-at-pos) - (ediff-mark-for-operation-at-pos): Renamed from + (ediff-mark-for-operation-at-pos): Rename from ediff-mark-for-hiding, ediff-mark-for-operation. (ediff-mark-session-for-hiding, ediff-mark-session-for-operation) - (ediff-unmark-all-for-operation, ediff-unmark-all-for-hiding): New - functions. - (ediff-setup-meta-map): Changed bindings. + (ediff-unmark-all-for-operation, ediff-unmark-all-for-hiding): + New functions. + (ediff-setup-meta-map): Change bindings. * viper-cmd.el (viper-backward-Word, viper-skip-separators): Bugfix. (viper-switch-to-buffer, viper-switch-to-buffer-other-window): Bugfix. * viper-util.el (viper-skip-syntax): Bug fix for eob/bob cases. - * viper-mous.el (viper-surrounding-word): Added '_' to alpha modifiers. + * viper-mous.el (viper-surrounding-word): Add '_' to alpha modifiers. 1998-05-30 Ralph Schleicher @@ -2700,8 +2700,8 @@ 1998-05-27 Ed Reingold - * calendar/calendar.el (calendar-buffer-list): Add - other-calendars-buffer. + * calendar/calendar.el (calendar-buffer-list): + Add other-calendars-buffer. (calendar-mode): Use activate-menubar-hook only in a window system. 1998-05-27 Dave Love @@ -2794,13 +2794,13 @@ * emacs-lisp/byte-opt.el (byte-boolean-vars): Add print-escape-nonascii. - * emacs-lisp/autoload.el (generate-file-autoloads): Set - print-escape-nonascii when printing autoload form. + * emacs-lisp/autoload.el (generate-file-autoloads): + Set print-escape-nonascii when printing autoload form. 1998-05-25 Kenichi HANDA - * international/mule.el (set-coding-priority): Call - set-coding-priority-internal at the tail. + * international/mule.el (set-coding-priority): + Call set-coding-priority-internal at the tail. 1998-05-24 Stephen Eglen @@ -2924,12 +2924,12 @@ Use translation-table, not character-translation-table, as char-table subtype. (define-translation-table): - Renamed from define-character-translation-table. + Rename from define-character-translation-table. * mule-util.el: Likewise. * mule-conf.el: Likewise. (standard-translation-table-for-decode) (standard-translation-table-for-encode): - Renamed from standard-character-translation-table-... + Rename from standard-character-translation-table-... 1998-05-21 Richard Stallman @@ -2965,17 +2965,17 @@ 1998-05-21 Eli Zaretskii - * arc-mode.el (archive-file-name-invalid-regexp): Remove. All - users changed to use file-name-invalid-regexp instead. + * arc-mode.el (archive-file-name-invalid-regexp): Remove. + All users changed to use file-name-invalid-regexp instead. * files.el (file-name-invalid-regexp): New variable, moved here from arc-mode.el. 1998-05-21 Richard Stallman * progmodes/vhdl-mode.el (vhdl-customize-colors): - Renamed from vhdl-use-default-colors, and sense reversed. + Rename from vhdl-use-default-colors, and sense reversed. (vhdl-customize-faces): - Renamed from vhdl-use-default-faces, and sense reversed. + Rename from vhdl-use-default-faces, and sense reversed. (vhdl-font-lock-init, vhdl-ps-init): Implement those changes. (vhdl-submit-bug-report): Use new variable names. @@ -2994,10 +2994,10 @@ FONTLIST). (x-style-funcs-alist): New variable. (create-fontset-from-fontset-spec): 2nd optional arg is changed - from STYLE to STYLE-VARIANT-P. The meaning also changed. Delete - unused code. Adjusted for the change of + from STYLE to STYLE-VARIANT-P. The meaning also changed. + Delete unused code. Adjusted for the change of uninstantiated-fontset-alist. - (instantiate-fontset): Adjusted for the change of + (instantiate-fontset): Adjust for the change of uninstantiated-fontset-alist. * international/mule.el (make-coding-system): If ISO2022 based @@ -3039,21 +3039,21 @@ 1998-05-20 Kenichi Handa - * international/fontset.el (x-font-name-charset-alist): New - variable. + * international/fontset.el (x-font-name-charset-alist): + New variable. (register-alternate-fontnames): Doc-string modified. (x-complement-fontset-spec): Likewise. - (x-complement-fontset-spec): Delete unused local variable. Delete - ad hoc code for Latin-1, instead refer to + (x-complement-fontset-spec): Delete unused local variable. + Delete ad hoc code for Latin-1, instead refer to x-font-name-charset-alist. (uninstantiated-fontset-alist): Format changed (BASE-FONTSET -> FONTLIST). (x-style-funcs-alist): New variable. (create-fontset-from-fontset-spec): 2nd optional arg is changed - from STYLE to STYLE-VARIANT-P. The meaning also changed. Delete - unused code. Adjusted for the change of + from STYLE to STYLE-VARIANT-P. The meaning also changed. + Delete unused code. Adjusted for the change of uninstantiated-fontset-alist. - (instantiate-fontset): Adjusted for the change of + (instantiate-fontset): Adjust for the change of uninstantiated-fontset-alist. * international/mule.el (make-coding-system): If ISO2022 based @@ -3083,7 +3083,7 @@ * international/mule-cmds.el: Several doc fixes. (get-language-info, set-language-info): Rename argument. (set-language-info-alist): Likewise. - (find-coding-systems-region-subset-p): Renamed from subset-p. + (find-coding-systems-region-subset-p): Rename from subset-p. (find-coding-systems-region): Use new name. (register-input-method): Rename argument. (activate-input-method): If INPUT-METHOD is nil, deactivate. @@ -3179,13 +3179,13 @@ (checkdoc-message-text-search, checkdoc-message-text-engine): New functions. (checkdoc-this-string-valid-engine): - Added ambiguous function/symbol checking. Added new auto-fix + Add ambiguous function/symbol checking. Added new auto-fix for missing parameters. 1998-05-16 Richard Stallman * international/mule-cmds.el (find-coding-systems-region-subset-p): - Renamed from subset-p. + Rename from subset-p. (find-coding-systems-for-charsets): Call changed. 1998-05-16 Dan Nicolaescu @@ -3217,7 +3217,7 @@ Use expand-file-name on it. * files.el (temporary-file-directory): - Renamed from system-tmp-directory. + Rename from system-tmp-directory. Value is now a directory name, not a file name. * dired-aux.el (dired-mark-subdir-files): Doc fix. @@ -3298,10 +3298,10 @@ All callers changed. (archive-unique-fname): New function. (archive-maybe-copy): Use it. - (archive-maybe-copy, archive-write-file): Bind - coding-system-for-write to no-conversion. - (archive-maybe-update, archive-mode-revert): Bind - coding-system-for-read to no-conversion. + (archive-maybe-copy, archive-write-file): + Bind coding-system-for-write to no-conversion. + (archive-maybe-update, archive-mode-revert): + Bind coding-system-for-read to no-conversion. (archive-maybe-update): Remain at the same line in the archive listing, after updating the archive. Print the buffer name of the archive to be saved. @@ -3309,8 +3309,8 @@ read-only. Don't set buffer-file-type. Remove the write-contents hook for remote archives. Warn about read-only archives inside other archives. - (archive-write-file-member): Handle remote archives. Restore - value of last-coding-system-used. + (archive-write-file-member): Handle remote archives. + Restore value of last-coding-system-used. (archive-*-write-file-member): Handle archives inside other archives. Save the value of last-coding-system-used. (archive-write-file): New optional variable FILE: where to write @@ -3442,10 +3442,10 @@ 1998-05-08 Richard Stallman - * ps-print.el (ps-alist-position): Renamed from ps-position. + * ps-print.el (ps-alist-position): Rename from ps-position. Look for ITEM as the car of an element. (ps-font-number): Use ps-alist-position. - (ps-font-alist): Renamed from ps-font-list. + (ps-font-alist): Rename from ps-font-list. * mail/reporter.el (reporter-bug-hook): Use rfc822-goto-eoh. @@ -3520,13 +3520,13 @@ 1998-05-06 Sam Steingold - * window.el (quit-window): Fixed FRAME to be the frame and + * window.el (quit-window): Fix FRAME to be the frame and never window. 1998-05-06 Michael Kifer * ediff-init.el (ediff-highlight-all-diffs, ediff-use-faces): - Changed the defaults. + Change the defaults. 1998-05-06 Richard Stallman @@ -3577,7 +3577,7 @@ 1998-05-05 Simon Marshall - * font-lock.el (lisp-font-lock-keywords-1): Fixed 1998-04-24 change; + * font-lock.el (lisp-font-lock-keywords-1): Fix 1998-04-24 change; moved defpackage to here from lisp-font-lock-keywords-2. 1998-05-05 Andreas Schwab @@ -3613,7 +3613,7 @@ Now checks for toolbar support before referring toolbars. * ediff-init.el (ediff-has-toolbar-support-p, ediff-use-toolbar-p): - Moved here from ???. + Move here from ???. * ediff-vers.el (cvs-run-ediff-on-file-descriptor): Set default-directory. @@ -3663,8 +3663,8 @@ * progmodes/compile.el (compilation-directory-stack): Doc fix. (compilation-mode): Accept optional parameter and initialize mode-name from it. - (compile-internal): Pass name-of-mode to compilation-mode. Don't - set mode-name here. + (compile-internal): Pass name-of-mode to compilation-mode. + Don't set mode-name here. (compilation-minor-mode): Don't let mode-line-process change. (compilation-next-error-locus): Use forward-char instead of move-to-column. @@ -3723,11 +3723,11 @@ 1998-05-02 Andre Spiegel - * vc-hooks.el (vc-parse-cvs-status): Optimized. Ignore - "Locally Removed" files. + * vc-hooks.el (vc-parse-cvs-status): Optimize. + Ignore "Locally Removed" files. * vc.el (vc-fetch-cvs-status): Don't specify DIR on the command line. - (vc-dired-hook): Optimized for CVS. + (vc-dired-hook): Optimize for CVS. 1998-05-02 Richard Stallman @@ -3776,19 +3776,19 @@ (file-cache-add-directory): Checks to see if directory exists before adding it. Non-existing directories are simply skipped. - * generic.el (generic): Added defgroup declaration. + * generic.el (generic): Add defgroup declaration. (generic-make-keywords-list): Uses regexp-opt. (generic-mode-set-font-lock): Uses regexp-opt. - * generic-x.el (generic-x): Added defgroup declaration. + * generic-x.el (generic-x): Add defgroup declaration. - * generic-x.el (generic-bat-mode-setup-function): Fixed comment-start + * generic-x.el (generic-bat-mode-setup-function): Fix comment-start variable. - * generic-x.el (generic-define-mswindows-modes): Enable - hosts-generic-mode and apache-generic-mode. + * generic-x.el (generic-define-mswindows-modes): + Enable hosts-generic-mode and apache-generic-mode. (generic-define-unix-modes): Enable alias-generic-mode. - (java-properties-generic-mode): Changed regexp to allow property + (java-properties-generic-mode): Change regexp to allow property and value to be separated by whitespace or an equal sign. (alias-generic-mode): Check generic-extras-enable-list before defining this mode. @@ -3815,8 +3815,8 @@ (universal-coding-system-argument): Use buffer-file-coding-system as default. - * international/quail.el (quail-show-translations): Show - followable keys in alphabetic order. + * international/quail.el (quail-show-translations): + Show followable keys in alphabetic order. 1998-04-29 Richard Stallman @@ -3937,10 +3937,10 @@ (ispell-dictionary-alist): Now customizable. Fixed type of custom variables: ispell-help-in-bufferp. (ispell-use-framepop-p): New variable. - (ispell-dictionary-alist): Added dictionaries: castellano, castellano8 + (ispell-dictionary-alist): Add dictionaries: castellano, castellano8 czech, esperanto, esperanto-tex, norsk, russian. Capitalize XEmacs correctly, and change lucid to xemacs in code. - (ispell-menu-lucid): Renamed to ispell-menu-xemacs. + (ispell-menu-lucid): Rename to ispell-menu-xemacs. Changed string compares for version number to be correct for XEmacs. Fixed to work with string properties. (ispell-recursive-edit-marker): New marker saving return point. @@ -4003,7 +4003,7 @@ 1998-04-28 Inge Frick - * emacs-lisp/easymenu.el (easy-menu-define-key): Fixed bug with BEFORE + * emacs-lisp/easymenu.el (easy-menu-define-key): Fix bug with BEFORE argument. Now it works also if you repeat an identical call to easy-menu-define-key. @@ -4099,7 +4099,7 @@ * emacs-lisp/cl-indent.el: Indent defpackage correctly. - * font-lock.el (lisp-font-lock-keywords-2): Added `defpackage'. + * font-lock.el (lisp-font-lock-keywords-2): Add `defpackage'. 1998-04-23 Geoff Voelker @@ -4126,17 +4126,17 @@ * easymenu.el: Use new menu item format. Don't simulate button prefix. (easy-menu-create-menu): Understand also keywords :active, :label and :visible. Don't worry about button prefix. - (easy-menu-button-prefix): Modified value. + (easy-menu-button-prefix): Modify value. (easy-menu-do-add-item): Extensive changes to use new menu item format. (easy-menu-define-key, easy-menu-always-true): New functions. - (easy-menu-make-symbol): Don't use indirection for symbols. Property - `menu-alias' not set. - (easy-menu-filter, easy-menu-update-button): Deleted. + (easy-menu-make-symbol): Don't use indirection for symbols. + Property `menu-alias' not set. + (easy-menu-filter, easy-menu-update-button): Delete. (easy-menu-add-item): Don't worry about button prefix. - (easy-menu-remove-item): Don't worry about button prefix. Use - `easy-menu-define-key'. - (easy-menu-is-button, easy-menu-have-button): Deleted. - (easy-menu-real-binding, easy-menu-change-prefix): Deleted. + (easy-menu-remove-item): Don't worry about button prefix. + Use `easy-menu-define-key'. + (easy-menu-is-button, easy-menu-have-button): Delete. + (easy-menu-real-binding, easy-menu-change-prefix): Delete. 1998-04-23 Richard Stallman @@ -4177,8 +4177,8 @@ 1998-04-22 Eli Zaretskii - * term/pc-win.el (x-select-text, x-get-selection-value): Replace - win16 with w16. + * term/pc-win.el (x-select-text, x-get-selection-value): + Replace win16 with w16. 1998-04-22 Dave Love @@ -4244,9 +4244,9 @@ 1998-04-20 Piet van Oostrum - * smtpmail.el (smtpmail-send-it): Deleted all code related + * smtpmail.el (smtpmail-send-it): Delete all code related to Resent-To: processing. - (smtpmail-deduce-address-list): Changed the search for + (smtpmail-deduce-address-list): Change the search for Resent-\(To\|Cc\|Bcc\) headers. (smtpmail-do-bcc): Delete Resent-Bcc: headers. @@ -4308,11 +4308,11 @@ 1998-04-20 Kenichi Handa - * international/ccl.el (ccl-compile-unify-character): Inhibit - unification tables specified by integer value. + * international/ccl.el (ccl-compile-unify-character): + Inhibit unification tables specified by integer value. (ccl-compile-translate-single-map): Likewise. (ccl-compile-multiple-map-function): Likewise. - (ccl-compile-translate-multiple-map): Modified for nested tables. + (ccl-compile-translate-multiple-map): Modify for nested tables. (ccl-dump-iterate-multiple-map): Handle the case that ID is not integer. (ccl-dump-translate-multiple-map): Likewise. @@ -4323,8 +4323,8 @@ * international/mule.el (make-coding-system): If TYPE is 4, FLAGS can be a cons of CCL-PROGRAM symbols. - * international/quail.el (quail-start-translation): Bind - prefix-arg to current-prefix-arg. + * international/quail.el (quail-start-translation): + Bind prefix-arg to current-prefix-arg. (quail-mode): Doc-string modified. * language/cyrillic.el: FLAGS arguments for make-coding-system @@ -4367,7 +4367,7 @@ * which-func.el (which-func): Add defgroup. - * emacs-lisp/checkdoc.el (checkdoc): Added :version. + * emacs-lisp/checkdoc.el (checkdoc): Add :version. * play/gametree.el (gametree): Likewise. @@ -4442,8 +4442,8 @@ (ange-ftp-file-name-all-completions): Handle Windows filenames. (file-name-handler-alist) [windows-nt]: Add patterns for name with drive letters. - (ange-ftp-dired-call-process, ange-ftp-call-chmod): Use - dired-chmod-program. + (ange-ftp-dired-call-process, ange-ftp-call-chmod): + Use dired-chmod-program. (ange-ftp-disable-netrc-security-check) [windows-nt]: Disable by default. (ange-ftp-real-expand-file-name-actual): New function. @@ -4504,8 +4504,8 @@ (cperl-beautify-levels): New command. (cperl-electric-keyword): Allow here-docs contain `=head1' and friends for keyword expansion. - Fix for broken `font-lock-unfontify-region-function'. Should - preserve `syntax-table' properties even with `lazy-lock'. + Fix for broken `font-lock-unfontify-region-function'. + Should preserve `syntax-table' properties even with `lazy-lock'. (cperl-indent-region-fix-else): New command. (cperl-fix-line-spacing): New command. (cperl-invert-if-unless): New command (C-c C-t and in Menu). @@ -4517,7 +4517,7 @@ Workaround for another `font-lock's `syntax-table' text-property bug. `zerop' could be applied to nil. At last, may work with `font-lock' without setting `cperl-font-lock'. - (cperl-indent-region-fix-constructs): Renamed from + (cperl-indent-region-fix-constructs): Rename from `cperl-indent-region-fix-constructs'. (cperl-fix-line-spacing): Could be triggered inside strings, would not know what to do with BLOCKs of map/printf/etc. @@ -4535,9 +4535,9 @@ (cperl-set-style-back): Old value of style is memorized when choosing a new style, may be restored from the same menu. Mode-documentation added to micro-docs. - (cperl-praise): Updated. + (cperl-praise): Update. (cperl-toggle-construct-fix): New command. Added on C-c C-w and menu. - (auto-fill-mode): Added on C-c C-f and menu. + (auto-fill-mode): Add on C-c C-f and menu. (cperl-style-alist): `PerlStyle' style added. (cperl-find-pods-heres): Message for termination of scan corrected. (cperl-speed): New variable with hints. @@ -4592,8 +4592,8 @@ * arc-mode.el (archive-extract-by-stdout): Don't use binary-process-output. Bind coding-system-for-read `undecided', - so coding system is determined on the fly. Bind - inherit-process-coding-system to t. + so coding system is determined on the fly. + Bind inherit-process-coding-system to t. (archive-dos-members): Remove. (archive-extract): Don't call archive-check-dos. Handle pkunzip errors. @@ -4690,7 +4690,7 @@ * vc.el (vc-next-action-on-file): Don't check out after registering. This is two steps instead of one, and the second does not make sense under CVS. - (vc-next-action): Changed doc string to reflect the above. + (vc-next-action): Change doc string to reflect the above. 1998-04-14 Andreas Schwab @@ -4804,7 +4804,7 @@ 1998-04-09 Andre Spiegel - * vc.el (vc-next-action): Fixed bug that prevented registering + * vc.el (vc-next-action): Fix bug that prevented registering files using C-x v v. 1998-04-09 Stephen Eglen @@ -4843,7 +4843,7 @@ * gud.el (jdb): Do proper analysis of classes defined in a Java source. This removes the restriction of one class per file. - (gud-jdb-package-of-file): Removed. Replaced with parsing routines. + (gud-jdb-package-of-file): Remove. Replaced with parsing routines. (gud-jdb-skip-whitespace): New function. (gud-jdb-skip-single-line-comment): New function. (gud-jdb-skip-traditional-or-documentation-comment): New function. @@ -4914,7 +4914,7 @@ (fortran-mode): Make `fill-column' buffer-local; set `fill-paragraph-function', `indent-region-function', `indent-line-function'. - (calculate-fortran-indent): Renamed to `fortran-calculate-indent'. + (calculate-fortran-indent): Rename to `fortran-calculate-indent'. (fortran-split-line): Simplify. (fortran-remove-continuation): New function. (fortran-join-line): Use it. @@ -4967,18 +4967,18 @@ * language/japanese.el: Set exit-function to exit-japanese-environment for Japanese environment. - * language/japan-util.el (setup-japanese-environment): Setup - sentence-end suitable for Japanese text. + * language/japan-util.el (setup-japanese-environment): + Setup sentence-end suitable for Japanese text. (exit-japanese-environment): New function. - * international/mule-cmds.el (subset-p): Renamed from + * international/mule-cmds.el (subset-p): Rename from find-safe-coding-system-list-subset-p. - (find-coding-systems-region, find-coding-systems-string): New - functions. - (find-coding-systems-for-charsets): Renamed from + (find-coding-systems-region, find-coding-systems-string): + New functions. + (find-coding-systems-for-charsets): Rename from find-safe-coding-system. This is now a helper function of the above two. - (select-safe-coding-system): Adjusted for the above changes. + (select-safe-coding-system): Adjust for the above changes. 1998-04-05 Per Abrahamsen @@ -4997,14 +4997,14 @@ hook, not a local variable. * vc.el (vc-merge, vc-backend-merge): New functions. - (vc-resolve-conflicts): Added optional parameters for buffer names. + (vc-resolve-conflicts): Add optional parameters for buffer names. (vc-branch-p): New function. - * vc-hooks.el (vc-prefix-map): Added "m" for vc-merge. + * vc-hooks.el (vc-prefix-map): Add "m" for vc-merge. * vc.el (vc-ensure-vc-buffer): New function. - (vc-registration-error): Replaced by the above. Updated all callers. - (file-executable-p-18, file-regular-p-18): Removed. + (vc-registration-error): Replace by the above. Updated all callers. + (file-executable-p-18, file-regular-p-18): Remove. 1998-04-05 Richard Stallman @@ -5066,15 +5066,15 @@ 1998-04-03 Andre Spiegel * vc-hooks.el (vc-parse-cvs-status): New function. - (vc-fetch-master-properties): Moved cvs status retrieval to + (vc-fetch-master-properties): Move cvs status retrieval to the above. (vc-backend): If a file is not registered, remember that by setting the property to `none'. (vc-name): Use the mechanism of vc-backend to compute the value. (vc-after-save): Don't access vc-backend property directly. - * vc.el (vc-next-action-dired): Use dired-do-redisplay. Handle - window configuration correctly. + * vc.el (vc-next-action-dired): Use dired-do-redisplay. + Handle window configuration correctly. (vc-next-action): Save window configuration for vc-next-action-dired. (vc-finish-logentry): Only kill log buffer if it does exist. (vc-dired-mode): Rewritten so that it works entirely through @@ -5082,9 +5082,9 @@ ordinary dired. (vc-dired-hook): New function. (vc-state-info, vc-dired-reformat-line): Adapted. - (vc-dired-update, vc-dired-update-line): Removed. + (vc-dired-update, vc-dired-update-line): Remove. (vc-directory): Rewritten. - (vc-directory-18): Removed. + (vc-directory-18): Remove. (vc-dired-mark-locked): New function, bound to "*l" in vc-dired-mode. (vc-do-command): Only compute vc-name if it is really needed. (vc-fetch-cvs-status): New function. @@ -5121,7 +5121,7 @@ * help.el: Make hyperlinks for cross-reference info intuited from *Help* buffer. - (help-font-lock-keywords): Removed. + (help-font-lock-keywords): Remove. (help-mode-map): Define keys for navigating hyperlinks. (help-xref-stack, help-xref-stack-item): New permanent-local variables. @@ -5138,8 +5138,8 @@ New variables. (help-setup-xref, help-make-xrefs, help-xref-button) (help-xref-interned, help-xref-mode, help-follow-mouse) - (help-xref-go-back, help-go-back, help-follow, help-next-ref): New - functions. + (help-xref-go-back, help-go-back, help-follow, help-next-ref): + New functions. 1998-04-02 Richard Stallman @@ -5216,7 +5216,7 @@ (iswitchb-complete): Use iswitchb-common-match-string rather than recomputing the value. (iswitchb-toggle-ignore): Recompute list of buffers. - (iswitchb-init-XEmacs-trick): Renamed from iswitchb-init-Xemacs-trick. + (iswitchb-init-XEmacs-trick): Rename from iswitchb-init-Xemacs-trick. 1998-03-31 Andre Spiegel @@ -5300,8 +5300,8 @@ 1998-03-25 Simon Marshall - * font-lock.el (c-font-lock-keywords-2): Added "sizeof". - (c++-font-lock-keywords-2): Added "export" and "typename". + * font-lock.el (c-font-lock-keywords-2): Add "sizeof". + (c++-font-lock-keywords-2): Add "export" and "typename". * lazy-lock.el (lazy-lock-fontify-after-scroll) (lazy-lock-fontify-after-trigger): Use new window-end UPDATE arg @@ -5324,8 +5324,8 @@ 1998-03-23 Andreas Schwab - * xt-mouse.el (xterm-mouse-translate, xterm-mouse-event): Replace - obsolete `concat with integer' by format. + * xt-mouse.el (xterm-mouse-translate, xterm-mouse-event): + Replace obsolete `concat with integer' by format. * rsz-mini.el (resize-minibuffer-mode): Make it a proper minor mode: toggle resize-minibuffer mode when called without argument. @@ -5341,8 +5341,8 @@ 1998-03-22 Johan Vromans - * complete.el (PC-expand-many-files): Apply - completion-ignored-extensions. + * complete.el (PC-expand-many-files): + Apply completion-ignored-extensions. 1998-03-21 Richard Stallman @@ -5361,8 +5361,8 @@ when user tries to check-in, but file on disk has changed. (vc-do-command): Rewrote doc string. Consider LAST argument only if FILE is non-nil. - (vc-add-triple, vc-record-rename, vc-lookup-file): Find - vc-name-assoc-file based on vc-name of FILE. + (vc-add-triple, vc-record-rename, vc-lookup-file): + Find vc-name-assoc-file based on vc-name of FILE. (vc-backend-admin, vc-rename-file): Handle the SCCS PROJECTDIR feature. @@ -5406,8 +5406,8 @@ 1998-03-18 Dave Love - * emacs-lisp/lisp-mode.el (lisp-fill-paragraph): Adjust - paragraph-start in default filling case so that filling doc + * emacs-lisp/lisp-mode.el (lisp-fill-paragraph): + Adjust paragraph-start in default filling case so that filling doc strings works. 1998-03-18 Andre Spiegel @@ -5446,9 +5446,9 @@ 1998-03-16 Peter Breton * generic-x.el: Customize. - (fvwm-generic-mode): Added new keywords, and .fvwm2rc config file. - (ini-generic-mode): Changed regexps so that value can contain equal signs. - (java-manifest-generic-mode): Added new keywords. + (fvwm-generic-mode): Add new keywords, and .fvwm2rc config file. + (ini-generic-mode): Change regexps so that value can contain equal signs. + (java-manifest-generic-mode): Add new keywords. 1998-03-16 Alfred Correira @@ -5496,9 +5496,9 @@ * locate.el (locate-current-line-number): No longer interactive. * dirtrack.el: Customized. - (dirtrack-forward-slash): Renamed from `forward-slash'. - (dirtrack-backward-slash): Renamed from `backward-slash'. - (dirtrack-replace-slash): Renamed from `replace-slash'. + (dirtrack-forward-slash): Rename from `forward-slash'. + (dirtrack-backward-slash): Rename from `backward-slash'. + (dirtrack-replace-slash): Rename from `replace-slash'. * emacs-lisp/elp.el (elp-version): Now 3.2. @@ -5587,17 +5587,17 @@ (undo-start): New args BEG and END. (undo): If arg or active region, pass args to undo-start. - * mouse.el (mouse-buffer-menu-maxlen): Renamed from + * mouse.el (mouse-buffer-menu-maxlen): Rename from mouse-menu-buffer-maxlen. 1998-03-10 Eric M. Ludlam - * checkdoc.el (checkdoc-continue): Removed check for doc string. + * checkdoc.el (checkdoc-continue): Remove check for doc string. (checkdoc-this-string-valid-engine): Smarter keycode check regexp. 1998-03-10 Carsten Dominik - * textmodes/reftex.el (reftex-mode-map): Added keybinding for + * textmodes/reftex.el (reftex-mode-map): Add keybinding for `reftex-mouse-view-crossref' to `S-mouse-2'. 1998-03-09 Carsten Dominik @@ -5634,7 +5634,7 @@ 1998-03-08 Carsten Dominik * textmodes/reftex.el (reftex-offer-label-menu) - (reftex-select-item): Removed match-everywhere interpretation. + (reftex-select-item): Remove match-everywhere interpretation. 1998-03-08 Carsten Dominik @@ -5660,8 +5660,8 @@ (vc-resynch-buffer): When operating on the current buffer, don't use save-excursion, because that would undo the effects of the above functions. - (vc-clear-headers): Fixed regexp. - (vc-resynch-window): Deleted code that removed vc-find-file-hook + (vc-clear-headers): Fix regexp. + (vc-resynch-window): Delete code that removed vc-find-file-hook temporarily. This was unnecessary, because find-file-hooks are not called when the buffer is reverted. @@ -5671,7 +5671,7 @@ 1998-03-07 Richard Stallman - * subr.el (read-passwd): Renamed from read-password. + * subr.el (read-passwd): Rename from read-password. New second arg CONFIRM. * wid-edit.el (widget-choice-value-create): If there is an @@ -5684,7 +5684,7 @@ * dos-fns.el, find-file.el, follow.el, ispell4.el, shadowfile.el: * tempo.el, tmm.el, vcursor.el, xscheme.el: Customize. -1998-03-06 Barry A. Warsaw +1998-03-06 Barry A. Warsaw * Release 5.21 @@ -5697,7 +5697,7 @@ * progmodes/cc-engine.el (c-inside-bracelist-p): Fix for enum test. * progmodes/cc-mode.el (c-initialize-cc-mode): - Moved require's to top level. + Move require's to top level. * progmodes/cc-cmds.el (c-fill-paragraph): Bind fill-paragraph-function to nil when calling fill-paragraph, @@ -5711,8 +5711,8 @@ the same relative position. Fill comment before point if there's nothing else on the same line. Fill block comments after code a little better. Try harder to find a good fill-prefix when point - is on a block comment ender line. Use - c-Java-javadoc-paragraph-start in block comments in Java mode. + is on a block comment ender line. + Use c-Java-javadoc-paragraph-start in block comments in Java mode. Leave block comment ender alone when c-hanging-comment-ender-p is nil and point is on that line. Detect paragraph-separate in multiparagraph comments. Fix for bug that may strip the `*' off @@ -5733,8 +5733,8 @@ always bol. It's always bol when on the top level, however. Changed cases: 5A.5, 5I, 14A. - * progmodes/cc-engine.el (c-forward-token-1, c-backward-token-1): New - functions to move by tokens. + * progmodes/cc-engine.el (c-forward-token-1, c-backward-token-1): + New functions to move by tokens. (c-guess-basic-syntax): Fixes for Java 1.1 array initialization brace lists. @@ -5791,19 +5791,19 @@ 1998-03-06 Kenichi Handa - * international/titdic-cnv.el (titdic-convert): Use - set-buffer-multibyte. + * international/titdic-cnv.el (titdic-convert): + Use set-buffer-multibyte. * international/quail.el (quail-defrule-internal): New arg REPLACE. (quail-defrule): Call quail-defrule-internal with REPLACE t. 1998-03-05 Peter Breton - * generic.el (generic-mode-ini-file-find-file-hook): Use - and-s instead of if-s. - (generic-use-find-file-hook): Changed from defvar to defcustom. - (generic-lines-to-scan): Changed from defvar to defcustom. - (generic-find-file-regexp): Changed from defvar to defcustom. + * generic.el (generic-mode-ini-file-find-file-hook): + Use and-s instead of if-s. + (generic-use-find-file-hook): Change from defvar to defcustom. + (generic-lines-to-scan): Change from defvar to defcustom. + (generic-find-file-regexp): Change from defvar to defcustom. 1998-03-05 Ivar Rummelhoff @@ -5829,14 +5829,14 @@ configuration if the same command (changing the window configuration) is applied several times in a row. - * winner.el (winner-switch): Removed the command + * winner.el (winner-switch): Remove the command `winner-switch' (and the variables connected to it), since because of the change above, any "switching package" may now be used without disturbing winner-mode too much. * winner.el: Use list syntax for key definitions. - * winner.el (winner-change-fun): Removed the pushnew + * winner.el (winner-change-fun): Remove the pushnew command, so that `cl' will not have to be loaded. * winner.el (winner-set-conf): Introduced "wrapper" around @@ -5969,12 +5969,12 @@ * subr.el (sref): Typo in doc-string fixed. - * international/mule-cmds.el (set-default-coding-systems): Set - default-file-name-coding-system. Doc-string modified. + * international/mule-cmds.el (set-default-coding-systems): + Set default-file-name-coding-system. Doc-string modified. (prefer-coding-system): Doc-string modified. - * language/japan-util.el (setup-japanese-environment): Set - default-file-name-coding-system to japanese-iso-8bit. + * language/japan-util.el (setup-japanese-environment): + Set default-file-name-coding-system to japanese-iso-8bit. 1998-03-02 Richard Stallman @@ -6004,18 +6004,18 @@ 1998-03-01 Peter Breton * locate.el (locate-update): New function. - (locate-current-line-number): Renamed from `current-line'. + (locate-current-line-number): Rename from `current-line'. (locate-default-make-command-line): Use list, not cons. - (locate): Added a `save-window-excursion' form. + (locate): Add a `save-window-excursion' form. (locate): Used an `apply' form for the start-process call. (locate-mode): Now has a `revert-buffer-function'. (locate-do-setup): Now longer deletes window. (locate-header-face): Use underline, not region. (locate-update-command): New option. - (locate-command): Changed from defvar to defcustom. - (locate-make-command-line): Changed from defvar to defcustom. - (locate-fcodes-file): Changed from defvar to defcustom. - (locate-mouse-face): Changed from defvar to defcustom. + (locate-command): Change from defvar to defcustom. + (locate-make-command-line): Change from defvar to defcustom. + (locate-fcodes-file): Change from defvar to defcustom. + (locate-mouse-face): Change from defvar to defcustom. 1998-02-28 Richard Stallman @@ -6048,8 +6048,8 @@ 1998-02-27 Karl Heuer * dired-x.el (dired-do-toggle): Function moved to dired.el. - * dired.el (dired-do-toggle): Moved here from dired-x.el. - (dired-mode-map): Changed dired-do-toggle from "T" to "t". + * dired.el (dired-do-toggle): Move here from dired-x.el. + (dired-mode-map): Change dired-do-toggle from "T" to "t". 1998-02-27 Carsten Dominik @@ -6090,21 +6090,21 @@ (custom-save-delete): Use it. (custom-save-all): Use it. - * shell.el (shell-dirtrack-mode): Renamed from shell-dirtrack-toggle. - (dirtrack-mode, shell-dirtrack-toggle): Defined as aliases. + * shell.el (shell-dirtrack-mode): Rename from shell-dirtrack-toggle. + (dirtrack-mode, shell-dirtrack-toggle): Define as aliases. 1998-02-25 Carsten Dominik * textmodes/reftex.el (reftex-toc-mode, reftex-select-label-mode) (reftex-select-bib-mode): New major modes for RefTeX's special buffers. (reftex-offer-label-menu): Put selection buffer into - `reftex-select-label-mode'. Make selection buffer read-only. Use - `reftex-erase-buffer'. + `reftex-select-label-mode'. Make selection buffer read-only. + Use `reftex-erase-buffer'. (reftex-do-citation): Put selection buffer into - `reftex-select-bib-mode'. Make selection buffer read-only. Use - `reftex-erase-buffer'. Set `reftex-select-return-marker'. - (reftex-toc): Put *toc* buffer into reftex-toc-mode. Add - mouse-face property. + `reftex-select-bib-mode'. Make selection buffer read-only. + Use `reftex-erase-buffer'. Set `reftex-select-return-marker'. + (reftex-toc): Put *toc* buffer into reftex-toc-mode. + Add mouse-face property. (reftex-select-item): Use recursive edit instead of selfmade command loop. Removed unnecessary local bindings. Changed the tag for catch, to avoid problems with `exit' tag in @@ -6126,13 +6126,13 @@ (reftex-select-search-backward, reftex-select-search) (reftex-select-scroll-up, reftex-select-scroll-down) (reftex-scroll-other-window, reftex-scroll-other-window-down) - (reftex-empty-toc-buffer): Removed obsolete functions. - (reftex-highlight-overlays): Removed obsolete 3rd overlay. - (reftex-select-label-map, reftex-select-bib-map): Removed obsolete + (reftex-empty-toc-buffer): Remove obsolete functions. + (reftex-highlight-overlays): Remove obsolete 3rd overlay. + (reftex-select-label-map, reftex-select-bib-map): Remove obsolete bindings, added mouse bindings, `digit-argument', `negative-argument', `reftex-select-show-insertion-point'. (reftex-erase-buffer): BUFFER now defaults to current buffer. - (reftex-label-alist-builtin): Added sidecap packages support. + (reftex-label-alist-builtin): Add sidecap packages support. (reftex-last-follow-point, reftex-select-return-marker): New variables. (reftex-toc, reftex-select-item): Set `reftex-last-follow-point'. (reftex-toc-post-command-hook): Use `reftex-last-follow-point'. @@ -6208,7 +6208,7 @@ * font-lock.el (font-lock-constant-face): Variable and face renamed from font-lock-reference-face. - (font-lock-reference-face): Changed value to font-lock-constant-face. + (font-lock-reference-face): Change value to font-lock-constant-face. * add-log.el: * dired.el: @@ -6246,12 +6246,12 @@ 1998-02-19 Kenichi Handa * international/mule.el - (after-insert-file-set-buffer-file-coding-system): Call - set-buffer-multibyte instead of directly setting + (after-insert-file-set-buffer-file-coding-system): + Call set-buffer-multibyte instead of directly setting enable-multibyte-characters to nil. - * language/china-util.el (setup-chinese-cns-environment): Correct - the setting of default-input-method. + * language/china-util.el (setup-chinese-cns-environment): + Correct the setting of default-input-method. * international/mule-cmds.el (select-safe-coding-system): Kill the warning buffer before returning. @@ -6294,7 +6294,7 @@ * info-look.el (info-complete): Rewrite minibuffer completion code. * info-look.el (info-lookup-minor-mode, turn-on-info-lookup): - Added minor mode interface. + Add minor mode interface. (info-lookup-minor-mode-string): New variable. (info-lookup-minor-mode-map): New variable. @@ -6305,8 +6305,8 @@ (info-lookup-highlight-face): Variables customized. * info-look.el (info-lookup-alist): No longer customizable. - (info-lookup-add-help, info-lookup-maybe-add-help): Interface - functions for adding new modes. + (info-lookup-add-help, info-lookup-maybe-add-help): + Interface functions for adding new modes. (info-lookup-add-help*): New function. (info-lookup-symbol-alist, info-lookup-file-alist): Variables deleted. This info is specified now by calling info-lookup-maybe-add-help @@ -6336,10 +6336,10 @@ `parse-partial-sexp' contains the starting pos of the last literal. -1998-02-16 Barry A. Warsaw +1998-02-16 Barry A. Warsaw - * progmodes/cc-mode.el (c-mode, c++-mode, objc-mode, java-mode): Set - imenu-case-fold-search to nil. + * progmodes/cc-mode.el (c-mode, c++-mode, objc-mode, java-mode): + Set imenu-case-fold-search to nil. * progmodes/cc-langs.el (c-postprocess-file-styles): If a file style or file offsets are set, make the variables local to the @@ -6352,8 +6352,8 @@ * progmodes/cc-defs.el (c-point): In XEmacs, use scan-lists + buffer-syntactic-context-depth. - * progmodes/cc-vars.el (c-enable-xemacs-performance-kludge-p): New - variable. + * progmodes/cc-vars.el (c-enable-xemacs-performance-kludge-p): + New variable. * progmodes/cc-cmds.el, progmodes/cc-engine.el (c-beginning-of-defun) (c-indent-defun, c-parse-state): Use (c-point 'bod) instead of @@ -6362,7 +6362,7 @@ * progmodes/cc-align.el (c-semi&comma-no-newlines-before-nonblanks) (c-semi&comma-no-newlines-for-oneline-inliners): New functions. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed a few byte + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix a few byte compiler warnings. * progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): @@ -6379,8 +6379,8 @@ * progmodes/cc-langs.el (c-java-method-key): Variable deleted. - * progmodes/cc-mode.el (java-mode): Set c-method-key to nil. I - don't think this is necessary for Java, and besides, the old value + * progmodes/cc-mode.el (java-mode): Set c-method-key to nil. + I don't think this is necessary for Java, and besides, the old value was inherited from Objective-C which was clearly not right. * progmodes/cc-cmds.el (c-electric-colon): Don't insert newlines @@ -6397,10 +6397,10 @@ * progmodes/cc-cmds.el (c-electric-brace): namespace-open and namespace-close braces can hang. - * progmodes/cc-defs.el (c-emacs-features): Added autoload cookie. + * progmodes/cc-defs.el (c-emacs-features): Add autoload cookie. - * progmodes/cc-engine.el (c-search-uplist-for-classkey): When - searching up for a class key, instead of hardcoding the extended + * progmodes/cc-engine.el (c-search-uplist-for-classkey): + When searching up for a class key, instead of hardcoding the extended search for "extern", use the new variable c-extra-toplevel-key, which is language dependent. For C++, this variable includes the keyword "namespace" which will match C++ namespace introducing @@ -6415,14 +6415,14 @@ CASE 3: we can now determine whether we're at the beginning of a cpp macro definition, or inside the middle of one. Set syntax to - 'cpp-macro in the former case, 'cpp-macro-cont in the latter. In - both cases, the relpos is the beginning of the macro. + 'cpp-macro in the former case, 'cpp-macro-cont in the latter. + In both cases, the relpos is the beginning of the macro. - (c-forward-syntactic-ws): Added code that skips forward over + (c-forward-syntactic-ws): Add code that skips forward over multi-line cpp macros. - (c-beginning-of-macro): Moved, and made into a defsubst. This - function can now actually find the beginning of a multi-line C + (c-beginning-of-macro): Move, and made into a defsubst. + This function can now actually find the beginning of a multi-line C preprocessor macro. (c-backward-syntactic-ws): Use c-beginning-of-macro to skip @@ -6443,8 +6443,8 @@ (c-initialize-on-load): New variable, *not* customized. * progmodes/cc-styles.el (c-offsets-alist): Three new syntactic - symbols: innamespace, namespace-open, namespace-close. These - support C++ namespace blocks. + symbols: innamespace, namespace-open, namespace-close. + These support C++ namespace blocks. Also, new syntactic symbol cpp-macro-cont, by default bound to c-lineup-dont-change. This symbol is assigned to subsequent lines of a multi-line C preprocess macro definition. @@ -6483,7 +6483,7 @@ Introduce the new default style "user" which contains all user customizations. - * progmodes/cc-vars.el (c-default-style): Renamed from + * progmodes/cc-vars.el (c-default-style): Rename from c-site-default-style. 1998-02-15 Aki Vehtari @@ -6500,13 +6500,13 @@ `bibtex-autokey-before-presentation-function' as it is not hook. (bibtex-autokey-get-namefield): Remove newlines unconditionally. - * bibtex.el (bibtex-autokey): Fixed prefix. + * bibtex.el (bibtex-autokey): Fix prefix. (bibtex-user-optional-fields): Better `:type'. (bibtex-autokey-names): Better `:type' and doc-fix. (bibtex-mark-active): New function, taking care of Emacs variants. (bibtex-run-with-idle-timer): Ditto. (bibtex-mode-map): Change `[(control tab)]' to `[(meta tab)]'. - (bibtex-autokey-get-yearfield): Changed to accept year when year + (bibtex-autokey-get-yearfield): Change to accept year when year field has field-delimiters. This is quick fix, there might be better solution. (bibtex-mode): Don't call idle timer with 0 seconds. @@ -6514,7 +6514,7 @@ 1998-02-15 Dirk Herrmann - * bibtex.el (bibtex-autokey-get-yearfield): Fixed problem with + * bibtex.el (bibtex-autokey-get-yearfield): Fix problem with parsing the year field. * bibtex.el (bibtex-comment-start): Font locking for comments added. @@ -6526,7 +6526,7 @@ * bibtex.el (bibtex-autokey-get-titles): Non capitalized title words are used for key generation as well. (bibtex-member-of-regexp): Case is honored for matches now. - (bibtex-autokey-titleword-ignore): Added entries provide compatibility + (bibtex-autokey-titleword-ignore): Add entries provide compatibility to former behavior. * bibtex.el (bibtex-autokey-titleword-ignore): Title words found in @@ -6561,7 +6561,7 @@ (info-look-completion): New variable. * info-look.el (info-lookup-symbol-alist): - Added support for latex-mode, perl-mode, awk-mode, emacs-lisp-mode. + Add support for latex-mode, perl-mode, awk-mode, emacs-lisp-mode. 1998-02-13 Richard Stallman @@ -6575,12 +6575,12 @@ 1998-02-12 Dave Love - * progmodes/scheme.el (scheme-imenu-generic-expression): Simplify - regexps. + * progmodes/scheme.el (scheme-imenu-generic-expression): + Simplify regexps. (dsssl-imenu-generic-expression): Likewise. (scheme-mode-variables): Set imenu-syntax-alist. - (dsssl-mode): Remove `!' from font-lock-defaults. Set - imenu-syntax-alist. + (dsssl-mode): Remove `!' from font-lock-defaults. + Set imenu-syntax-alist. 1998-02-11 Richard Stallman @@ -6667,12 +6667,12 @@ * international/kinsoku.el: Use aref instead of sref. - * international/mule-cmds.el (find-safe-coding-system): Return - undecided if FROM == TO. + * international/mule-cmds.el (find-safe-coding-system): + Return undecided if FROM == TO. (select-safe-coding-system): Doc-string modified. - * international/mule-util.el (compose-chars-component): Return - result as unibyte string. + * international/mule-util.el (compose-chars-component): + Return result as unibyte string. (decompose-composite-char): Doc-string modified. * international/titdic-cnv.el: Many codes re-written to adjust for @@ -6724,7 +6724,7 @@ 1998-02-02 Dan Nicolaescu - * progmodes/hideshow.el (hs-special-modes-alist): Enhanced java + * progmodes/hideshow.el (hs-special-modes-alist): Enhance java regexp. 1998-02-02 Richard Stallman @@ -6736,8 +6736,8 @@ 1998-02-01 Richard Stallman - * emacs-lisp/easy-mmode.el (easy-mmode-define-minor-mode): Fix - the doc strings used for the mode flag variable and the keymap. + * emacs-lisp/easy-mmode.el (easy-mmode-define-minor-mode): + Fix the doc strings used for the mode flag variable and the keymap. Delete duplicate &optional's. * emacs-lisp/edebug.el: Doc fixes. @@ -6752,7 +6752,7 @@ 1998-02-01 Dan Nicolaescu - * hideshow.el (hs-special-modes-alist): Improved the regexp for java. + * hideshow.el (hs-special-modes-alist): Improve the regexp for java. * isearch.el (isearch-range-invisible): Avoid infinite loop when search-invisible is nil. @@ -6784,8 +6784,8 @@ * fortran.el: Various docstring and commentary fixes, including note of current maintainer. (fortran-mode): Use imenu-syntax-alist. - (fortran-imenu-generic-expression): Use - fortran-continuation-string, not always `+'. + (fortran-imenu-generic-expression): + Use fortran-continuation-string, not always `+'. (fortran-font-lock-keywords-1): Include symbol syntax as well as word, following syntax table changes. (fortran-imenu-generic-expression): Likewise. @@ -6793,23 +6793,23 @@ (fortran-mode-version, fortran-startup-message): Delete misleading variables. (fortran-mode): Don't use them. - (fortran-column-ruler-fixed, fortran-column-ruler-tab): Fix - leading \ which made `0' into null. + (fortran-column-ruler-fixed, fortran-column-ruler-tab): + Fix leading \ which made `0' into null. (fortran-join-line): New function and key binding. (fortran-narrow-to-subprogram): New function and key binding. (fortran-mode-syntax-table): Make ?., ?_, ?$ symbol, not word. 1998-01-29 Carsten Dominik - * textmodes/reftex.el (reftex-toc): Fixed bug with split-window. Using - split-window instead of split-window-vertically. - (reftex-reset-mode): Removed obsolete buffer from kill list. - (reftex-make-and-insert-label-list, reftex-do-citation): Delete - other windows before displaying selection. - (reftex-cite-format-builtin): Fixed bug in Chicago format. + * textmodes/reftex.el (reftex-toc): Fix bug with split-window. + Using split-window instead of split-window-vertically. + (reftex-reset-mode): Remove obsolete buffer from kill list. + (reftex-make-and-insert-label-list, reftex-do-citation): + Delete other windows before displaying selection. + (reftex-cite-format-builtin): Fix bug in Chicago format. (reftex-enlarge-to-fit): New function. - (reftex-nicify-text): Cut context-string at \item,\\. Changed - match sequence for efficiency reasons. + (reftex-nicify-text): Cut context-string at \item,\\. + Changed match sequence for efficiency reasons. (reftex-parse-from-file): Include files can be ignored with `reftex-no-include-regexps'. (reftex-no-include-regexps): New option. @@ -6819,16 +6819,16 @@ (reftex-where-am-I): Interpret appendix match. (reftex-init-section-numbers): New arg: appendix. (reftex-section-number): Treat appendix enumeration. - (reftex-toc-external): Improved message. + (reftex-toc-external): Improve message. (reftex-compute-ref-cite-tables): Regular expression extended for appendix. - (reftex-toc-rescan): Renamed from reftex-toc-redo. - (reftex-toc-Rescan): Renamed from reftex-toc-Redo. + (reftex-toc-rescan): Rename from reftex-toc-redo. + (reftex-toc-Rescan): Rename from reftex-toc-Redo. (reftex-toc-revert): New function. (reftex-select-external-document): Completion on label prefixes. - (reftex-find-file-on-path): Added an extra call to + (reftex-find-file-on-path): Add an extra call to expand-file-name for the directory. - (reftex-locate-bibliography-files): Added expand-file-name call. + (reftex-locate-bibliography-files): Add expand-file-name call. (reftex-guess-label-type): New function. (reftex-word-before-point): Function removed. (reftex-reference): Uses reftex-guess-label-type. Changed meaning @@ -6837,41 +6837,41 @@ (reftex-select-label-maps): Default bindings for TAB, up, down, RET. (reftex-select-read-string): Now uses completion. (reftex-make-and-insert-label-list): Prepare for completion. - (reftex-where-am-I): Fixed bug with input files. + (reftex-where-am-I): Fix bug with input files. (reftex-save-all-document-buffers): New command. (reftex-select-next-heading): New function. (reftex-select-previous-heading): New function. (reftex-select-read-string): New function. (reftex-offer-label-menu): Handle string value from reftex-select-item. - (reftex-reference): Fixed bug (missing save-excursion). - (reftex-toc-map): Added binding for ?n and ?p. - (reftex-do-citation): Changed to use reftex-default-bibliography. + (reftex-reference): Fix bug (missing save-excursion). + (reftex-toc-map): Add binding for ?n and ?p. + (reftex-do-citation): Change to use reftex-default-bibliography. (reftex-default-bibliography): New option. (reftex-find-tex-file): Check for file-name-absolute-p first. (reftex-format-label-function, reftex-format-ref-function) (reftex-format-cite-function): New hooks. (reftex-info): New function. - (reftex-compute-ref-cite-tables): Removed interactive form. - (reftex-where-am-I): Removed interactive form. - (reftex-format-names): Removed interactive form. + (reftex-compute-ref-cite-tables): Remove interactive form. + (reftex-where-am-I): Remove interactive form. + (reftex-format-names): Remove interactive form. (reftex-vref-is-default): New customization variable. (reftex-mode-menu): Capitalize citation options. (reftex-last-cnt): Variable removed. (reftex-last-data, reftex-last-line): New variables. (reftex-select-toggle-varioref): New function. - (reftex-offer-label-menu): Changed mode-line-format for varioref. + (reftex-offer-label-menu): Change mode-line-format for varioref. (reftex-select-label-help): Help string updated. - (reftex-do-parse): Fixed bug with empty xr list. + (reftex-do-parse): Fix bug with empty xr list. (reftex-view-crossref): Prefix argument interpretation changed. (reftex-get-offset): New function. (reftex-label): Remove selection buffer to force update. (reftex-access-scan-info): Remove selection buffers. - (reftex-select-external-document): Fixed bug with highest index. + (reftex-select-external-document): Fix bug with highest index. (reftex-label-index-list, reftex-found-list): Variables removed. (reftex-offer-label-menu, reftex-make-and-insert-label-list) (reftex-select-item, reftex-citation, reftex-select-label-callback) - (reftex-bibtex-selection-callback, reftex-select-callback): Changed - to put the scan data directly into the text property :data, + (reftex-bibtex-selection-callback, reftex-select-callback): + Change to put the scan data directly into the text property :data, instead of doing this indirectly with an index-list. (reftex-make-selection-buffer-name): New function. (reftex-tie-multifile-symbols): Store master-index-as-property. @@ -6884,7 +6884,7 @@ (reftex-access-parse-file): `Restore' action now throws an exception when the file is not found. (reftex-create-customize-menu): New function. - (reftex-label): Fixed bug which made naked labels in \footnotes. + (reftex-label): Fix bug which made naked labels in \footnotes. (reftex-select-label-map, reftex-select-bib-map): New keymaps for the RefTeX Select buffer. (reftex-select-next, reftex-select-previous, reftex-select-scroll-down) @@ -6912,7 +6912,7 @@ (reftex-extract-bib-entries-from-thebibliography): New function. (reftex-format-bibitem): New function. (reftex-parse-bibitem): New function. - (reftex-make-desparate-section-regexp): Changed name to + (reftex-make-desparate-section-regexp): Change name to reftex-make-desperate-section-regexp. (reftex-do-parse, reftex-locate-bibliography-files) (reftex-string-to-label, reftex-select-external-document) @@ -6921,7 +6921,7 @@ (reftex-select-search-minibuffer-map, reftex-access-search-path) (reftex-compute-ref-cite-tables, reftex-recursive-directory-list): All lambda expressions now quoted with `function'. - (reftex-view-crossref, reftex-mouse-view-crossref): Fixed bug with + (reftex-view-crossref, reftex-mouse-view-crossref): Fix bug with multiple calls. (reftex-get-buffer-visiting): Error message changed. (reftex-select-external-document, reftex-query-label-type) @@ -6949,7 +6949,7 @@ * progmodes/etags.el (find-tag-marker-ring-length): New variable. (find-tag-marker-ring): New variable. (tags-location-ring): New variable replacing tags-location-ring. - (tags-location-stack): Deleted. + (tags-location-stack): Delete. (tags-table-format-hooks): Doc fix. (initialize-new-tags-table): Init find-tag-marker-ring, tags-location-ring. @@ -6970,13 +6970,13 @@ * international/mule-cmds.el (toggle-enable-multibyte-characters): Use set-buffer-multibyte. - (find-safe-coding-system-list-subset-p): Renamed from list-subset-p. + (find-safe-coding-system-list-subset-p): Rename from list-subset-p. The call changed also. 1998-01-28 Kenichi Handa - * international/titdic-cnv.el (titdic-convert): Set - enable-multibyte-characters to t after inserting TIT file by + * international/titdic-cnv.el (titdic-convert): + Set enable-multibyte-characters to t after inserting TIT file by no-conversion. (tit-process-body): Do not bind enable-multibyte-characters to nil. @@ -6987,9 +6987,9 @@ instead of (` and (,. Implement :filter. Doc fix. (easy-menu-do-define): Call `easy-menu-create-menu' instead of `easy-menu-create-keymaps'. - (easy-menu-create-keymaps): Replaced by `easy-menu-create-menu'. - (easy-menu-create-menu): New public function. Replaces - `easy-menu-create-keymaps', but with large changes. + (easy-menu-create-keymaps): Replace by `easy-menu-create-menu'. + (easy-menu-create-menu): New public function. + Replaces `easy-menu-create-keymaps', but with large changes. (easy-menu-button-prefix): New constant. (easy-menu-do-add-item, easy-menu-make-symbol): New functions. (easy-menu-update-button): Doc fix. @@ -7064,22 +7064,22 @@ * mail/emacsbug.el (emacsbug): Customized. (report-emacs-bug-no-confirmation): - Renamed from report-emacs-bug-run-tersely. + Rename from report-emacs-bug-run-tersely. (report-emacs-bug-no-explanations): New option. (report-emacs-bug): Handle that option. 1998-01-22 Eric Ludlam - * mail/rmail.el (rmail-speedbar-buttons): Added speedbar support + * mail/rmail.el (rmail-speedbar-buttons): Add speedbar support for Rmail, including rmail-speedbar-button, rmail-speedbar-find-file, rmail-move-message-to-folder-on-line, rmail-speedbar-move-message, and support variables. - * info.el (Info-speedbar-buttons): Added speedbar support for Info + * info.el (Info-speedbar-buttons): Add speedbar support for Info mode, including Info-speedbar-button, Info-speedbar-menu, and support variables. - * gud.el (gud-speedbar-buttons): Added speedbar support for GUD in + * gud.el (gud-speedbar-buttons): Add speedbar support for GUD in general, and for GDB specifically, including gud-gdb-goto-stackframe, gud-gdb-get-stackframe, gud-gdb-run-command-fetch-lines, gud-gdb-speedbar-stack-filter, @@ -7117,10 +7117,10 @@ 1998-01-21 Kenichi Handa - * international/mule-cmds.el (prefer-coding-system): Call - update-iso-coding-systems. + * international/mule-cmds.el (prefer-coding-system): + Call update-iso-coding-systems. - * international/mule-util.el (string-to-sequence): Adjusted for + * international/mule-util.el (string-to-sequence): Adjust for the change of multibyte-form handling (byte-base to char-base). (store-substring): Likewise. (truncate-string-to-width): Likewise. @@ -7160,13 +7160,13 @@ (set-language-environment-coding-systems): New function. * international/mule-conf.el: Adjusted for the change of the - format of make-coding-system's 6th argument. Initialize - coding-category-iso-7-tight to iso-2022-jp. + format of make-coding-system's 6th argument. + Initialize coding-category-iso-7-tight to iso-2022-jp. * international/mule-diag.el (describe-coding-system): Change the format of showing safe charsets. - * international/mule-util.el (find-safe-coding-system): Moved to + * international/mule-util.el (find-safe-coding-system): Move to mule-cmds.el. (detect-coding-with-priority): New macro. (detect-coding-with-language-environment): New function. @@ -7222,8 +7222,8 @@ * language/japanese.el, language/korean.el, language/lao.el, * language/thai.el, language/tibetan.el, language/vietnamese.el: - Adjusted for the change of make-coding-system. Register - coding-priority key in + Adjusted for the change of make-coding-system. + Register coding-priority key in * language/china-util.el, language/japan-util.el, * language/korea-util.el, language/tibet-util.el, @@ -7259,11 +7259,11 @@ (ccl-dump-translate-multiple-map, ccl-dump-translate-single-map): New functions. - * international/mule.el (define-character-unification-table): New - function. + * international/mule.el (define-character-unification-table): + New function. - * international/mule-conf.el (oldjis-newjis-jisroman-ascii): New - character unification table. + * international/mule-conf.el (oldjis-newjis-jisroman-ascii): + New character unification table. (standard-character-unification-table-for-decode): Initialize to `unification-table' property of `oldjis-newjis-jisroman-ascii'. @@ -7316,8 +7316,8 @@ 1998-01-17 Karl Heuer - * register.el (number-to-register, increment-register): Args - renamed to match doc. + * register.el (number-to-register, increment-register): + Args renamed to match doc. 1998-01-17 Dave Love @@ -7430,7 +7430,7 @@ 1998-01-04 Richard Stallman - * subr.el (sref): Defined. + * subr.el (sref): Define. 1998-01-03 Stephen Eglen @@ -7493,8 +7493,8 @@ 1997-12-22 Kevin Rodgers (tiny change) - * simple.el (previous-matching-history-element): Bind - case-fold-search to nil if REGEXP contains an uppercase letter. + * simple.el (previous-matching-history-element): + Bind case-fold-search to nil if REGEXP contains an uppercase letter. (previous-matching-history-element, next-matching-history-element): Doc fixes. @@ -7521,8 +7521,8 @@ 1997-12-21 Richard Stallman - * msb.el (msb--home-dir): Renamed from msb--home-path. - (msb--strip-dir): Renamed from msb--strip-path. + * msb.el (msb--home-dir): Rename from msb--home-path. + (msb--strip-dir): Rename from msb--strip-path. 1997-12-21 Lars Lindberg @@ -7559,8 +7559,8 @@ (ps-generate): Replace (if A B) by (and A B). (ps-do-despool): Dynamic evaluation for ps-lpr-switches. Replace (if A B) by (and A B). - (color-instance-rgb-components, ps-color-values): Replace - pixel-components by color-instance-rgb-components. + (color-instance-rgb-components, ps-color-values): + Replace pixel-components by color-instance-rgb-components. (ps-xemacs-face-kind-p): Replace face-font by face-font-instance, replace x-font-properties by font-instance-properties. @@ -7662,8 +7662,8 @@ * progmodes/scheme.el: Define indentation in normal dialect for let-syntax, letrec-syntax, syntax-rules, call-with-values, dynamic-wind. - (scheme-mode-map): Remove lisp-complete-symbol. Add - uncomment-region menu item. + (scheme-mode-map): Remove lisp-complete-symbol. + Add uncomment-region menu item. (scheme-mode-hook, dsssl-mode-hook): Declare customized. (dsssl-sgml-declaration): Fix customization. @@ -7726,7 +7726,7 @@ * cus-edit.el (customize-changed-options): New function. (customize-version-lessp): New function. - * facemenu.el (facemenu-remove-face-props): Renamed from + * facemenu.el (facemenu-remove-face-props): Rename from facemenu-remove-props. Remove only face and mouse-face. (facemenu-menu): Update menu item for facemenu-remove-face-props. @@ -7853,10 +7853,10 @@ (debugger-mode): Now runs hook `debugger-mode-hook'. * add-log.el (change-log-add-make-room): New function. - (change-log-get-method-definition-1): Renamed get-method-definition-1. - (change-log-get-method-definition): Renamed from get-method-definition. + (change-log-get-method-definition-1): Rename get-method-definition-1. + (change-log-get-method-definition): Rename from get-method-definition. (add-log-keep-changes-together): New user variable. - (add-change-log-entry): Added missing WHOAMI explanation. + (add-change-log-entry): Add missing WHOAMI explanation. Added new functionality according to variable `add-log-keep-changes-together'. @@ -7876,8 +7876,8 @@ * progmodes/cc-menus.el: Require imenu. - * calendar/cal-french.el (french-calendar-special-days-array): New - function. + * calendar/cal-french.el (french-calendar-special-days-array): + New function. (calendar-french-date-string, calendar-goto-french-date): Use that function instead of the variable. @@ -7890,8 +7890,8 @@ 1997-12-01 Eli Zaretskii - * frame.el (make-frame-names-alist, select-frame-by-name): New - functions, support frame selection with completion and history. + * frame.el (make-frame-names-alist, select-frame-by-name): + New functions, support frame selection with completion and history. (frame-name-history, frame-names-alist): New variables. 1997-11-30 Dave Love @@ -7936,8 +7936,8 @@ 1997-11-24 Michael Kifer - * ediff-vers.el (cvs-run-ediff-on-file-descriptor): Set - default-directory. + * ediff-vers.el (cvs-run-ediff-on-file-descriptor): + Set default-directory. (cvs-run-ediff-on-file-descriptor): Use ediff-buffers when type=MODIFIED. * ediff-init.el: Commented out ediff-set-face-pixmap. @@ -7948,7 +7948,7 @@ 1997-11-24 Simon Marshall - * menu-bar.el (menu-bar-describe-menu): Fixed duplicate KEYs. + * menu-bar.el (menu-bar-describe-menu): Fix duplicate KEYs. 1997-11-24 Richard Stallman @@ -8062,7 +8062,7 @@ 1997-11-20 Karl Heuer - * international/mule-cmds.el (set-input-method): Renamed from + * international/mule-cmds.el (set-input-method): Rename from select-input-method. 1997-11-20 Eli Zaretskii @@ -8200,15 +8200,15 @@ * gnus/gnus-mule.el (gnus-mule-initialize): Do not set nntp-coding-system-for-read and nntp-coding-system-for-write. - * gnus/gnus-start.el (gnus-read-descriptions-file): Decode - description if necessary. + * gnus/gnus-start.el (gnus-read-descriptions-file): + Decode description if necessary. * gnus/nntp.el (nntp-coding-system-for-read): Set default value to binary. (nntp-coding-system-for-write): Likewise. - * international/mule-cmds.el (set-language-environment): Run - exit-language-environment-hook before calling `exit-function' + * international/mule-cmds.el (set-language-environment): + Run exit-language-environment-hook before calling `exit-function' which is specified for the language environment. * language/european.el: Add "Upper Sorbian" and "Lower Sorbian" in @@ -8267,7 +8267,7 @@ (ediff-update-markers-in-dir-meta-buffer): New, for fast redisplay of meta buffer. (ediff-update-meta-buffer, ediff-redraw-directory-group-buffer) - (ediff-previous-meta-overlay-start, ediff-next-meta-item): Changed to + (ediff-previous-meta-overlay-start, ediff-next-meta-item): Change to support the above. (ediff-insert-session-info-in-meta-buffer) (diff-replace-session-status-in-meta-buffer) @@ -8315,8 +8315,8 @@ 1997-10-31 Dave Love - * progmodes/fortran.el (fortran-imenu-generic-expression): New - variable. + * progmodes/fortran.el (fortran-imenu-generic-expression): + New variable. (fortran-mode): Use it. 1997-10-31 Richard Stallman @@ -8327,8 +8327,8 @@ 1997-10-28 Simon Marshall * font-lock.el (font-lock-keywords): Doc fix. - (font-lock-match-c++-style-declaration-item-and-skip-to-next): Allow - any number of ::foo suffixes in declarative items. + (font-lock-match-c++-style-declaration-item-and-skip-to-next): + Allow any number of ::foo suffixes in declarative items. * lazy-lock.el (lazy-lock-fontify-after-defer): Check each buffer to make sure it still (a) exists and (b) has Lazy Lock mode turned on. @@ -8369,18 +8369,18 @@ (octave-comment-indent): Handle magic comments correctly. (calculate-octave-indent): Handle magic comments correctly. - * progmodes/octave-mod.el (octave-abbrev-table): Added abbrevs for + * progmodes/octave-mod.el (octave-abbrev-table): Add abbrevs for switch, case, otherwise, and endswitch. - (octave-begin-keywords): Added switch. - (octave-else-keywords): Added case and otherwise. - (octave-end-keywords): Added endswitch. - (octave-block-match-alist): Added an entry for switch syntax. - (calculate-octave-indent): Added support for switch syntax. + (octave-begin-keywords): Add switch. + (octave-else-keywords): Add case and otherwise. + (octave-end-keywords): Add endswitch. + (octave-block-match-alist): Add an entry for switch syntax. + (calculate-octave-indent): Add support for switch syntax. (octave-block-end-offset): New function. (octave-comment-indent): Fix a typo. - * progmodes/octave-mod.el (octave-block-match-alist): Move - `otherwise' to right after `case' to have octave-close-block() + * progmodes/octave-mod.el (octave-block-match-alist): + Move `otherwise' to right after `case' to have octave-close-block() correctly close a `switch' block by `endswitch'. 1997-10-24 Carsten Dominik @@ -8388,16 +8388,16 @@ * reftex.el: The menu now used toggle and radio for some items. (reftex-default-context-regexps): `caption' now prefers the optional short caption. - (reftex-offer-label-menu): Fixed bug which could kill master + (reftex-offer-label-menu): Fix bug which could kill master buffer of external document. - (reftex-select-item, reftex-get-buffer-visiting): Compatibility - code works now the other way round. + (reftex-select-item, reftex-get-buffer-visiting): + Compatibility code works now the other way round. (reftex-select-external-document): Now gives a message when no external documents are available. (reftex-find-duplicate-labels): Single key strokes to exit or to do a query replace. Made more user friendly in general. - (reftex-section-levels, reftex-default-context-regexps): Move - definition of these variables to configuration section. + (reftex-section-levels, reftex-default-context-regexps): + Move definition of these variables to configuration section. 1997-10-24 Richard Stallman @@ -8485,16 +8485,16 @@ * international/mule-util.el (find-safe-coding-system): New function. - * international/mule.el (load-with-code-conversion): Update - preloaded-file-list, bind load-file-name and + * international/mule.el (load-with-code-conversion): + Update preloaded-file-list, bind load-file-name and inhibit-frame-unsplittable properly. (make-char): Make it a function. Set it byte-compile property to optimize byte-compiled codes. (make-coding-system): New optional arg charsets. Set property `safe-charsets' of the coding system to it. - * international/quail.el (quail-require-guidance-buf): Adjusted - for the change of input-method-verbose-flag. + * international/quail.el (quail-require-guidance-buf): + Adjust for the change of input-method-verbose-flag. * language/chinese.el: Give proper SAFE-CHARSET argument in each call of make-coding-system. @@ -8523,7 +8523,7 @@ * language/korean.el: Give proper SAFE-CHARSET argument in each call of make-coding-system. Set exit-function for language environment "Korean" to exit-korean-environment. - (setup-korean-environment): Moved to korean.el. + (setup-korean-environment): Move to korean.el. * language/lao.el: Give proper SAFE-CHARSET argument in each call of make-coding-system. @@ -8539,8 +8539,8 @@ * man.el (Man-getpage-in-background): Bind inhibit-eol-conversion to t before calling start-process or call-process. - (Man-softhyphen-to-minus): New function. If - enable-multibyte-characters is non-nil, convert the code 0255 only + (Man-softhyphen-to-minus): New function. + If enable-multibyte-characters is non-nil, convert the code 0255 only when it is not a part of a multibyte characters. (Man-fontify-manpage): Call Man-softhyphen-to-minus. (Man-cleanup-manpage): Likewise. @@ -8568,7 +8568,7 @@ (lm-insert-at-column): Use FORCE arg of move-to-column. * emulation/tpu-edt.el (tpu-arrange-rectangle): Likewise. -1997-10-23 Barry A. Warsaw +1997-10-23 Barry A. Warsaw Merge in Release 5.19 of cc-mode. @@ -8593,14 +8593,14 @@ comment-column and there is non-whitespace preceding this on the current line. - * progmodes/cc-mode.el (c-submit-bug-report): Remove - c-recognize-knr-p. Add c-comment-continuation-stars. + * progmodes/cc-mode.el (c-submit-bug-report): + Remove c-recognize-knr-p. Add c-comment-continuation-stars. * progmodes/cc-styles.el (c-initialize-builtin-style): Only use copy-tree if it is funcall-able. This is the right patch, and was given by Erik Naggum -1997-10-23 Barry A. Warsaw +1997-10-23 Barry A. Warsaw * progmodes/cc-menus.el (cc-imenu-c-prototype-macro-regexp): New var. @@ -8608,7 +8608,7 @@ Given by jan.dubois@ibm.net (Jan Dubois). * progmodes/cc-menus.el (cc-imenu-java-generic-expression): - Removed test for declaration + Remove test for declaration statements. Patch given by Ake Stenhoff , as forwarded to me by RMS. @@ -8619,7 +8619,7 @@ to cc-imenu-objc-function to enable Imenu support for Objective-C. Contributed by Masatake (jet) YAMATO. -1997-10-23 Barry A. Warsaw +1997-10-23 Barry A. Warsaw * progmodes/cc-styles.el (c-initialize-builtin-style): Use existing copy-tree if it's defined. @@ -8628,7 +8628,7 @@ c-offsets-alist must be copied recursively. Use copy-tree solution given by Simon Marshall . -1997-10-23 Barry A. Warsaw +1997-10-23 Barry A. Warsaw * progmodes/cc-cmds.el (c-beginning-of-statement): Fixes in sentence movement to properly @@ -8660,8 +8660,8 @@ 1997-10-22 Kenichi Handa - * gnus/gnus-art.el (gnus-show-traditional-method): Call - gnus-mule-decode-article only when enable-multibyte-characters is + * gnus/gnus-art.el (gnus-show-traditional-method): + Call gnus-mule-decode-article only when enable-multibyte-characters is non-nil. * gnus/gnus-ems.el (gnus-ems-redefine): Require `gnus-mule' only @@ -8675,10 +8675,10 @@ 1997-10-21 Kenichi Handa - * international/mule-diag.el (describe-coding-system): Print - information about coding system properties, post-read-conversion + * international/mule-diag.el (describe-coding-system): + Print information about coding system properties, post-read-conversion and pre-write-conversion. - (print-coding-system-briefly): Adjusted for the change in mule.el. + (print-coding-system-briefly): Adjust for the change in mule.el. (describe-current-coding-system): Likewise. (print-coding-system): Likewise. @@ -8688,9 +8688,9 @@ (2) Properties of a coding system (except for `coding-system' and `eol-type') is embedded in PLIST slot of coding-spec vector. (coding-spec-plist-idx): Initialize to 3. - (coding-system-spec-ref): Deleted. - (coding-system-spec): Moved from src/coding.c. - (coding-system-type): Adjusted for the above change. + (coding-system-spec-ref): Delete. + (coding-system-spec): Move from src/coding.c. + (coding-system-type): Adjust for the above change. (coding-system-mnemonic): Likewise. (coding-system-doc-string): Likewise. (coding-system-flags): Likewise. @@ -8698,37 +8698,37 @@ (coding-system-category): Likewise. (coding-system-get, coding-system-put, coding-system-category): New functions. - (coding-system-base): Moved from mule-util.el and adjusted for the + (coding-system-base): Move from mule-util.el and adjusted for the above change. (coding-system-parent): Make it obsolete alias of coding-system-base. - (make-subsidiary-coding-system): Adjusted for the above change. + (make-subsidiary-coding-system): Adjust for the above change. Update coding-system-list and coding-system-alist. (make-coding-system): Likewise. (define-coding-system-alias): Likewise. (set-buffer-file-coding-system): Typo in doc-string fixed. - (after-insert-file-set-buffer-file-coding-system): Change - enable-multibyte-characters only when + (after-insert-file-set-buffer-file-coding-system): + Change enable-multibyte-characters only when find-new-buffer-file-coding-system returns non-nil value. - (find-new-buffer-file-coding-system): Adjusted for the above change. + (find-new-buffer-file-coding-system): Adjust for the above change. - * international/mule-cmds.el (read-multilingual-string): Use - current-input-method prior to default-input-method. Don't bind + * international/mule-cmds.el (read-multilingual-string): + Use current-input-method prior to default-input-method. Don't bind current-input-method by `let', instead, activate the specified input method in the current buffer temporarily. * international/mule-conf.el: Change the way of making coding systems no-conversion and undecided. - * international/mule-util.el (coding-system-base): Moved to + * international/mule-util.el (coding-system-base): Move to mule.el. (coding-system-post-read-conversion): Use the new function coding-system-get. (coding-system-pre-write-conversion): Likewise. (coding-system-unification-table-for-decode): Likewise. (coding-system-unification-table-for-encode): Likewise. - (coding-system-list): Adjusted for the change in mule.el. - (coding-system-plist): Deleted. + (coding-system-list): Adjust for the change in mule.el. + (coding-system-plist): Delete. (coding-system-equal): Do not use coding-system-plist. * language/chinese.el: Use coding-system-put to set coding system @@ -8748,8 +8748,8 @@ * language/thai.el: Use coding-system-put to set coding system properties, post-read-conversion and pre-write-conversion. - * language/tibet-util.el (tibetan-post-read-conversion): Return - the length of converted region. + * language/tibet-util.el (tibetan-post-read-conversion): + Return the length of converted region. * language/tibetan.el: Use coding-system-put to set coding system properties, post-read-conversion and pre-write-conversion. @@ -8770,8 +8770,8 @@ 1997-10-21 Tomohiko Morioka - * gnus/nnfolder.el (nnfolder-request-list): Bind - file-name-coding-system to binary. + * gnus/nnfolder.el (nnfolder-request-list): + Bind file-name-coding-system to binary. (nnfolder-possibly-change-group): Likewise. * gnus/nnml.el (nnml-retrieve-headers): Likewise. @@ -8807,13 +8807,13 @@ gnus-mule-initialize and setting coding system for nntp. (gnus-mule-select-coding-system): Get a coding system of the current newsgroup from gnus-summary-buffer. - (gnus-mule-decode-summary): Deleted. + (gnus-mule-decode-summary): Delete. (gnus-mule-initialize): Add-hook gnus-mule-select-coding-system to gnus-parse-headers-hook. Don't add-hook gnus-mule-decode-summary and gnus-mule-decode-article. Don't set process coding system for nntp stream to 'no-conversion, instead set - nntp-coding-system-for-read to 'binary. Set - nnheader-file-coding-system and nnmail-file-coding-system to + nntp-coding-system-for-read to 'binary. + Set nnheader-file-coding-system and nnmail-file-coding-system to 'binary. 1997-10-21 Lars Magne Ingebrigtsen @@ -8866,8 +8866,8 @@ * nnml.el (nnml-directory): Doc fix. - * gnus-topic.el (gnus-topic-make-menu-bar): Added - gnus-topic-edit-parameters. + * gnus-topic.el (gnus-topic-make-menu-bar): + Add gnus-topic-edit-parameters. 1997-10-21 Jay Sachs @@ -8891,8 +8891,8 @@ 1997-10-21 Lars Magne Ingebrigtsen - * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Escape - newlines. + * gnus-start.el (gnus-gnus-to-quick-newsrc-format): + Escape newlines. 1997-10-21 Lars Magne Ingebrigtsen @@ -8901,7 +8901,7 @@ 1997-10-21 Danny Siu * smiley.el (smiley-buffer): Make smiley case sensitive. - (smiley-deformed-regexp-alist): Added more regexp for happy smiley. + (smiley-deformed-regexp-alist): Add more regexp for happy smiley. (smiley-nosey-regexp-alist): Same as above. 1997-10-21 Lars Magne Ingebrigtsen @@ -8919,9 +8919,9 @@ 1997-10-21 Lars Magne Ingebrigtsen - * nntp.el (nntp-nov-gap): Changed default. + * nntp.el (nntp-nov-gap): Change default. - * gnus-nocem.el (gnus-nocem-issuers): Fixed names. + * gnus-nocem.el (gnus-nocem-issuers): Fix names. 1997-10-21 Lars Magne Ingebrigtsen @@ -8969,8 +8969,8 @@ * gnus.el (gnus-simplify-mode-line): Use varying formats. - * gnus-xmas.el (gnus-xmas-group-remove-excess-properties): Removed. - (gnus-xmas-topic-remove-excess-properties): Removed. + * gnus-xmas.el (gnus-xmas-group-remove-excess-properties): Remove. + (gnus-xmas-topic-remove-excess-properties): Remove. 1997-10-21 Lars Magne Ingebrigtsen @@ -8993,8 +8993,8 @@ 1997-10-21 Michael R. Cook - * gnus-topic.el (gnus-topic-toggle-display-empty-topics): List - groups. + * gnus-topic.el (gnus-topic-toggle-display-empty-topics): + List groups. 1997-10-21 Per Abrahamsen @@ -9013,8 +9013,8 @@ * gnus-start.el (gnus-check-first-time-used): Force reading the active file the first time Gnus is used. - * gnus-group.el (gnus-group-set-mode-line): Conditionalize - modified. + * gnus-group.el (gnus-group-set-mode-line): + Conditionalize modified. * gnus-ems.el (gnus-mode-line-modified): New variable. @@ -9053,9 +9053,9 @@ * message.el (message-clone-locals): Made into own function. - * gnus.el (gnus-select-method): Changed default. + * gnus.el (gnus-select-method): Change default. - * gnus-start.el (gnus-read-active-file): Changed default to + * gnus-start.el (gnus-read-active-file): Change default to `some'. 1997-10-21 Lars Magne Ingebrigtsen @@ -9235,12 +9235,12 @@ 1997-10-21 Lars Magne Ingebrigtsen - * gnus-sum.el (t): Moved pop article keystroke. + * gnus-sum.el (t): Move pop article keystroke. 1997-10-21 Lars Magne Ingebrigtsen - * nnmail.el (nnmail-search-unix-mail-delim-backward): Allow - several "From "'s. + * nnmail.el (nnmail-search-unix-mail-delim-backward): + Allow several "From "'s. (nnmail-search-unix-mail-delim): Ditto. 1997-10-21 Lars Magne Ingebrigtsen @@ -9283,8 +9283,8 @@ 1997-10-21 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-summary-limit-children): Typo. Wouldn't - marked NoCeM'ed out messages as read. + * gnus-sum.el (gnus-summary-limit-children): Typo. + Wouldn't marked NoCeM'ed out messages as read. 1997-10-21 Darren Stalder @@ -9300,8 +9300,8 @@ 1997-10-21 Danny Siu - * gnus-picon.el (gnus-group-display-picons): Use - gnus-group-real-name so that picons for foreign groups display + * gnus-picon.el (gnus-group-display-picons): + Use gnus-group-real-name so that picons for foreign groups display correctly. 1997-10-21 Lars Magne Ingebrigtsen @@ -9364,8 +9364,8 @@ 1997-10-21 Per Abrahamsen - * gnus-cite.el (gnus-cite-attribution-prefix): Recognize - Microsoft/Agent style attribution lines. + * gnus-cite.el (gnus-cite-attribution-prefix): + Recognize Microsoft/Agent style attribution lines. (gnus-cite-attribution-suffix): Ditto. 1997-10-21 Lars Magne Ingebrigtsen @@ -9375,8 +9375,8 @@ (gnus-cache-possibly-alter-active): Test statement removed. (gnus-cache-articles-in-group): Would destroy hashtb. - * gnus-sum.el (gnus-summary-limit-mark-excluded-as-read): Don't - mark everything as read. + * gnus-sum.el (gnus-summary-limit-mark-excluded-as-read): + Don't mark everything as read. * gnus-cite.el (gnus-article-fill-cited-article): Nix out gnus-cite-article. @@ -9398,9 +9398,9 @@ * nnml.el (nnml-update-file-alist): Allow forcing. - * nnheaderxm.el (nnheader-xmas-find-file-noselect): Removed. - (nnheader-xmas-cancel-timer): Removed. - (nnheader-xmas-cancel-function-timers): Removed. + * nnheaderxm.el (nnheader-xmas-find-file-noselect): Remove. + (nnheader-xmas-cancel-timer): Remove. + (nnheader-xmas-cancel-function-timers): Remove. 1997-10-21 Lars Magne Ingebrigtsen @@ -9411,7 +9411,7 @@ * message.el (message-set-auto-save-file-name): Create unique auto save file names. - * gnus-topic.el (gnus-topic-tallied-groups): Removed. + * gnus-topic.el (gnus-topic-tallied-groups): Remove. (gnus-topic-prepare-topic): Output right number of articles in each sub-topic. @@ -9451,23 +9451,23 @@ need be displayed. (gnus-picons-lock): Function deleted. (gnus-picons-remove): Don't use it. New way of locking. - (gnus-picons-next-job-internal): New way of locking. Handle - new tag 'bar. + (gnus-picons-next-job-internal): New way of locking. + Handle new tag 'bar. (gnus-picons-next-job): New way of locking. (gnus-picons-buffer): Variable deleted. - (gnus-picons-remove-all): Modified accordingly. + (gnus-picons-remove-all): Modify accordingly. (gnus-group-annotations-lock): Variable deleted. (gnus-article-annotations-lock): Variable deleted. (gnus-x-face-annotations-lock): Variable deleted. - (gnus-picons-news-directories): Renamed, was + (gnus-picons-news-directories): Rename, was gnus-picons-news-directory. (gnus-picons-url-retrieve): Do not change url-show-status. (gnus-picons-clear-cache): Also clear gnus-picons-url-alist. 1997-10-21 Michael R. Cook - * gnus-topic.el (gnus-topic-toggle-display-empty-topics): New - function. + * gnus-topic.el (gnus-topic-toggle-display-empty-topics): + New function. 1997-10-21 Lars Magne Ingebrigtsen @@ -9504,7 +9504,7 @@ 1997-10-21 Lars Magne Ingebrigtsen - * gnus-topic.el (gnus-topic-create-topic): Added doc. + * gnus-topic.el (gnus-topic-create-topic): Add doc. * gnus-sum.el (gnus-summary-refer-article): Insert sparse non-displayed articles properly. @@ -9536,7 +9536,7 @@ (gnus-article-display-picons): Use the job queue if using the network. (gnus-group-display-picons): Ditto. (gnus-picons-make-path): Function deleted. - (gnus-picons-lookup-internal): Modified accordingly. + (gnus-picons-lookup-internal): Modify accordingly. (gnus-picons-lookup-user-internal): Take the LETs out of the loops. (gnus-picons-lookup-pairs): Take constant calculation outside of loop. (gnus-picons-display-picon-or-name): Use COND instead of nested IFs. @@ -9577,23 +9577,23 @@ (gnus-picons-users-image-alist): New variable. (gnus-picons-retrieve-user-callback): Use it. Added support for network retrieval of picons. - (gnus-picons-map): Removed. - (gnus-picons-remove): Removed case to handle processes. + (gnus-picons-map): Remove. + (gnus-picons-remove): Remove case to handle processes. (gnus-picons-processes-alist): New variable. - (gnus-picons-x-face-sentinel): Simplified. Use processes alist. + (gnus-picons-x-face-sentinel): Simplify. Use processes alist. (gnus-picons-display-x-face): Explicitly request an xface image. Always call gnus-picons-prepare-for-annotations. Use processes alist. (gnus-picons-lookup-internal): New function. (gnus-picons-lookup): Use it. (gnus-picons-lookup-user-internal): Ditto. (gnus-picons-display-picon-or-name): No more xface-p argument. - (gnus-picons-try-suffixes): Removed. + (gnus-picons-try-suffixes): Remove. (gnus-picons-try-face): New function. Does the caching in gnus-picons-glyph-alist. (gnus-picons-try-to-find-face): Take a glyph argument instead of a path. No more xface-p argument. Only use one annotation even if gnus-picons-display-as-address. - (gnus-picons-toggle-extent): Changed into an annotation action. + (gnus-picons-toggle-extent): Change into an annotation action. 1997-10-21 Lars Magne Ingebrigtsen @@ -9601,8 +9601,8 @@ 1997-10-21 Kim-Minh Kaplan - * gnus-picon.el (gnus-picons-prepare-for-annotations): New - function, and many changes. + * gnus-picon.el (gnus-picons-prepare-for-annotations): + New function, and many changes. 1997-10-21 Lars Magne Ingebrigtsen @@ -9671,8 +9671,8 @@ * gnus-cache.el (gnus-cache-move-cache): Allow entering directory name. - * nntp.el (nntp-telnet-command, nntp-telnet-switches): New - variables. + * nntp.el (nntp-telnet-command, nntp-telnet-switches): + New variables. * gnus-score.el (gnus-summary-increase-score): Refuse illegal match types. @@ -9684,7 +9684,7 @@ 1997-10-21 Per Abrahamsen - * gnus-ems.el (gnus-article-x-face-command): Removed bogus + * gnus-ems.el (gnus-article-x-face-command): Remove bogus declaration. 1997-10-21 Paul Franklin @@ -9758,8 +9758,8 @@ * message.el (message-cancel-news): Only say we cancel if we cancel. - * gnus-msg.el (gnus-summary-mail-crosspost-complaint): Deactivate - mark. + * gnus-msg.el (gnus-summary-mail-crosspost-complaint): + Deactivate mark. 1997-10-21 Lars Magne Ingebrigtsen @@ -9842,7 +9842,7 @@ (reftex-make-master-buffer-hook): Hook removed. (reftex-insert-buffer-or-file): Function removed. (reftex-parse-document): Function adapted to new parser. - (reftex-access-scan-info): Changed to fit new parser. Now detects + (reftex-access-scan-info): Change to fit new parser. Now detects changes in label-alist related variables automatically. (reftex-parse-one, reftex-parse-all): New functions. (reftex-all-document-files): New function. @@ -9872,8 +9872,8 @@ (reftex-find-nearby-label): Function removed. (reftex-scan-buffer-for-labels): Function removed. (reftex-section-info): New function. - (reftex-nth-parens-substring): Renamed to reftex-nth-arg. Return - nil when not enough args are present. + (reftex-nth-parens-substring): Rename to reftex-nth-arg. + Return nil when not enough args are present. (reftex-move-over-touching-args): New function. (reftex-where-am-I): New function. (reftex-nth-arg-wrapper): New function. @@ -9888,7 +9888,7 @@ several backup methods. (reftex-citation): Recursive edit moved to `e' key. (reftex-scan-buffer): Function removed. - (reftex-get-bibfile-list): Changed to work with chapterbib + (reftex-get-bibfile-list): Change to work with chapterbib package. (reftex-find-tex-file): New function. (reftex-find-files-on-path): Now first looks for file with @@ -9897,7 +9897,7 @@ reftex-do-citation. (reftex-do-citation): Recursive edit now on `e' key. (reftex-what-macro): Allow white space between macro arguments. - (reftex-allow-for-ctrl-m): Renamed to + (reftex-allow-for-ctrl-m): Rename to `reftex-make-regexp-allow-for-ctrl-m'. (reftex-nearest-match): New function. (reftex-auto-mode-alist): New function. @@ -9909,8 +9909,8 @@ (reftex-parse-args): New function. (easy-menu-define): Menu extended. Some parts are now computed. from the user options. - (reftex-move-to-next-arg, reftex-move-to-previous-arg): New - functions. Now we can parse macros with distributed arguments. + (reftex-move-to-next-arg, reftex-move-to-previous-arg): + New functions. Now we can parse macros with distributed arguments. (reftex-goto-label): Function removed. (reftex-position-cursor): Function removed. (reftex-item): Function removed. @@ -9944,8 +9944,8 @@ * iso-insert.el: Add autoloads for `8859-1-map'. - * cus-edit.el (custom-group-value-create): Use - `custom-group-visibility' instead of `group-visibility'. + * cus-edit.el (custom-group-value-create): + Use `custom-group-visibility' instead of `group-visibility'. 1997-10-19 Richard Stallman @@ -10018,7 +10018,7 @@ (double-map): Add customize support. (double-prefix-only): Ditto. - * textmodes/nroff-mode.el (nroff): Moved from `editing' to `wp'. + * textmodes/nroff-mode.el (nroff): Move from `editing' to `wp'. * wid-edit.el (variable-link): New widget. (widget-variable-link-action): New function. @@ -10033,7 +10033,7 @@ (view-highlight-face, view-scroll-auto-exit) (view-try-extend-at-buffer-end) (view-remove-frame-by-deleting, view-mode-hook): - Defined by defcustom instead of by defvar. + Define by defcustom instead of by defvar. (view-mode-enter): Install exit-action also when view-mode is already on. Small rewrite using unless. (view-mode, view-mode-exit, view-scroll-lines, view-really-at-end) @@ -10109,8 +10109,8 @@ * comint.el (comint-regexp-arg): Likewise. * term.el (term-regexp-arg): Likewise. - * simple.el (repeat-complex-command): Bind - minibuffer-history-sexp-flag to the minibuffer depth. + * simple.el (repeat-complex-command): + Bind minibuffer-history-sexp-flag to the minibuffer depth. (next-history-element): Compare minibuffer-history-sexp-flag against the current minibuffer depth to verify its validity. (previous-matching-history-element): Likewise. @@ -10138,7 +10138,7 @@ * finder.el (finder-mode-map): Bind [mouse-2]. (finder-compile-keywords): Match compressed file names, but don't put compression extension in the output. - (finder-find-library): Deleted. + (finder-find-library): Delete. (finder-commentary): Use locate-library, not finder-find-library. (finder-mouse-select): New function. (finder-summary): Mention mouse binding. @@ -10147,7 +10147,7 @@ 1997-09-30 Andre Spiegel - * vc-hooks.el (vc-find-cvs-master): Added missing `throw' for + * vc-hooks.el (vc-find-cvs-master): Add missing `throw' for the case when TIMESTAMP is arbitrary text. 1997-09-30 Hrvoje Niksic @@ -10180,8 +10180,8 @@ * ediff-init.el: Added documentation to face-variables. - * ediff-util.el (ediff-next-difference, ediff-previous-difference): Use - ediff-merge-region-is-non-clash and don't compute fine diffs when + * ediff-util.el (ediff-next-difference, ediff-previous-difference): + Use ediff-merge-region-is-non-clash and don't compute fine diffs when skipping non-clash regions. * ediff-merg.el (ediff-merge-region-is-non-clash): New function. @@ -10316,12 +10316,12 @@ 1997-09-15 Ken'ichi Handa - * mule.el (find-new-buffer-file-coding-system): Reflect - text coding part of default-buffer-file-coding-system to + * mule.el (find-new-buffer-file-coding-system): + Reflect text coding part of default-buffer-file-coding-system to buffer-file-coding-system when buffer-file-coding-system is not locally set and ASCII only text is read. -1997-09-15 Barry A. Warsaw +1997-09-15 Barry A. Warsaw * progmodes/cc-styles.el (c-initialize-builtin-style): Copy the whole tree instead of just copy-sequence. @@ -10335,11 +10335,11 @@ 1997-09-15 Andreas Schwab - * international/quail.el (quail-completion-list-translations): Fix - and simplify generation of translation list. + * international/quail.el (quail-completion-list-translations): + Fix and simplify generation of translation list. - * international/titdic-cnv.el (tit-process-header): Convert - argument of KEYPROMPT if it contains an escape. + * international/titdic-cnv.el (tit-process-header): + Convert argument of KEYPROMPT if it contains an escape. (tit-process-body): Handle trailing whitespace and multiple spaces between phrases. @@ -10483,10 +10483,10 @@ 1997-09-12 Michael Kifer - * viper-keym.el (viper-want-ctl-h-help): Updated doc string. + * viper-keym.el (viper-want-ctl-h-help): Update doc string. (viper-vi-basic-map, viper-insert-basic-map, viper-replace-map): - Added binding for backspace. - * viper-cmd.el (viper-adjust-keys-for): Separated backspace and C-h. + Add binding for backspace. + * viper-cmd.el (viper-adjust-keys-for): Separate backspace and C-h. 1997-09-12 Richard Stallman @@ -10505,7 +10505,7 @@ 1997-09-12 Inge Frick - * compile.el (compilation-parse-errors): Fixed two bugs that + * compile.el (compilation-parse-errors): Fix two bugs that could make compilation-parse-errors loop infinitely. Each round of the parsing loop now either moves point ahead at least a line or sets `found-desired' to true to stop the loop. @@ -10535,8 +10535,8 @@ 1997-09-11 Eli Zaretskii - * international/mule-diag.el (describe-coding-system): Describe - coding systems of type 5, raw-text. + * international/mule-diag.el (describe-coding-system): + Describe coding systems of type 5, raw-text. * hexl.el (hexlify-buffer): Bind coding-system-for-write to raw-text with eol-type derived from the buffer-file-coding-system. @@ -10587,11 +10587,11 @@ 1997-09-10 Michael Ernst - * uniquify.el (uniquify-ignore-buffers-re): Added. + * uniquify.el (uniquify-ignore-buffers-re): Add. 1997-09-10 Michael Kifer - * viper-keym.el (viper-help-modifier-map): Deleted; help mode map is + * viper-keym.el (viper-help-modifier-map): Delete; help mode map is no longer modified. * viper.el (viper-set-hooks): Make help buffers come up in emacs state. @@ -10612,7 +10612,7 @@ (ethio-fidel-to-sera-mail-or-marker): New function. (ethio-find-file): Do nothing if not in ethio-mode. (ethio-write-file): Likewise. - (ethio-prefer-ascii-space): Moved from leim/quail/ethiopic.el. + (ethio-prefer-ascii-space): Move from leim/quail/ethiopic.el. (ethio-toggle-space): Likewise. (ethio-insert-space): Likewise. (ethio-insert-ethio-space): Likewise. @@ -10627,8 +10627,8 @@ 1997-09-10 Kenichi Handa - * language/japan-util.el (setup-japanese-environment): Give - iso-2022-jp to set-default-coding-system if not running on DOS. + * language/japan-util.el (setup-japanese-environment): + Give iso-2022-jp to set-default-coding-system if not running on DOS. (read-hiragana-string): Use input method "japanese-hiragana". * gnus/gnus-mule.el: Add coding system specification for several @@ -10686,15 +10686,15 @@ 1997-09-08 Per Abrahamsen - * cus-edit.el (custom-variable-save): Fixed doc string. + * cus-edit.el (custom-variable-save): Fix doc string. * cus-edit.el (custom-variable-menu): Make it clear that `Lisp mode' edit the initial lisp expression. 1997-09-08 Eli Zaretskii - * info.el (info-insert-file-contents): Bind - coding-system-for-write to no-conversion. + * info.el (info-insert-file-contents): + Bind coding-system-for-write to no-conversion. 1997-09-08 Andreas Schwab @@ -10742,9 +10742,9 @@ * telnet.el (telnet-initial-filter): Temporarily go to proper buffer. -1997-09-07 Barry A. Warsaw +1997-09-07 Barry A. Warsaw - * progmodes/cc-mode.el (c-version): Updated. + * progmodes/cc-mode.el (c-version): Update. * progmodes/cc-cmds.el (c-beginning-of-statement): Fixes in sentence movement to properly @@ -10916,8 +10916,8 @@ 1997-09-05 Ken'ichi Handa - * language/japan-util.el (setup-japanese-environment): Set - coding-category-iso-8-else to japanese-iso-8bit. + * language/japan-util.el (setup-japanese-environment): + Set coding-category-iso-8-else to japanese-iso-8bit. 1997-09-05 Richard Stallman @@ -10950,10 +10950,10 @@ 1997-09-05 Michael Kifer * viper-init.el (viper-replace-region-start-delimiter): - Improved the default. + Improve the default. * viper-mous.el (viper-mouse-click-search-word) (viper-mouse-click-insert-word): - Fixed to not react when click is not over a text area. + Fix to not react when click is not over a text area. * viper.el (read-file-name): Unadvised. * viper-cmd.el (viper-insert-state-post-command-sentinel) (viper-save-last-insertion): @@ -11036,9 +11036,9 @@ 1997-09-02 Geoff Voelker * w32-fns.el: Update doc strings. - (w32-startup): Deleted function. + (w32-startup): Delete function. (w32-check-shell-configuration, w32-init-info): New functions. - (w32-system-shell-p): Renamed from w32-using-system-shell-p. + (w32-system-shell-p): Rename from w32-using-system-shell-p. Added shell name argument. 1997-09-02 Richard Stallman @@ -11170,11 +11170,11 @@ 1997-08-31 Andreas Schwab - * emacs-lisp/bytecomp.el (byte-compile-output-file-form): Handle - custom-declare-variable. + * emacs-lisp/bytecomp.el (byte-compile-output-file-form): + Handle custom-declare-variable. - * international/mule-diag.el (describe-current-coding-system): Add - missing newline in output. + * international/mule-diag.el (describe-current-coding-system): + Add missing newline in output. 1997-08-31 Richard Stallman @@ -11228,17 +11228,17 @@ 1997-08-29 Carsten Dominik - * reftex.el (reftex-customize): Added call to customize browse. + * reftex.el (reftex-customize): Add call to customize browse. (reftex-show-commentary): New function. (reftex-label-alist): Prefix may contain % escapes. Nth macro argument may be context. May give two different context methods. (reftex-default-label-alist-entries): Customization type changed. (reftex-label-menu-flags): Extra flag for searches. - (reftex-cite-format): Changed completely, % escapes are now used. + (reftex-cite-format): Change completely, % escapes are now used. (reftex-comment-citations): New variable. (reftex-cite-comment-format): New variable. (reftex-cite-punctuation): New variable. - (reftex-make-master-buffer): Changed name of master buffer, + (reftex-make-master-buffer): Change name of master buffer, removed interactive. Runs a hook on the buffer. Interpret TEXINPUTS environment variable. Allow naked argument for \input. Master buffer is now in fundamental mode. @@ -11326,25 +11326,25 @@ * international/mule.el (make-coding-system): Make TYPE 5 means raw-text. - (after-insert-file-set-buffer-file-coding-system): Set - enable-multibyte-characters to nil if we read a file with + (after-insert-file-set-buffer-file-coding-system): + Set enable-multibyte-characters to nil if we read a file with no-conversion or raw-text-XXXX. - * international/mule-conf.el (raw-text): New coding system. Set - coding-category-raw-text to raw-text. - - * language/english.el (setup-english-environment): Set - coding-category-raw-text to raw-text. - - * language/viet-util.el (setup-vietnamese-environment): Set - coding-category-raw-text to vietnamese-viscii. + * international/mule-conf.el (raw-text): New coding system. + Set coding-category-raw-text to raw-text. + + * language/english.el (setup-english-environment): + Set coding-category-raw-text to raw-text. + + * language/viet-util.el (setup-vietnamese-environment): + Set coding-category-raw-text to vietnamese-viscii. * language/cyril-util.el (setup-cyrillic-alternativnyj-environment): Set coding-category-raw-text to cyrillic-alternativnyj. * international/mule-cmds.el (update-leim-list-file): Make it handle multiple directories. - (update-all-leim-list-files): Deleted. + (update-all-leim-list-files): Delete. * international/quail.el (quail-update-leim-list-file): Make it handle multiple directories. @@ -11357,8 +11357,8 @@ * nnfolder.el (nnfolder-request-list): Override 'nnmail-file-coding-system' by 'nnmail-active-file-coding-system'. - (nnfolder-request-list, nnfolder-possibly-change-group): Protect - from conversion by `pathname-coding-system' for XEmacs/mule. + (nnfolder-request-list, nnfolder-possibly-change-group): + Protect from conversion by `pathname-coding-system' for XEmacs/mule. (nnfolder-group-pathname): Encode pathname for Emacs 20. * nnmh.el (nnmh-request-list, nnmh-active-number): Protect from @@ -11400,8 +11400,8 @@ * gnus-sum.el (gnus-structured-field-decoder): New variable. (gnus-unstructured-field-decoder): New variable. - (gnus-get-newsgroup-headers, gnus-nov-parse-line): Use - `gnus-structured-field-decoder' and + (gnus-get-newsgroup-headers, gnus-nov-parse-line): + Use `gnus-structured-field-decoder' and `gnus-unstructured-field-decoder' for Subject field. 1997-08-28 Miyashita Hisashi @@ -11508,8 +11508,8 @@ * files.el (revert-buffer): Read a file without any code conversion if we are reverting from an auto-saved file. - * language/japanese.el (set-language-info-alist): Change - iso-2022-7bit to iso-2022-jp. + * language/japanese.el (set-language-info-alist): + Change iso-2022-7bit to iso-2022-jp. * replace.el (query-replace-read-args): Locally bind minibuffer-inherit-input-method to t to make a minibuffer inherit @@ -11635,14 +11635,14 @@ and changed into defsubsts. (last): New function. - * emacs-lisp/cl.el (caar, cadr, cdar, cddr): Moved to subr.el. + * emacs-lisp/cl.el (caar, cadr, cdar, cddr): Move to subr.el. (last): Function renamed to last*. * emacs-lisp/cl-macs.el (cl-loop-let): Use last*. * time.el (display-time-hook): Minor doc fix. - * ps-print.el (ps-zebra-stripes): Renamed from ps-zebra-stripe. - (ps-zebra-stripe-height): Renamed from ps-number-of-zebra. + * ps-print.el (ps-zebra-stripes): Rename from ps-zebra-stripe. + (ps-zebra-stripe-height): Rename from ps-number-of-zebra. * vc.el (vc-version-diff): Mention that default file is visited file. @@ -11734,7 +11734,7 @@ (bookmark-bmenu-check-position): Return a meaningful value -- callers have apparently been assuming this anyway. (bookmark-build-xemacs-menu): Unused function deleted. - (bookmark-version): Removed this variable; the Emacs version suffices. + (bookmark-version): Remove this variable; the Emacs version suffices. 1997-08-22 Simon Marshall @@ -11756,7 +11756,7 @@ * viper-cmd.el (viper-replace-char-subr, viper-word-*) (viper-separator-skipback-special): Made to work with mule and syntax tables. - (viper-change-state): Moved iso-accents-mode handling here from + (viper-change-state): Move iso-accents-mode handling here from viper-change-state-to-vi/insert/etc. Also now toggles MULE. 1997-08-21 Richard Stallman @@ -11769,7 +11769,7 @@ 1997-08-21 Kenichi HANDA - * language/cyril-util.el (setup-cyrillic-environment): Deleted. + * language/cyril-util.el (setup-cyrillic-environment): Delete. (setup-cyrillic-iso-environment): New function. (setup-cyrillic-koi8-environment): New function. (setup-cyrillic-alternativnyj-environment): New function. @@ -11784,20 +11784,20 @@ (auto-file-coding-system-function): Set this variable to `auto-file-coding-system'. - * international/quail.el (quail-terminate-translation): Run - input-method-after-insert-chunk-hook only when the current input + * international/quail.el (quail-terminate-translation): + Run input-method-after-insert-chunk-hook only when the current input method doesn't require conversion. (quail-no-conversion): Run input-method-after-insert-chunk-hook. * international/mule-util.el (coding-system-unification-table): - Deleted. + Delete. (coding-system-unification-table-for-decode): New function. (coding-system-unification-table-for-encode): New function. * international/mule.el (make-coding-system): Doc-string fixed. - * international/fontset.el (register-alternate-fontnames): New - function. + * international/fontset.el (register-alternate-fontnames): + New function. (x-complement-fontset-spec): Register alternate fontnames by calling register-alternate-fontnames. (instanciate-fontset): Likewise. @@ -11874,7 +11874,7 @@ (ps-background-image, ps-background, ps-header-height) (ps-get-face): New internal functions. (ps-control-character): Handle control characters. - (ps-gnus-print-article-from-summary): Updated for Gnus 5. + (ps-gnus-print-article-from-summary): Update for Gnus 5. (ps-jack-setup): Replace 'nil by nil, 't by t. 1997-08-19 Richard Stallman @@ -11890,8 +11890,8 @@ * files.el (append-to-file): Doc-string fixed. - * international/quail.el (quail-exit-from-minibuffer): Call - inactivate-input-method instead of (quail-mode -1). + * international/quail.el (quail-exit-from-minibuffer): + Call inactivate-input-method instead of (quail-mode -1). (quail-kill-guidance-buf): New function. (quail-mode): Doc-string and comments modified. Make this function non-interactive. Add quail-kill-guidance-buf to @@ -11970,35 +11970,35 @@ (quail-define-package): Indentation fixed. (quail-setup-overlays): New arg conversion-mode. Pay attention to input-method-highlight-flag. - (quail-mode-line-format): Deleted. - (quail-generate-mode-line-format): Deleted. + (quail-mode-line-format): Delete. + (quail-generate-mode-line-format): Delete. (quail-mode): Don't handle input-method-inactivate-hook and input-method-activate-hook here. Delete code setting quail-mode-line-format. (quail-saved-current-map): Name changed from quail-saved-overriding-local-map. (quail-toggle-mode-temporarily): Completely re-written. - (quail-execute-non-quail-command): Use - quail-toggle-mode-temporarily. - (quail-conv-overlay-modification-hook): Deleted. - (quail-suppress-conversion): Deleted. + (quail-execute-non-quail-command): + Use quail-toggle-mode-temporarily. + (quail-conv-overlay-modification-hook): Delete. + (quail-suppress-conversion): Delete. (quail-start-translation): Completely re-written. (quail-start-translation-in-conversion-mode): Likewise. (quail-delete-region): Check if quail-overlay is active. - (quail-get-current-str): Don't call throw. Set - overriding-terminal-local-map correctly. + (quail-get-current-str): Don't call throw. + Set overriding-terminal-local-map correctly. (quail-update-translation): Run hooks in input-method-after-insert-chunk-hook. (quail-self-insert-command): Catch 'quail-tag here. - (quail-conversion-delete-char): Don't call throw. Set - overriding-terminal-local-map to nil. + (quail-conversion-delete-char): Don't call throw. + Set overriding-terminal-local-map to nil. (quail-conversion-backward-delete-char): Likewise. (quail-no-conversion): Likewise. - (quail-help-insert-keymap-description): Bind - overriding-terminal-local-map instead of overriding-local-map. + (quail-help-insert-keymap-description): + Bind overriding-terminal-local-map instead of overriding-local-map. - * international/mule-cmds.el (previous-input-method): This - variable deleted. + * international/mule-cmds.el (previous-input-method): + This variable deleted. (input-method-history): New variable. (read-input-method-name): Bind minibuffer-history to input-method-history. @@ -12006,27 +12006,27 @@ previous-input-method. Run hooks in input-method-activate-hook. (inactivate-input-method): Update input-method-history. Run hooks in input-method-inactivate-hook. - (select-input-method): Doc-string modified. Use - input-method-history instead of previous-input-method. Set - default-input-method to input-method. - (toggle-input-method): Doc-string modified. Use - input-method-history instead of previous-input-method. + (select-input-method): Doc-string modified. + Use input-method-history instead of previous-input-method. + Set default-input-method to input-method. + (toggle-input-method): Doc-string modified. + Use input-method-history instead of previous-input-method. (read-multilingual-string): Bind minibuffer-setup-hook correctly. (input-method-exit-on-invalid-key): New variable. - * isearch.el (isearch-multibyte-characters-flag): Deleted. + * isearch.el (isearch-multibyte-characters-flag): Delete. (isearch-mode): Do not bind isearch-multibyte-characters-flag and isearch-input-method. (isearch-printing-char): Use current-input-method instead of isearch-input-method. (isearch-message-prefix): Likewise. - * international/isearch-x.el (isearch-input-method): Deleted. - (isearch-input-method-title): Deleted. + * international/isearch-x.el (isearch-input-method): Delete. + (isearch-input-method-title): Delete. (isearch-toggle-specified-input-method): Call toggle-input-method. (isearch-toggle-input-method): Likewise. - (isearch-process-search-multibyte-characters): Use - current-input-method instead of isearch-input-method. + (isearch-process-search-multibyte-characters): + Use current-input-method instead of isearch-input-method. 1997-08-17 Richard Stallman @@ -12045,7 +12045,7 @@ For writing, use buffer-file-coding-system if set, otherwise buffer-file-type. (find-file-not-found-set-buffer-file-coding-system): - Renamed from find-file-not-found-set-buffer-file-type. + Rename from find-file-not-found-set-buffer-file-type. Set buffer-file-coding-system as well as buffer-file-type. 1997-08-16 Richard Stallman @@ -12066,8 +12066,8 @@ * international/isearch-x.el (isearch-process-search-multibyte-characters): Bind input-method-verbose-flag, not input-method-tersely-flag. - * international/mule-cmds.el (input-method-verbose-flag): Renamed - from input-method-tersely-flag and sense inverted. + * international/mule-cmds.el (input-method-verbose-flag): + Rename from input-method-tersely-flag and sense inverted. (input-method-highlight-flag): New variable. (toggle-input-method): Pass missing arg to read-input-method-name. @@ -12079,8 +12079,8 @@ 1997-08-16 Kenichi Handa - * language/china-util.el (setup-chinese-gb-environment): Delete - a code setting default value of default-input-method. + * language/china-util.el (setup-chinese-gb-environment): + Delete a code setting default value of default-input-method. (setup-chinese-big5-environment): Likewise. (setup-chinese-cns-environment): Likewise. @@ -12107,7 +12107,7 @@ * loadup.el (loaddefs.el): Load that file much later, almost last. Delete most calls to garbage-collect. -1997-08-15 Barry A. Warsaw +1997-08-15 Barry A. Warsaw * progmodes/cc-styles.el (c-style-alist): "python" style requires c-comment-continuation-stars be "". @@ -12271,7 +12271,7 @@ * dos-fns.el (dos-print-region-function): Force EOL conversion to DOS CR-LF pairs. -1997-08-10 Barry A. Warsaw +1997-08-10 Barry A. Warsaw * Release 5.15 @@ -12324,7 +12324,7 @@ (c-enable-//-in-c-mode): Obsolete. * progmodes/cc-langs.el (c++-mode-syntax-table, java-mode-syntax-table) - (objc-mode-syntax-table, idl-mode-syntax-table): Added autoload + (objc-mode-syntax-table, idl-mode-syntax-table): Add autoload cookies. c-mode-syntax-table already has one. Use the new syntax table initialization idioms. @@ -12333,7 +12333,7 @@ lines are now analyzed as template-args-cont. * progmodes/cc-styles.el (c-offsets-alist): - Added template-args-cont syntactic symbol. + Add template-args-cont syntactic symbol. * progmodes/cc-styles.el (c-styles-alist): In "java" style, set c-hanging-comment-starter-p to @@ -12353,16 +12353,16 @@ * international/mule.el (make-coding-system): Add a new FLAGS elements SAFE. Use it for terminal coding system if some other coding system is specified explicitly. - (ignore-relative-composition): Initialize - ignore-relative-composition. + (ignore-relative-composition): + Initialize ignore-relative-composition. - * international/mule-util.el(prefer-coding-system): Moved to + * international/mule-util.el(prefer-coding-system): Move to mule-util.el. * international/mule-cmds.el (set-default-coding-systems): Doc-string modified. - (prefer-coding-system): Moved from mule-util.el. Call - set-default-coding-systems. + (prefer-coding-system): Move from mule-util.el. + Call set-default-coding-systems. * international/mule-conf.el (iso-safe): New coding system. @@ -12416,7 +12416,7 @@ * help.el (describe-key): Don't put a colon after the command name. -1997-08-09 Barry A. Warsaw +1997-08-09 Barry A. Warsaw * progmodes/cc-engine.el (c-beginning-of-statement-1): When checking for bare semi, don't match @@ -12438,7 +12438,7 @@ c-hanging-comment-starter-p to nil to preserve Javadoc starter lines. * progmodes/cc-styles.el (c-set-style-2): - Fixed broken implementation of inherited styles. + Fix broken implementation of inherited styles. * progmodes/cc-styles.el (c-set-style): Call c-initialize-builtin-style. @@ -12639,12 +12639,12 @@ 1997-08-04 Espen Skoglund * pascal.el (pascal-mode-syntax-table): _ is now a symbol constituent. - (pascal-indent-case): Removed unnecessary calls to marker-position. + (pascal-indent-case): Remove unnecessary calls to marker-position. (pascal-indent-declaration): Editing a parameterlist at the end of a buffer does not hang. Removed unnecessary call to marker-position. - (pascal-get-lineup-indent): Removed unused variable. + (pascal-get-lineup-indent): Remove unused variable. Indent parameterlist correctly. - (pascal-completion-response): Removed unused variable. + (pascal-completion-response): Remove unused variable. 1997-08-04 Andreas Schwab @@ -12653,16 +12653,16 @@ * isearch.el (isearch-quote-char): Fix handling of control characters, copied from quoted-insert. - * emacs-lisp/pp.el (pp-to-string): Use - emacs-lisp-mode-syntax-table. + * emacs-lisp/pp.el (pp-to-string): + Use emacs-lisp-mode-syntax-table. * international/quail.el (quail-update-leim-list-file): Go to the beginning of the package file, in case it was already visited. 1997-08-04 Kenichi Handa - * language/english.el (setup-english-environment): Call - set-default-coding-systems. + * language/english.el (setup-english-environment): + Call set-default-coding-systems. * language/china-util.el (setup-chinese-gb-environment): Do not call set-terminal-coding-system and set-keyboard-coding-system, @@ -12676,8 +12676,8 @@ * language/korean.el (setup-korean-environment): Likewise. - * international/mule-cmds.el (set-default-coding-systems): New - function. + * international/mule-cmds.el (set-default-coding-systems): + New function. * international/mule.el (default-terminal-coding-system): New var. (set-terminal-coding-system): @@ -12772,20 +12772,20 @@ * term/x-win.el: Fix previous change. - * international/quail.el (quail-next-translation): Call - quail-execute-non-quail-command when no current translations. + * international/quail.el (quail-next-translation): + Call quail-execute-non-quail-command when no current translations. (quail-prev-translation): Likewise. (quail-next-translation-block): Likewise. (quail-prev-translation-block): Likewise. - * language/china-util.el (setup-chinese-gb-environment): Set - default value of default-input-method. + * language/china-util.el (setup-chinese-gb-environment): + Set default value of default-input-method. (setup-chinese-big5-environment): Likewise. (setup-chinese-cns-environment): Likewise. Correct input method name. - * language/ethio-util.el (setup-ethiopic-environment): Bind - correct commands in global-map, rmail-mode-map, and mail-mode-map. + * language/ethio-util.el (setup-ethiopic-environment): + Bind correct commands in global-map, rmail-mode-map, and mail-mode-map. * language/ethiopic.el (ccl-encode-ethio-font): Fix typo in doc-string. Set default value of default-input-method. @@ -12872,23 +12872,23 @@ * international/fontset.el (fontset-name-p): New function. (uninstanciated-fontset-alist): New variable. - (create-fontset-from-fontset-spec): Delete arg STYLE. Register - style-variants of FONTSET in uninstanciated-fontset-alist. - (create-fontset-from-x-resource): Call - create-fontset-from-fontset-spec correctly. + (create-fontset-from-fontset-spec): Delete arg STYLE. + Register style-variants of FONTSET in uninstanciated-fontset-alist. + (create-fontset-from-x-resource): + Call create-fontset-from-fontset-spec correctly. * international/mule-util.el (reference-point-alist): Doc-string modified. - * term/x-win.el: Do not create style-variants of fontset. They - are just registered in uninstanciated-fontset-alist. + * term/x-win.el: Do not create style-variants of fontset. + They are just registered in uninstanciated-fontset-alist. 1997-07-31 Michael Kifer - * ediff*.el (ediff-eval-in-buffer): Changed macro and renamed + * ediff*.el (ediff-eval-in-buffer): Change macro and renamed ediff-with-current-buffer. Eliminated inefficient calls to `intern'. - * ediff-diff.el (ediff-exec-process): Changed to work with buffers + * ediff-diff.el (ediff-exec-process): Change to work with buffers whose names have spaces. (ediff-wordify): Use buffer-substring-no-properties. @@ -13070,8 +13070,8 @@ 1997-07-25 Ken'ichi Handa - * international/quail.el (quail-update-leim-list-file): Call - find-file-noselect with t for arguments NOWARN and RAWFILE. + * international/quail.el (quail-update-leim-list-file): + Call find-file-noselect with t for arguments NOWARN and RAWFILE. * international/mule-cmds.el (leim-list-entry-regexp): Make this match only at beginning of line. @@ -13120,8 +13120,8 @@ * language/tibet-util.el (setup-tibetan-environment): Correct coding system names. Set default-input-method to "tibetan-wylie". - * language/viet-util.el (setup-vietnamese-environment): Add - autoload cookie. + * language/viet-util.el (setup-vietnamese-environment): + Add autoload cookie. 1997-07-25 Richard Stallman @@ -13143,7 +13143,7 @@ 1997-07-24 Michael Kifer * viper.el (viper-non-vi-major-modes): New variable. - (vip-set-hooks): Changed so it'll update viper-non-vi-major-modes. + (vip-set-hooks): Change so it'll update viper-non-vi-major-modes. (viper-mode): Now checks viper-non-vi-major-modes. 1997-07-24 Richard Stallman @@ -13168,11 +13168,11 @@ * cus-face.el (custom-declare-face): Use [set-]face-documentation. - * faces.el (face-documentation): Renamed from face-doc-string. - (set-face-documentation): Renamed from set-face-doc-string. + * faces.el (face-documentation): Rename from face-doc-string. + (set-face-documentation): Rename from set-face-doc-string. (face-doc-string): Make this an alias. - * term/bg-mouse.el (bg-yank-or-pop): Changed eql to eq. + * term/bg-mouse.el (bg-yank-or-pop): Change eql to eq. * international/mule-cmds.el (read-input-method-name): Fix error msg. @@ -13342,8 +13342,8 @@ Use undecided-dos for dos-text file names. Use undecided for non-existing untranslated file names. - * international/mule.el (modify-coding-system-alist): Added. - international/mule-util.el (modify-coding-system-alist): Removed. + * international/mule.el (modify-coding-system-alist): Add. + international/mule-util.el (modify-coding-system-alist): Remove. * loadup.el [windows-nt, ms-dos]: Undo loading of international/mule-utils. @@ -13407,7 +13407,7 @@ (occur-mode-find-occurrence): Use `occur' text property to find marker for locus of the occurrence. (occur-next, occur-prev): New commands. - (occur): Fixed bug preventing line number being displayed if line + (occur): Fix bug preventing line number being displayed if line number is less than the number of lines of context. 1997-07-18 Andre Spiegel @@ -13467,7 +13467,7 @@ * paren.el (show-paren-match-face): Use gray on all non-color screens. -1997-07-17 Barry A. Warsaw +1997-07-17 Barry A. Warsaw * progmodes/cc-mode.el (c-initialize-cc-mode): New function. (c-mode, c++-mode, objc-mode, java-mode): Call it. @@ -13480,7 +13480,7 @@ * progmodes/cc-langs.el: Require 'cc-defs for the definition of c-emacs-features. - * progmodes/cc-langs.el (c-mode-menu): Added uncomment region and + * progmodes/cc-langs.el (c-mode-menu): Add uncomment region and slight rearrangement of items. * progmodes/cc-cmds.el: Require cc-defs for the c-add-syntax macro. @@ -13493,8 +13493,8 @@ * progmodes/cc-engine.el (c-maybe-labelp): Add defvar. - * progmodes/cc-styles.el (c-initialize-builtin-style): Use - copy-sequence instead of c-copy-tree. + * progmodes/cc-styles.el (c-initialize-builtin-style): + Use copy-sequence instead of c-copy-tree. * progmodes/cc-defs.el (c-load-all): Function deleted. @@ -13564,17 +13564,17 @@ * international/quail.el (quail-translate-key): Fix previous change. - * international/mule.el (make-coding-system): Distinguish - coding-category-iso-7-else and coding-category-iso-8-else. + * international/mule.el (make-coding-system): + Distinguish coding-category-iso-7-else and coding-category-iso-8-else. - * international/mule-conf.el (coding-category-emacs-mule): Replace - coding-category-iso-else with coding-category-iso-7-else and + * international/mule-conf.el (coding-category-emacs-mule): + Replace coding-category-iso-else with coding-category-iso-7-else and coding-category-iso-8-else. - * international/mule-diag.el (describe-current-coding-system): Use - coding-category-iso-7-else instead of coding-category-iso-else. + * international/mule-diag.el (describe-current-coding-system): + Use coding-category-iso-7-else instead of coding-category-iso-else. - * language/china-util.el (setup-chinese-gb-environment): Adjusted + * language/china-util.el (setup-chinese-gb-environment): Adjust for the change of coding category names. Set default-input-method to chinese-py-punct. (setup-chinese-big5-environment): Set default-input-method to @@ -13582,18 +13582,18 @@ (setup-chinese-cns-environment): Set default-input-method correctly. - * language/english.el (setup-english-environment): Adjusted for + * language/english.el (setup-english-environment): Adjust for the change of coding category names. - * language/japan-util.el (setup-japanese-environment): Adjusted + * language/japan-util.el (setup-japanese-environment): Adjust for the change of coding category names. Set default-input-method correctly. - * language/ethio-util.el (setup-ethiopic-environment): Set - default-input-method correctly. + * language/ethio-util.el (setup-ethiopic-environment): + Set default-input-method correctly. - * language/korean.el (setup-korean-environment): Set - default-input-method correctly. + * language/korean.el (setup-korean-environment): + Set default-input-method correctly. * language/tibet-util.el (setup-tibetan-environment: Set default-input-method correctly. @@ -13656,8 +13656,8 @@ for iswitchb-kill-buffer and iswitchb-find-file. (iswitchb): When no text typed in, show all buffers. (iswitchb-complete): Use equal rather than eq. - (iswitchb-next-match, iswitchb-prev-match): Use - iswitchb-chop to handle reordering the buffer list. + (iswitchb-next-match, iswitchb-prev-match): + Use iswitchb-chop to handle reordering the buffer list. (iswitchb-chop): New function. (iswitchb-make-buflist): Rewritten for efficiency. (iswitchb-to-end): Operate on a list of buffers, not just one. @@ -13727,8 +13727,8 @@ 1997-07-10 Kenichi Handa - * international/fontset.el (create-fontset-from-fontset-spec): Add - optional arg NOERROR. + * international/fontset.el (create-fontset-from-fontset-spec): + Add optional arg NOERROR. (create-fontset-from-x-resource): Give t as arg NOERROR to create-fontset-from-fontset-spec. @@ -13742,11 +13742,11 @@ (isearch-input-method-title): New variable. (isearch-toggle-specified-input-method): Set the above variables. (isearch-toggle-input-method): Likewise. - (isearch-process-search-multibyte-characters): Give - isearch-input-method as arg to read-multilingual-string. + (isearch-process-search-multibyte-characters): + Give isearch-input-method as arg to read-multilingual-string. - * international/mule-cmds.el (read-multilingual-string): Adjusted - for the previous change of variables related to input methods. + * international/mule-cmds.el (read-multilingual-string): + Adjust for the previous change of variables related to input methods. * isearch.el (isearch-message-prefix): Likewise. @@ -13806,7 +13806,7 @@ * progmodes/cc-*.el: New files, totally reorganized. * dunnet.el: Undo an earlier change: - (dun-piss): Renamed from dunnet-urinate. + (dun-piss): Rename from dunnet-urinate. (dun-verblist): Indecent word added back. (dunnet): Delete "censored" message. @@ -13913,7 +13913,7 @@ * browse-url.el: Require thingatpt when compiling. (browse-url-url-at-point): Use `thing-at-point' (with URL code moved from here). - (browse-url-looking-at): Moved to thingatpt.el, renamed and changed. + (browse-url-looking-at): Move to thingatpt.el, renamed and changed. * thingatpt.el (thing-at-point): Use `thing-at-point' property, if any. (bounds-of-thing-at-point): Use `bounds-of-thing-at-point' property. @@ -13952,11 +13952,11 @@ (widget-default-delete): Ditto. * wid-edit.el (color): Make it an editable field. - (widget-color-value-create): Deleted. - (widget-color-value-get): Deleted. - (widget-color-value-set): Deleted. - (color-item): Deleted. - (widget-color-item-button-face-get): Renamed to + (widget-color-value-create): Delete. + (widget-color-value-get): Delete. + (widget-color-value-set): Delete. + (color-item): Delete. + (widget-color-item-button-face-get): Rename to `widget-color-sample-face-get'. (color-sample): Delete. (editable-color): Delete. @@ -14066,15 +14066,15 @@ (custom-browse-visibility-action, custom-browse-group-tag) (custom-browse-group-tag-action, custom-browse-variable-tag-action) (custom-browse-face-tag, custom-browse-face-tag-action) - (custom-browse-face-tag-action, custom-browse-alist): Changed - prefix from `custom-tree' to `custom-browse'. + (custom-browse-face-tag-action, custom-browse-alist): + Change prefix from `custom-tree' to `custom-browse'. (custom-variable-value-create, custom-face-value-create) - (custom-group-value-create): Updated caller. + (custom-group-value-create): Update caller. * cus-edit.el (custom-browse-only-groups): New option. (custom-group-value-create): Use it. Omit non-groups if non-nil. - * cus-edit.el (custom-help-menu): Renamed "Variable" to "Option". + * cus-edit.el (custom-help-menu): Rename "Variable" to "Option". Remove "..." from non-prompting entries. * wid-edit.el (widget-single-line-field-face): New face. @@ -14096,7 +14096,7 @@ * language/european.el (setup-8-bit-environment): New argument LANGUAGE. - (setup-latin1-environment): Adjusted for the above change. + (setup-latin1-environment): Adjust for the above change. (setup-latin2-environment): Likewise. (setup-latin3-environment): Likewise. (setup-latin4-environment): Likewise. @@ -14106,8 +14106,8 @@ * language/hebrew.el (setup-hebrew-environment): Likewise. - * language/cyril-util.el (setup-cyrillic-environment): Adjusted - for the change of an input method name. + * language/cyril-util.el (setup-cyrillic-environment): + Adjust for the change of an input method name. * language/devan-util.el (setup-devanagari-environment): Likewise. @@ -14155,25 +14155,25 @@ (quail-defrule): Doc-string modified. (quail-defrule-internal): Document it. (quail-get-translation): Change the format of DEF part. - (quail-lookup-key): Make the second argument LEN optional. Reset - quail-current-translations to nil. + (quail-lookup-key): Make the second argument LEN optional. + Reset quail-current-translations to nil. (quail-map-definition): New function. (quail-get-current-str): New function. (quail-guidance-translations-starting-column): New variable. (quail-update-current-translations): New function. - (quail-translate-key): Adjusted for the change of DEF format. + (quail-translate-key): Adjust for the change of DEF format. Call quail-update-current-translations. (quail-next-translation): Call quail-update-current-translations. (quail-prev-translation): Likewise. (quail-next-translation-block): Likewise. (quail-prev-translation-block): Likewise. - (quail-select-translation): Deleted. + (quail-select-translation): Delete. (quail-make-guidance-frame): New function. (quail-show-guidance-buf): Handle the case that minibuffer is in a separate frame. (quail-hide-guidance-buf): Likewise. - (quail-show-translations): Call - quail-update-current-translations. Check width of a frame to be + (quail-show-translations): + Call quail-update-current-translations. Check width of a frame to be used. (quail-completion): Do not supply LEN argument to quail-lookup-key. @@ -14186,8 +14186,8 @@ (charset-chars, charset-width, charset-direction) (charset-iso-final-char, charset-iso-graphic-plane) (charset-reverse-charset, charset-short-name, charset-long-name) - (charset-description, charset-plit, set-charset-plist): Document - them. + (charset-description, charset-plit, set-charset-plist): + Document them. (make-char, charset-list): Doc-string modified. (find-new-buffer-file-coding-system): Fix bug of handling the coding system undecided. @@ -14296,16 +14296,16 @@ (updates): Reject subdirs whose names start with =. (custom-deps, finder-data, autoloads, update-subdirs): Likewise. - * scroll-bar.el (toggle-scroll-bar): Moved from frame.el. + * scroll-bar.el (toggle-scroll-bar): Move from frame.el. Use scroll-bar-mode to determine which side; if it's nil, use left. (set-scroll-bar-mode): New subroutine, taken from scroll-bar-mode. (scroll-bar-mode): Use the variable set-scroll-bar-mode. (scroll-bar-mode): New variable. Extra defvar to avoid warning. - (toggle-horizontal-scroll-bar): Moved from frame.el. + (toggle-horizontal-scroll-bar): Move from frame.el. * frame.el (scroll-bar-side): Variable deleted. (toggle-scroll-bar, toggle-horizontal-scroll-bar): - Moved to scroll-bar.el. + Move to scroll-bar.el. * files.el (file-chase-links): When handling .., make newname absolute. Simplify several places. @@ -14399,7 +14399,7 @@ * wid-edit.el (widget-button-click): Steal up event if key is not bound in `widget-global-map'. - * cus-edit.el (custom-tree-insert-prefix): Renamed from + * cus-edit.el (custom-tree-insert-prefix): Rename from `custom-tree-insert'. (custom-group-value-create): Use it. @@ -14482,7 +14482,7 @@ (custom-button-face): New defface. (custom widget-type): Use custom-button-face for buttons. (custom-group-tag-faces): Initial value is nil. - (custom-variable-tag-face): Renamed from custom-variable-sample-face. + (custom-variable-tag-face): Rename from custom-variable-sample-face. Initialize it like custom-group-tag-face. (custom-group-tag-faces): Initialize to nil. (custom-state-face): New defface. @@ -14497,21 +14497,21 @@ only if the item is modified. Take widget as arg. (custom-mode): Use widget-edit-functions. - * wid-edit.el (widget-edit-functions): Renamed from widget-edit-hook. + * wid-edit.el (widget-edit-functions): Rename from widget-edit-hook. (widget-field-action): Pass the widget as an arg when running hook. - * cus-edit.el (Custom-set): Renamed from custom-set. - (Custom-save): Renamed from custom-save. + * cus-edit.el (Custom-set): Rename from custom-set. + (Custom-save): Rename from custom-save. (custom-browse-sort-predicate): Defalias deleted. (custom-group-value-create): Don't sort, in tree mode. - (Custom-mode-menu): Renamed from custom-mode-menu. - (Custom-reset-current): Renamed from custom-reset-current. - (Custom-reset-saved): Renamed from custom-reset-saved. - (Custom-reset-standard): Renamed from custom-reset-standard. - (Custom-menu-update): Renamed from custom-menu-update. - (customize-set-value): Renamed from custom-set-value. - (customize-set-variable): Renamed from custom-set-variable. - (customize-save-customized): Renamed from custom-save-customized. + (Custom-mode-menu): Rename from custom-mode-menu. + (Custom-reset-current): Rename from custom-reset-current. + (Custom-reset-saved): Rename from custom-reset-saved. + (Custom-reset-standard): Rename from custom-reset-standard. + (Custom-menu-update): Rename from custom-menu-update. + (customize-set-value): Rename from custom-set-value. + (customize-set-variable): Rename from custom-set-variable. + (customize-save-customized): Rename from custom-save-customized. * cus-start.el (double-click-time): Use restricted-sexp. (load-path): Make [Current dir?] itself the active button. @@ -14548,7 +14548,7 @@ instead of displaying an echo area message. (widget-toggle-action): Likewise. (group-visibility, widget-group-visibility-create): - Moved to cus-edit.el and renamed. + Move to cus-edit.el and renamed. 1997-06-23 Dan Nicolaescu @@ -14623,7 +14623,7 @@ 1997-06-22 Richard Stallman * decipher.el (decipher-copy-cons): - Renamed from decipher-get-undo-copy. Calls changed. + Rename from decipher-get-undo-copy. Calls changed. * emacs-lisp/lmenu.el (popup-menu): Redefine as macro. (popup-menu-popup, popup-menu-internal): New function. @@ -14747,11 +14747,11 @@ (custom-variable-value-create): Use it. (custom-face-value-create): Use it. (custom-group-value-create): Use it. - (custom-buffer-groups-last): Changed default. + (custom-buffer-groups-last): Change default. - * wid-edit.el (group-visibility): Deleted. + * wid-edit.el (group-visibility): Delete. (widget-group-visibility-create): Ditto. - (group-link): Deleted. + (group-link): Delete. (widget-group-link-create): Ditto. (widget-group-link-action): Ditto. @@ -14761,12 +14761,12 @@ (custom-group-link-action): New function. (custom-group-value-create): Use `custom-group-link'. - * wid-edit.el (widget-before-change): Fixed comment and debug string. + * wid-edit.el (widget-before-change): Fix comment and debug string. - * cus-edit.el (custom-mode-customize-menu): Deleted. + * cus-edit.el (custom-mode-customize-menu): Delete. (custom-mode-menu): Define here. (custom-mode): Don't add here. - (custom-format-handler): Deleted. + (custom-format-handler): Delete. (custom): Don't add here. * cus-edit.el (custom-browse-sort-predicate): New alias. @@ -14776,7 +14776,7 @@ (custom-group): Ditto. (custom-group-value-create): Ditto. - * cus-edit.el (face): Fixed format. + * cus-edit.el (face): Fix format. (custom-face-value-create): Browse face, not option. * cus-edit.el (custom-group-value-create): Rewrote to replace @@ -14787,8 +14787,8 @@ (custom-variable): Ditto. (custom-face): Delete :format and :format-handler. (custom): Add :format. - (custom-format-handler): Removed unnecessary code. - (custom-face-format-handler): Deleted. + (custom-format-handler): Remove unnecessary code. + (custom-face-format-handler): Delete. (custom-add-see-also): New function. (custom-buffer-style): New option. (widget-face-value-create): Use it here instead of :format. @@ -14817,13 +14817,13 @@ (custom-menu-sort-predicate): Use them. (custom-menu-create): Use it. (custom-buffer-sort-predicate, custom-buffer-order-predicate) - (custom-menu-sort-predicate, custom-menu-order-predicate): Deleted. + (custom-menu-sort-predicate, custom-menu-order-predicate): Delete. * wid-edit.el (widget-leave-text): Don't delete nil overlays. * wid-edit.el (widget-get-indirect): New function. (widget-default-create): Use it. - (widget-button-insert-indirect): Deleted. + (widget-button-insert-indirect): Delete. * wid-edit.el (widget-inactive-face): Use dim gray instead of dark gray. @@ -15004,9 +15004,9 @@ 1997-06-18 Ken'ichi Handa - * mule-util.el (coding-system-parent): Moved to mule.el. + * mule-util.el (coding-system-parent): Move to mule.el. - * mule.el (coding-system-parent): Moved from mule-util.el. + * mule.el (coding-system-parent): Move from mule-util.el. 1997-06-18 Kenichi Handa @@ -15015,7 +15015,7 @@ * subdirs.el: Add "language" in the argument of normal-top-level-add-to-load-path. - * rmail.el (rmail-enable-decoding-message): Deleted. + * rmail.el (rmail-enable-decoding-message): Delete. (rmail-revert): Bind enable-multibyte-characters to nil before calling rmail-convert-file. (rmail-convert-to-babyl-format): If enable-multibyte-characters is @@ -15049,7 +15049,7 @@ (coding-system-list): Sort coding systems by coding-system-lessp. An element of returned list is always coding system, never be a cons. - (modify-coding-system-alist): Renamed from + (modify-coding-system-alist): Rename from set-coding-system-alist. (prefer-coding-system): New function. (compose-chars-component): But fix for handling a composite @@ -15076,8 +15076,8 @@ not a valid KEY argument now. (leim-list-file-name, leim-list-header, leim-list-entry-regexp): New variables. - (update-leim-list-file, update-all-leim-list-files): New - functions. + (update-leim-list-file, update-all-leim-list-files): + New functions. (current-input-method): Doc-string modified because the value is now input method name. (default-input-method, previous-input-method): Likewise. @@ -15086,12 +15086,12 @@ (input-method-alist): New variable. (register-input-method): Register input method in input-method-alist. - (read-language-and-input-method-name): Deleted. + (read-language-and-input-method-name): Delete. (read-input-method-name): New function. (activate-input-method, select-input-method, toggle-input-method): - Modified for the above change. + Modify for the above change. (read-multilingual-string): Likewise. - (describe-current-input-method): Renamed from + (describe-current-input-method): Rename from describe-input-method. (describe-input-method): New function. (describe-language-environment): Don't put a vacant line at the @@ -15121,7 +15121,7 @@ * language/cyril-util.el (setup-cyrillic-iso-environment) (setup-cyrillic-koi8-environment) - (setup-cyrillic-alternativnyj-environment): Deleted. + (setup-cyrillic-alternativnyj-environment): Delete. (setup-cyrillic-environment): New function. * language/cyrillic.el: Don't make the keymap @@ -15171,12 +15171,12 @@ * tar-mode.el (tar-extract): Use second argument of view-buffer instead of setting view-exit-action. - * files.el (view-read-only): New option variable. If - non-nil then buffers visiting files read-only, do it in view mode. + * files.el (view-read-only): New option variable. + If non-nil then buffers visiting files read-only, do it in view mode. (find-file-read-only, find-file-read-only-other-window) (find-file-read-only-other-frame): Call toggle-read-only instead of setting buffer-read-only explicitly. - (toggle-read-only, after-find-file): Changed to be aware + (toggle-read-only, after-find-file): Change to be aware of view-read-only. (save-some-buffers): Use second argument of view-buffer instead of setting view-exit-action. @@ -15191,7 +15191,7 @@ * icon.el (icon-indent-line): A comment ends at the end of the line, delete call to nonexistent function. - * icon.el (icon-font-lock-keywords-1): Improved regexp. + * icon.el (icon-font-lock-keywords-1): Improve regexp. (icon-font-lock-keywords-2): Likewise. 1997-06-16 Richard Stallman @@ -15210,15 +15210,15 @@ 1997-06-16 Simon Marshall - * icon.el (icon-imenu-generic-expression): Improved regexp. - (icon-font-lock-keywords-1): Improved regexps. + * icon.el (icon-imenu-generic-expression): Improve regexp. + (icon-font-lock-keywords-1): Improve regexps. (icon-font-lock-keywords-2): Likewise. (icon-mode): Don't set font-lock-comment-start-regexp via font-lock-defaults; it is not needed anymore. 1996-06-16 Dan Nicolaescu - * icon.el (icon-imenu-generic-expression): Improved regexp. + * icon.el (icon-imenu-generic-expression): Improve regexp. (icon-mode): Don't use pushnew. 1997-06-16 Michelangelo Grigni @@ -15226,9 +15226,9 @@ * ffap.el (ffap-soft-value): Make this a function again; the macro version does intern-soft too early. Deleted XEmacs-specific code. - (ffap-string-at-point-mode-alist): Added "=" and + (ffap-string-at-point-mode-alist): Add "=" and "&" to the url syntax, as suggested by SJE. - (ffap-read-file-or-url): Fixed the HIST argument to + (ffap-read-file-or-url): Fix the HIST argument to completing-read (only visible in XEmacs?), as reported by Christoph Wedler . (ffap-kpathsea-expand-path): New func, replaces ffap-add-subdirs, @@ -15237,7 +15237,7 @@ Added mouse-track support (but no binding), as suggested by MDB. Moved Emacs mouse bindings from "down-mouse" events to ordinary mouse events. - (ffap-alist): Added ffap-fortran-mode, as requested by MDB. + (ffap-alist): Add ffap-fortran-mode, as requested by MDB. Rewrote and merged XEmacs support, eliminating file ffap-xe.el. Modified ffap-other-frame to work in dedicated frames, fixing a bug reported by JENS. @@ -15247,20 +15247,20 @@ (ffap-read-file-or-url): For XEmacs, give extra HACK-HOMEDIR arg to `abbreviate-file-name'. (ffap-file-at-point): Suppress errors from `ffap-alist'. - (ffap-url-at-point): Modified regexp to accept + (ffap-url-at-point): Modify regexp to accept mail hostnames ending with a digit. Fixes bug report of SJE. (ffap-url-at-point): Use higher level function (w3-view-this-url t) suggested by wmperry, instead of w3-zone-at/w3-zone-data or widget-at/widget-get. - (ffap-url-at-point): Modified to work with + (ffap-url-at-point): Modify to work with w3-version "WWW 2.3.64 1996/06/02 06:20:23" alpha, which uses the 'widget package rather than the old w3-zone-at. Bug was reported by JENS. Adapted comments and doc strings to Emacs coding conventions. Reorganized. Retired v18 support. (ffap-bindings): Offers a default installation. - (ffap-string-at-point): Modified arguments. - (ffap-gnus-hook): Updated for Gnus 5. + (ffap-string-at-point): Modify arguments. + (ffap-gnus-hook): Update for Gnus 5. (ffap-tex-init): Delayed initialization of `ffap-tex-path'. (ffap-dired): New entry in `ffap-alist'. (ffap-menu-rescan): May fontify the choices in buffer. @@ -15309,7 +15309,7 @@ * cus-edit.el (widget-glyph-insert-glyph): Make the invisible extent open ended. - * cus-edit.el (custom-format-handler): Added :echo-help to + * cus-edit.el (custom-format-handler): Add :echo-help to visibility widget. (custom-variable-value-create): Ditto, also for tag. * wid-edit.el (widget-documentation-string-value-create): Ditto. @@ -15325,7 +15325,7 @@ * wid-edit.el (widget-tabable-at): New function. (widget-move): Use it. - * wid-edit.el (widget-after-change): Reimplemented :secret. + * wid-edit.el (widget-after-change): Reimplement :secret. * wid-edit.el (widget-field-add-space): New option. (widget-specify-field): Use it. @@ -15378,7 +15378,7 @@ view-mode-enter or view-mode-exit. (view-buffer, view-buffer-other-window): New argument exit-action. (view-file, view-file-other-window, view-buffer-other-window) - (view-buffer, view-mode-enter): Changed method used to restore + (view-buffer, view-mode-enter): Change method used to restore windows when leaving view mode. (view-mode-exit): New function. (view-return-to-alist): New variable. @@ -15468,7 +15468,7 @@ (widget-documentation-string-value-create): Also use documentation properties on single line documentation strings. - * wid-browse.el (widget-minor-mode): Fixed mistake in + * wid-browse.el (widget-minor-mode): Fix mistake in widget-minor-mode - it had semantics of non-interactive calling reversed. @@ -15482,7 +15482,7 @@ * add-log.el (add-log-time-format): New variable. (add-log-iso8601-time-string): New function. (add-change-log-entry): Use add-log-time-format. - (add-log-iso8601-time-zone): Renamed from iso8601-time-zone. + (add-log-iso8601-time-zone): Rename from iso8601-time-zone. 1997-06-13 Dan Nicolaescu @@ -15490,7 +15490,7 @@ (isearch-close-unecessary-overlays): New function. (isearch-range-invisible): Use them. - * isearch.el (search-invisible): Changed the semantics, + * isearch.el (search-invisible): Change the semantics, the default value and updated the doc string. (isearch-opened-overlays): New variable. (isearch-mode): Initialize it. @@ -15504,7 +15504,7 @@ opened, open them, add them to isearch-opened-overlays and say that the range is visible. - * hideshow.el (hideshow): Added a :prefix. + * hideshow.el (hideshow): Add a :prefix. (hs-isearch-open): New variable. (hs-flag-region): Use that variable. Changed the semantics of the FLAG parameter and updated the docs. @@ -15551,7 +15551,7 @@ Fix error messages. * text-mode.el (paragraph-indent-text-mode): - Renamed from spaced-text-mode. + Rename from spaced-text-mode. (text-mode-map): Bind TAB to indent-relative. (indented-text-mode-map): Variable deleted. (indented-text-mode): Now an alias for text-mode. @@ -15569,7 +15569,7 @@ * bibtex.el (bibtex-delete-whitespace, bibtex-current-line) (bibtex-assoc-of-regexp, bibtex-skip-to-valid-entry) (bibtex-map-entries): - Renamed from delete-whitespace, current-line, assoc-of-regexp, + Rename from delete-whitespace, current-line, assoc-of-regexp, skip-to-valid-bibtex-entry, and map-bibtex-entries, respectively. 1997-06-11 Richard Stallman @@ -15585,14 +15585,14 @@ (reftex-label-alist-builtin): New default environment subfigure. (reftex-find-duplicate-labels): Temporary buffer is now "*Duplicate Labels*" instead of "*Help*". - (reftex-bibtex-selection-callback): Renamed variable found-list. - (reftex-found-list): Added defvar for this variable. - (TeX-master): Added defvar for this variable. + (reftex-bibtex-selection-callback): Rename variable found-list. + (reftex-found-list): Add defvar for this variable. + (TeX-master): Add defvar for this variable. (reftex-reset-mode): Kill temporary buffers associated with RefTeX. 1997-06-10 Ken'ichi Handa - * mule-cmds.el (view-hello-file): Adjusted for the changes of + * mule-cmds.el (view-hello-file): Adjust for the changes of coding system names. 1997-06-10 Terrence Brannon @@ -15637,14 +15637,14 @@ 1997-06-10 Stefan Schoef - * bibtex.el (bibtex-mode-map): Changed the binding of the C-TAB + * bibtex.el (bibtex-mode-map): Change the binding of the C-TAB key, such that XEmacs will understand it, too. * bibtex.el (bibtex-format-entry, bibtex-end-of-entry): Give specific error message if not on valid BibTeX entry. - * bibtex.el (bibtex-field-string-quoted): Small bug fix. Allow - backslash followed by newline. + * bibtex.el (bibtex-field-string-quoted): Small bug fix. + Allow backslash followed by newline. * bibtex.el (bibtex-reposition-window, bibtex-mark-entry): Two new functions, bound to M-C-l and M-C-h, respectively. @@ -15662,7 +15662,7 @@ of ---. (bibtex-font-lock-keywords): Don't treat ALT prefixed entries as comments. - (bibtex-entry): Fixed parameter list. This function is not + (bibtex-entry): Fix parameter list. This function is not intended to be called with required and optional fields as optional arguments anymore. @@ -15679,7 +15679,7 @@ * bibtex.el (bibtex-submit-bug-report): Report all variables. * bibtex.el (bibtex-contline-indentation): New user option. - (bibtex-entry-offset): Renamed from bibtex-entry-indentation. + (bibtex-entry-offset): Rename from bibtex-entry-indentation. * bibtex.el (bibtex-entry-field-alist): Used different order for some fields (as documented in btxdoc.tex). Changed one of the @@ -15694,7 +15694,7 @@ * bibtex.el (bibtex-reference-key): Reincluded parentheses. Parentheses should be disallowed only in field constants. - * bibtex.el (bibtex-autokey-transcriptions): Fixed bug (two + * bibtex.el (bibtex-autokey-transcriptions): Fix bug (two entries for `\o' while `\oe' entry was missing). * bibtex.el (bibtex-entry-indentation): New variable to determine @@ -15702,7 +15702,7 @@ (bibtex-move-outside-of-entry): Use `skip-chars-forward' instead of `re-search-forward'. (bibtex-beginning-of-first-entry, bibtex-beginning-of-last-entry): - Renamed from beginning-of-first-bibtex-entry and + Rename from beginning-of-first-bibtex-entry and beginning-of-last-bibtex-entry. Go to beginning of line, return point. (bibtex-do-auto-fill, bibtex-make-field, bibtex-entry) (bibtex-String, bibtex-Preamble): Respect `bibtex-entry-indentation'. @@ -15714,8 +15714,8 @@ (bibtex-clean-entry): Use `bibtex-reference-maybe-empty-head' instead of a fixed string. - * bibtex.el (bibtex-beginning-of-entry, bibtex-end-of-entry): Now - return point if called from a program. + * bibtex.el (bibtex-beginning-of-entry, bibtex-end-of-entry): + Now return point if called from a program. (bibtex-enclosing-field, bibtex-format-entry) (bibtex-generate-autokey, bibtex-parse-keys, bibtex-mode) (bibtex-ispell-entry, bibtex-narrow-to-entry, bibtex-sort-buffer) @@ -15740,12 +15740,12 @@ * bibtex.el (bibtex-entry-delimiters): New variable to determine if entries shall be delimited by braces or parentheses. - (bibtex-entry-left-delimiter, bibtex-entry-right-delimiter): New - helper functions. - (bibtex-entry, bibtex-String, bibtex-Preamble): Respect - `bibtex-entry-delimiters'. + (bibtex-entry-left-delimiter, bibtex-entry-right-delimiter): + New helper functions. + (bibtex-entry, bibtex-String, bibtex-Preamble): + Respect `bibtex-entry-delimiters'. (bibtex-entry-format): Doc fix. - (bibtex-reference-key, bibtex-field-const): Removed parentheses + (bibtex-reference-key, bibtex-field-const): Remove parentheses from allowed characters. (bibtex-end-of-entry): Better handling of incorrect preambles. @@ -15763,7 +15763,7 @@ (current-line): New helper function to calculate current linenumber. Something like this should really be defined somewhere else in Emacs. - (bibtex-validate): Changed to show all errors in buffer in a + (bibtex-validate): Change to show all errors in buffer in a `compilation mode' buffer. If there are syntax errors, it aborts after the syntax check, since higher-level check functions rely on the syntactical correctness of buffer. If called from another lisp @@ -15774,7 +15774,7 @@ (twice as high) than `lazy-lock-stealth-time'. (bibtex-member-of-regexp, assoc-of-regexp): Small cosmetic changes. - * bibtex.el (bibtex-buffer-last-parsed-tick): Renamed from + * bibtex.el (bibtex-buffer-last-parsed-tick): Rename from bibtex-buffer-last-parsed-for-keys-tick and made it really buffer-local (bug fix). (bibtex-parse-keys): Make it use bibtex-buffer-last-parsed-tick. @@ -15786,7 +15786,7 @@ if it has been aborted. (bibtex-mode): Run the new function bibtex-parse-buffers-stealthily. - * bibtex.el (bibtex-generate-autokey): Changed the name part + * bibtex.el (bibtex-generate-autokey): Change the name part generation (bugfix). This function handles now correctly all three forms of BibTeX names, "First von Last", "von Last, First", "von Last, Jr, First". In every case the "Last" part is correctly @@ -15794,15 +15794,15 @@ the first is used. Name fields spread over more than one line are no problem anymore. - * bibtex.el (bibtex-entry-format): Changed default value to + * bibtex.el (bibtex-entry-format): Change default value to exclude 'page-dashes. Modified documentation. (bibtex-autokey-name-change-strings) (bibtex-autokey-titleword-abbrevs) (bibtex-autokey-titleword-change-strings, bibtex-entry) (bibtex-validate): Doc fixes. (bibtex-mode-map): Bound `C-c $' to bibtex-ispell-abstract. - (bibtex-generate-autokey): Changed documentation. Small - modification in calculating title field. + (bibtex-generate-autokey): Change documentation. + Small modification in calculating title field. (bibtex-mode): Included bibtex-ispell-entry into the list of `interesting' functions. (bibtex-kill-field): Bug fix (killing of first field in entry @@ -15818,7 +15818,7 @@ * bibtex.el (bibtex-mode-map): bibtex-complete-key wasn't bound correctly. - (bibtex-complete): Fixed bug (used string entries defined in + (bibtex-complete): Fix bug (used string entries defined in buffer as object to completion). * bibtex.el (Menu): Use easymenu. More menu items for @@ -15839,16 +15839,16 @@ (bibtex-kill-field): Use new variable bibtex-field-kill-ring. (bibtex-kill-entry): Use new variable bibtex-entry-kill-ring. - * bibtex.el (bibtex-kill-ring, bibtex-kill-ring-yank-pointer): New - internal variables like kill-ring and kill-ring-yank-pointer, but + * bibtex.el (bibtex-kill-ring, bibtex-kill-ring-yank-pointer): + New internal variables like kill-ring and kill-ring-yank-pointer, but bibtex-kill-ring holds fields or complete reference entries instead of raw strings. (bibtex-kill-ring-max): New user option similar to kill-ring-max. - (bibtex-kill-field): Renamed from bibtex-delete-field again. It - now supports the new variable bibtex-kill-ring. + (bibtex-kill-field): Rename from bibtex-delete-field again. + It now supports the new variable bibtex-kill-ring. (bibtex-copy-field-as-kill, bibtex-kill-entry) - (bibtex-copy-entry-as-kill, bibtex-yank, bibtex-yank-pop): New - interactive functions, which work on the bibtex-kill-ring + (bibtex-copy-entry-as-kill, bibtex-yank, bibtex-yank-pop): + New interactive functions, which work on the bibtex-kill-ring variable. (bibtex-insert-current-kill): New helper function to insert contents of bibtex-kill-ring in an appropriate way. @@ -15871,9 +15871,9 @@ generation, if year field of current entry is absent. (bibtex-generate-autokey): Use this new variable. - * bibtex.el (bibtex-include-OPTannote): Deleted (is set in + * bibtex.el (bibtex-include-OPTannote): Delete (is set in bibtex-user-optional-fields). - (bibtex-entry, bibtex-print-help-message): Removed support for + (bibtex-entry, bibtex-print-help-message): Remove support for bibtex-include-OPTannote. * bibtex.el (bibtex-entry-format): New constant @@ -15882,25 +15882,25 @@ * bibtex.el (bibtex-mode): Set value for font-lock-mark-block-function. - * bibtex.el (bibtex-font-lock-keywords): Changed to distinguish + * bibtex.el (bibtex-font-lock-keywords): Change to distinguish optional from ordinary fields. (bibtex-format-entry, bibtex-print-help-message) (bibtex-remove-OPT-or-ALT, bibtex-pop): Used simpler regexps. - * bibtex.el (bibtex-delete-field): Changed from + * bibtex.el (bibtex-delete-field): Change from bibtex-delete-optional-or-alternative-field. Deletes now mandatory fields as well. - (bibtex-mode): Changed documentation. + (bibtex-mode): Change documentation. - * bibtex.el (bibtex-entry-type-history, bibtex-key-history): New - variables to use own histories in BibTeX buffers. + * bibtex.el (bibtex-entry-type-history, bibtex-key-history): + New variables to use own histories in BibTeX buffers. (bibtex-entry, bibtex-clean-entry, bibtex-String): Use these new variables. * bibtex.el (bibtex-entry, bibtex-make-field): A function can now be used to generate a fields init string. (bibtex-include-OPTkey, bibtex-include-OPTannote) - (bibtex-entry-field-alist): Changed documentation accordingly. + (bibtex-entry-field-alist): Change documentation accordingly. * bibtex.el (bibtex-mode): bibtex-parse-keys on start of mode is now abortable, too. @@ -15913,7 +15913,7 @@ * bibtex.el (bibtex-find-entry-location): Bug fix: Insertion into completely empty buffer didn't work. - * bibtex.el (bibtex-user-optional-fields): Renamed from + * bibtex.el (bibtex-user-optional-fields): Rename from bibtex-mode-user-optional-fields. (bibtex-submit-bug-report, bibtex-entry, bibtex-print-help-message): Use bibtex-user-optional-fields. @@ -15922,9 +15922,9 @@ delimiting braces and not those inside fields. * bibtex.el (skip-to-valid-bibtex-entry, bibtex-parse-keys) - (bibtex-end-of-entry, bibtex-validate, bibtex-reformat): Calculate - complex regexps outside of loops. - (bibtex-mode): Changed documentation on how to convert third party + (bibtex-end-of-entry, bibtex-validate, bibtex-reformat): + Calculate complex regexps outside of loops. + (bibtex-mode): Change documentation on how to convert third party buffers. * bibtex.el (bibtex-convert-alien): New function to convert a @@ -15938,7 +15938,7 @@ call of bibtex-parse-keys. This avoids unnecessary double call if Font Lock mode is chosen for buffer at startup. - * bibtex.el (bibtex-String, bibtex-Preamble): Renamed from + * bibtex.el (bibtex-String, bibtex-Preamble): Rename from bibtex-string and bibtex-preamble. (bibtex-String): If bibtex-maintain-sorted-entries and bibtex-sort-ignore-string-entries are both non-nil, read string @@ -15946,9 +15946,9 @@ location (as for normal entries). * bibtex.el (bibtex-autokey-titleword-first-ignore) - (bibtex-autokey-titleword-abbrevs): Changed documentation: case of + (bibtex-autokey-titleword-abbrevs): Change documentation: case of regexps doesn't matter anymore. - (bibtex-field-const, bibtex-reference-key): Simplified to not + (bibtex-field-const, bibtex-reference-key): Simplify to not contain uppercase letters. (member-of-regexp, assoc-of-regexp): Ignore case of regexp. (map-bibtex-entries): Call function not for every syntactical correct @@ -15969,24 +15969,24 @@ (bibtex-end-of-entry): Only report an "unknown entry" message if called interactively. - * bibtex.el (bibtex-sort-ignore-string-entries): Renamed back from + * bibtex.el (bibtex-sort-ignore-string-entries): Rename back from bibtex-sort-ignore-string-and-preamble. Of course, preambles are always ignored, since they have no key at all. (bibtex-string): Slightly less complex regexp. (skip-to-valid-bibtex-entry): New helper function to skip forward (or backward) to beginning of next syntactical correct known - BibTeX entry, if not already there. Respects - bibtex-sort-ignore-string-entries. + BibTeX entry, if not already there. + Respects bibtex-sort-ignore-string-entries. (map-bibtex-entries): Bug fix: It wasn't called for string entries even if bibtex-sort-ignore-string-entries was nil. (beginning-of-last-bibtex-entry): New helper function to go to last entry in buffer. (bibtex-end-of-entry): Bug fix: Now works with string and preamble entries as well. - (bibtex-sort-buffer): Renamed from bibtex-sort-entries. Simplified + (bibtex-sort-buffer): Rename from bibtex-sort-entries. Simplified by using new function skip-to-valid-bibtex-entry. Now only known entries are checked. - (bibtex-find-entry-location): Simplified by using new functions + (bibtex-find-entry-location): Simplify by using new functions skip-to-valid-bibtex-entry and beginning-of-last-bibtex-entry. Only known entries are used to determine location. (bibtex-validate): Now checks string entries, too. @@ -15994,8 +15994,8 @@ bibtex-end-of-entry. * bibtex.el (bibtex-end-of-entry): Don't use forward-sexp anymore, - since this fails on entries with non-escaped double-quotes. Use - search-bibtex-reference instead (though it is slower, it is more + since this fails on entries with non-escaped double-quotes. + Use search-bibtex-reference instead (though it is slower, it is more reliable). (bibtex-ispell-abstract): Use normal regexps created by bibtex-cfield instead of special ones. @@ -16007,7 +16007,7 @@ work, since due to a bug all entries were simply skipped. * bibtex.el (bibtex-mode): Doc fix. - (bibtex-delete-optional-or-alternative-field): Renamed from + (bibtex-delete-optional-or-alternative-field): Rename from bibtex-kill-optional-or-alternative-field. (bibtex-delete-optional-or-alternative-field, bibtex-empty-field): Use delete-region, not kill-region. @@ -16020,7 +16020,7 @@ buffer, died on entries with `@' in other than first column). (beginning-of-first-bibtex-entry, bibtex-format-entry) (bibtex-beginning-of-entry, bibtex-validate, bibtex-clean-entry): - Changed to allow BibTeX entries to start in a column different + Change to allow BibTeX entries to start in a column different from 1 (but still for speed reasons only whitespace is allowed prior to the `@' on the same line. @@ -16044,21 +16044,21 @@ (bibtex-find-entry-location): A bug had been introduced by using search-bibtex-reference instead of re-search-forward (fixed). - * bibtex.el (bibtex-field-delimiters): Renamed from + * bibtex.el (bibtex-field-delimiters): Rename from bibtex-field-delimiter. (bibtex-entry-format): Constant empty-opts renamed to empty-opts-or-alts. - (bibtex-remove-delimiters): Renamed from + (bibtex-remove-delimiters): Rename from bibtex-remove-double-quotes-or-braces. (bibtex-reformat): New function. * bibtex.el (bibtex-fill-entry): New function to refill entry. - (bibtex-mode-map): Defined key for bibtex-fill-entry. + (bibtex-mode-map): Define key for bibtex-fill-entry. * bibtex.el (bibtex-field-delimiter): Substitutes variables bibtex-field-left-delimiter and bibtex-field-right-delimiter. - (bibtex-field-left-delimiter, bibtex-field-right-delimiter): New - helper functions. + (bibtex-field-left-delimiter, bibtex-field-right-delimiter): + New helper functions. (bibtex-make-field, bibtex-pop): Use new variable bibtex-field-delimiter. (bibtex-empty-field, bibtex-string): Use new functions @@ -16084,23 +16084,23 @@ (bibtex-mode): Don't set fill-prefix anymore, but use new function bibtex-do-auto-fill. - * bibtex.el (bibtex-find-entry-location): Fixed bug (when + * bibtex.el (bibtex-find-entry-location): Fix bug (when bibtex-maintain-sorted-entries was non-nil, an entry with a key greater than all other keys wasn't inserted in the correct place). * bibtex.el (bibtex-mode): Don't use bibtex-auto-fill-function anymore, but use directly variable fill-prefix. - * bibtex.el (bibtex-find-entry-location): Fixed bug (on duplicate + * bibtex.el (bibtex-find-entry-location): Fix bug (on duplicate keys, point must move to beginning of entry, so that bibtex-entry works correctly). - * bibtex.el (bibtex-complete): Fixed bug (parameter string-list + * bibtex.el (bibtex-complete): Fix bug (parameter string-list was mistakenly altered by the function itself). * bibtex.el (bibtex-mode-map): Bind bibtex-complete-key to C-TAB. - * bibtex.el (bibtex-validate): Renamed from bibtex-validate-buffer + * bibtex.el (bibtex-validate): Rename from bibtex-validate-buffer since it can acts on region if active. Use search-bibtex-reference. (search-bibtex-reference): New function to be used in places where prior a re-search-{forward|backward} for bibtex-reference or @@ -16113,22 +16113,22 @@ bibtex-enclosing-reference-maybe-empty-head. (bibtex-reference-infix, bibtex-reference-postfix): New constants necessary due to splitting bibtex-reference. - (bibtex-reference): Deleted. - (bibtex-type-in-reference, skip-whitespace-and-comments): Deleted. + (bibtex-reference): Delete. + (bibtex-type-in-reference, skip-whitespace-and-comments): Delete. * bibtex.el (bibtex-mode): Don't turn auto-fill-mode on. Use new variable normal-auto-fill-function. - * bibtex.el (bibtex-field-string): Simplified. + * bibtex.el (bibtex-field-string): Simplify. - * bibtex.el (bibtex-mode-syntax-table): Changed syntax of + * bibtex.el (bibtex-mode-syntax-table): Change syntax of double-quote back to quote syntax. * bibtex.el (bibtex-complete): New generic function for interface functions bibtex-complete-string and bibtex-complete-key. (bibtex-complete-key): New function. - * bibtex.el (bibtex-sort-ignore-string-and-preamble): Renamed from + * bibtex.el (bibtex-sort-ignore-string-and-preamble): Rename from bibtex-sort-ignore-string-entries. (map-bibtex-entries): Use bibtex-sort-ignore-string-and-preamble and ignore preamble entries as well. @@ -16152,10 +16152,10 @@ mark is active. With optional argument checks if required fields are missing, too. - * bibtex.el (bibtex-mode): Added support for imenu. + * bibtex.el (bibtex-mode): Add support for imenu. * bibtex.el (bibtex-entry-field-alist) - (bibtex-mode-user-optional-fields): Modified syntax to allow + (bibtex-mode-user-optional-fields): Modify syntax to allow preinitialization of fields. (bibtex-make-field, bibtex-make-optional-field): Support preinitialization of fields. @@ -16166,21 +16166,21 @@ (bibtex-generate-autokey): Use new variables. * bibtex.el (bibtex-field-const, bibtex-reference-type) - (bibtex-reference-key): Changed to match the (according to Oren + (bibtex-reference-key): Change to match the (according to Oren Patashnik) allowed characters. - * bibtex.el (bibtex-clean-entry-zap-empty-opts-or-alts): Renamed - from bibtex-clean-entry-zap-empty-opts. + * bibtex.el (bibtex-clean-entry-zap-empty-opts-or-alts): + Rename from bibtex-clean-entry-zap-empty-opts. (bibtex-entry-field-alist): Slightly modified syntax to support alternative fields needed for Book and InBook references. (bibtex-font-lock-keywords, bibtex-print-help-message) (bibtex-make-field, bibtex-pop, bibtex-clean-entry): Support ALT prefixed entries. - (bibtex-mode): Documented new ALT prefixed fields. - (bibtex-make-optional-field): Modified to give only field name as + (bibtex-mode): Document new ALT prefixed fields. + (bibtex-make-optional-field): Modify to give only field name as arg to bibtex-make-field. (bibtex-remove-OPT-or-ALT, bibtex-kill-optional-or-alternative-field): - Renamed from bibtex-remove-OPT and bibtex-kill-optional-field, + Rename from bibtex-remove-OPT and bibtex-kill-optional-field, respectively. Modified to support ALT prefixes. * bibtex.el (bibtex-enclosing-field, bibtex-print-help-message): @@ -16220,29 +16220,29 @@ 1997-06-09 Kenichi Handa - * mule.el: Delete declaration for buffer-file-coding-system. It - is done in buffer.c now. In the comment, change coding-system to + * mule.el: Delete declaration for buffer-file-coding-system. + It is done in buffer.c now. In the comment, change coding-system to coding system. The name coding-vector is changed to coding-spec. (coding-vector-type, coding-vector-mnemonic) - (coding-vector-docstring, coding-vector-flags): Deleted. + (coding-vector-docstring, coding-vector-flags): Delete. (coding-system-spec-ref): New function. (coding-system-type, coding-system-mnemonic, coding-system-flags): Use coding-system-spec-ref. - (coding-system-doc-string): Renamed from coding-system-docstring. - (coding-system-eol-type): Renamed from coding-system-eoltype. - (coding-system-eol-type-mnemonic): Moved to mule-util.el. + (coding-system-doc-string): Rename from coding-system-docstring. + (coding-system-eol-type): Rename from coding-system-eoltype. + (coding-system-eol-type-mnemonic): Move to mule-util.el. (coding-system-post-read-conversion): Likewise. (coding-system-pre-write-conversion): Likewise. - (default-process-coding-system): Deleted. Now declared in + (default-process-coding-system): Delete. Now declared in buffer.c. (make-subsidiary-coding-system): New function. (make-coding-system): Check arguments more strictly. Do not make -unix, -dos, -mac variants for TYPE 4. (define-coding-system-alias): Call make-subsidiary-coding-system. - (set-buffer-file-coding-system): Adjusted for the function name + (set-buffer-file-coding-system): Adjust for the function name changes. (find-new-buffer-file-coding-system): Likewise. - (default-process-coding-system): Deleted. Now defined in coding.c. + (default-process-coding-system): Delete. Now defined in coding.c. * mule-conf.el: Coding system names changed. @@ -16274,7 +16274,7 @@ (print-coding-system): Likewise. (list-coding-systems): Likewise. Make it interactive. - * mule-util.el (set-coding-system-alist): Deleted. + * mule-util.el (set-coding-system-alist): Delete. (string-to-sequence): Doc string modified. (coding-system-list): Add optional arg BASE-ONLY. (coding-system-base): New function. @@ -16367,14 +16367,14 @@ 1997-06-07 Richard Stallman - * files.el (file-name-non-special): Handle - file-name-completion and file-name-all-completions. + * files.el (file-name-non-special): + Handle file-name-completion and file-name-all-completions. * mailalias.el: Customize. Doc fixes. Mark some risky local variables. * dired.el (dired-unmark-all-marks): - Renamed from dired-unmark-all-files-no-query. + Rename from dired-unmark-all-files-no-query. * language/european.el (setup-8-bit-environment): Load the file with load, not require, so that we reload it if nec. @@ -16382,28 +16382,28 @@ * language/english.el ("English"): Improve doc string. * language/indian.el (describe-indian-environment-map): - Renamed from describe-indian-support-map. + Rename from describe-indian-support-map. * language/devanagari.el: Corresponding changes. * language/european.el (describe-european-environment-map): - Renamed from describe-european-support-map. + Rename from describe-european-support-map. * language/cyrillic.el (describe-cyrillic-environment-map): - Renamed from describe-cyrillic-support-map. + Rename from describe-cyrillic-support-map. * language/chinese.el (describe-chinese-environment-map): - Renamed from describe-chinese-support-map. + Rename from describe-chinese-support-map. * mule-cmds.el (describe-language-environment): - Renamed from describe-language-support. + Rename from describe-language-support. Do the real work here; don't call describe-specified-language-support. Print the mnemonics when mentioning coding systems. Improve style of output. (describe-specified-language-environment): - Renamed from describe-specified-language-support. + Rename from describe-specified-language-support. Don't do the work here; call describe-language-environment. (describe-language-environment-map): - Renamed from describe-language-support-map. + Rename from describe-language-support-map. * language/european.el (setup-8-bit-environment): Do not set set-case-syntax-offset. @@ -16451,7 +16451,7 @@ 1997-06-04 Per Abrahamsen - * wid-edit.el (widget-kill-line): Fixed for overlays. + * wid-edit.el (widget-kill-line): Fix for overlays. * cus-edit.el (custom-buffer-create-internal): Show full documentation string in buffers with only a single item. @@ -16467,9 +16467,9 @@ (widget-field-end): Workaround for local-map at end of overlay. (widget-specify-field): Ditto. - (widget-move): Fixed but with single button buffers. + (widget-move): Fix but with single button buffers. - * cus-edit.el (custom-buffer-create-internal): Improved help + * cus-edit.el (custom-buffer-create-internal): Improve help strings for reset buttons. * wid-edit.el (widget-move): Restored support for @@ -16477,7 +16477,7 @@ (widget-documentation-string-value-create): Restore support for `widget-documentation--face'. - * cus-edit.el (customize-variable-other-window): Added defalias. + * cus-edit.el (customize-variable-other-window): Add defalias. * widget.el (:complete): New keyword. (:complete-function): New keyword. @@ -16524,7 +16524,7 @@ 1997-06-02 Richard Stallman - * text-mode.el (spaced-text-mode): Renamed from text-mode. + * text-mode.el (spaced-text-mode): Rename from text-mode. But change the mode name and hooks. (text-mode): Put the guts of indented-text-mode here. But don't define text-mode-abbrev-table, just use it. @@ -16544,14 +16544,14 @@ 1997-06-02 Michael Kifer - * ediff-util.el (ediff-toggle-multiframe): Improved. - (ediff-setup, ediff-inferior-compare-regions): Modified. + * ediff-util.el (ediff-toggle-multiframe): Improve. + (ediff-setup, ediff-inferior-compare-regions): Modify. (ediff-setup): Bug fixed. * ediff-init.el (ediff-file-attributes): Use ediff-file-remote-p. * ediff-wind.el (ediff-setup-windows-multiframe-merge) - (ediff-setup-windows-multiframe-compare): Improved window placement. + (ediff-setup-windows-multiframe-compare): Improve window placement. * ediff-diff.el (ediff-make-fine-diffs): - Fixed messages about whitespace regions. + Fix messages about whitespace regions. * ediff-wind.el, ediff-ptch.el, ediff-mult.el, ediff-merg.el: custom.el'ed. @@ -16560,11 +16560,11 @@ * viper-init.el (vip-parse-sexp-ignore-comments): New variable. * viper-cmd.el (vip-paren-match): Parsing comments is now controlled with vip-parse-sexp-ignore-comments. - * viper-cmd.el (vip-goto-col): Fixed. + * viper-cmd.el (vip-goto-col): Fix. * viper-cmd.el (vip-autoindent): Now expands abbrevs. (vip-adjust-keys-for): Unbinds vip-autoindent, if vip-auto-indent is nil. - * viper-cmd.el (vip-prefix-arg-value): Fixed computation of integer + * viper-cmd.el (vip-prefix-arg-value): Fix computation of integer prefix args. * viper-cmd.el, viper-init.el: New files. @@ -16617,14 +16617,14 @@ 1997-06-01 Dan Nicolaescu - * hideshow.el (hs-show-hidden-short-form): Updated doc string. + * hideshow.el (hs-show-hidden-short-form): Update doc string. (hs-adjust-block-beginning): Likewise. (hs-special-modes-alist): C and C++ should also use hs-c-like-adjust-block-beginning. (hs-find-block-beginning): If hs-adjust-block-beginning is t and we apply hs-adjust-block-beginning and we reach the point means that we found the block beginning. - (hs-c-like-adjust-block-beginning): Renamed from + (hs-c-like-adjust-block-beginning): Rename from java-hs-adjust-block-beginning. 1997-06-01 Simon Leinen @@ -16666,7 +16666,7 @@ getting read-only bob and eob in XEmacs. * wid-browse.el (widget-browse-at): Use `get-char-property' instead of `get-text-property'. - * widget.el (:value-from :value-to): Deleted. + * widget.el (:value-from :value-to): Delete. * widget.el (:button-overlay, :field-overlay): New keywords. * wid-edit.el (widget-default-delete): Delete overlays. (widget-field-value-delete): Delete overlay. @@ -16700,7 +16700,7 @@ 1997-06-01 Per Abrahamsen - * cus-edit.el (custom-format-handler): Changed look of group + * cus-edit.el (custom-format-handler): Change look of group indicators. * wid-edit.el (widget-kill-line): Use forward-line instead of @@ -16716,10 +16716,10 @@ * cus-edit.el (custom-variable-prompt): Handle variable-at-point returning 0. - (customize-option): Renamed from custom-variable. + (customize-option): Rename from custom-variable. (customize-variable): Add it as an alias. (customize-option-other-window): - Renamed from customize-variable-other-window. + Rename from customize-variable-other-window. (custom-load-symbol): Search for both short and absolute names of the library, when avoiding duplicate loading. @@ -16761,9 +16761,9 @@ * cus-edit.el (custom-format-handler): New %e and %- escapes. (custom-group): Use them. - * widget.el (:widget-doc): Removed keyword. - * wid-edit.el (widget-help): Removed widget. - (widget-help-action): Removed function. + * widget.el (:widget-doc): Remove keyword. + * wid-edit.el (widget-help): Remove widget. + (widget-help-action): Remove function. * widget.el (:documentation-shown): New keyword. * wid-edit.el (documentation-string): New widget. @@ -16807,7 +16807,7 @@ * mule-cmds.el (set-language-environment): Add autoload cookie. Renamed from setup-language-environment. - * startup.el (iso-8859-n-locale-regexp): Renamed from + * startup.el (iso-8859-n-locale-regexp): Rename from iso-8859-1-locale-regexp. * loadup.el: Always load faces.el. @@ -16856,8 +16856,8 @@ * icomplete.el: Integrated Emacs 19.34 and XEmacs 19.15 corrections (typos, style, command revisions, etc). - * icomplete.el: Integrated immediate keybindings display. See - `icomplete-show-key-bindings', `icomplete-get-keys', and + * icomplete.el: Integrated immediate keybindings display. + See `icomplete-show-key-bindings', `icomplete-get-keys', and `icomplete-completions'. * icomplete.el (icomplete-get-keys): Return keys bound in prior @@ -16903,7 +16903,7 @@ * cus-edit.el (custom-magic-alist): Shortened message. - * cus-edit.el (custom-help-menu): Updated names. + * cus-edit.el (custom-help-menu): Update names. * cus-edit.el: Say `invoke' instead of `activate'. * wid-edit.el: Ditto. @@ -16930,13 +16930,13 @@ (widget-glyph-insert-glyph): No tag here. (widget-push-button-value-create): But here. - * wid-edit.el (widget-field-face): Changed to dim gray. + * wid-edit.el (widget-field-face): Change to dim gray. * wid-edit.el (widget-push-button-prefix): New option. (widget-push-button-suffix): New option. (widget-button): New group. - * widget.el (:text-format): Removed. + * widget.el (:text-format): Remove. (:button-suffix): New keyword. (:button-prefix): New keyword. @@ -16957,7 +16957,7 @@ * cus-edit.el (custom-magic-alist): Use `invoke' instead of `push'. - * cus-edit.el (custom-magic-alist): Changed rogue state message. + * cus-edit.el (custom-magic-alist): Change rogue state message. * custom.el (defface): Doc fix. @@ -16967,13 +16967,13 @@ * cus-edit.el, custom.el: Renamed `factory' to `standard' everywhere. - * cus-edit.el (custom-magic-show-button): Changed default to + * cus-edit.el (custom-magic-show-button): Change default to `nil'. - (custom): Removed `:format'. - (custom-variable): Removed level button. + (custom): Remove `:format'. + (custom-variable): Remove level button. (custom-face): Ditto. - (custom-level): Deleted. - (custom-level-action): Deleted. + (custom-level): Delete. + (custom-level-action): Delete. (custom-format-handler): Update caller. (custom-group-magic-alist): Merged into `custom-magic-alist'. (custom-magic-value-create): Use merged `custom-magic-alist'. @@ -16996,8 +16996,8 @@ * icomplete.el: Integrated Emacs 19.34 and XEmacs 19.15 corrections (typos, style, command revisions, etc). - Integrated hacked up XEmacs immediate keybindings display. See - `icomplete-show-key-bindings', `icomplete-get-keys', and + Integrated hacked up XEmacs immediate keybindings display. + See `icomplete-show-key-bindings', `icomplete-get-keys', and `icomplete-completions'. Doesn't work with mainline GNU Emacs 19.34 (because the cmdloop doesn't set owindow, and the current-local-map doesn't take optional buffer arg), so feature @@ -17046,7 +17046,7 @@ SYNTACTIC-PROPERTIES. Eval font-lock-syntactic-keywords with font-lock-eval-keywords. Compile and compare all keywords. (fast-lock-get-syntactic-properties): New function. - (fast-lock-add-properties): Renamed from fast-lock-set-face-properties. + (fast-lock-add-properties): Rename from fast-lock-set-face-properties. Take new arg SYNTACTIC-PROPERTIES and add syntax-table text properties. Now fast-lock.el saves a buffer's value of font-lock-syntactic-keywords and syntax-table text properties as added by font-lock.el. @@ -17133,7 +17133,7 @@ set-current-process-coding-system. * encoded-kb.el (encoded-kbd-mode): Fix typo in doc-string. - (encoded-kbd-set-coding-system): Deleted. + (encoded-kbd-set-coding-system): Delete. * case-table.el (describe-buffer-case-table): Use aref instead of set-char-table-range. @@ -17151,10 +17151,10 @@ (describe-specified-language-support): New function. (describe-language-support): Call the above function. (universal-coding-system-argument): New function. - (read-language-and-input-method-name): Doc-string fixed. If - default-input-method is nil, use previous-input-method as the + (read-language-and-input-method-name): Doc-string fixed. + If default-input-method is nil, use previous-input-method as the default value. - (set-default-input-method): Deleted. + (set-default-input-method): Delete. * language/*.el: Most of setup-LANGUAGE-environment functions are moved form LANGUAGE.el to LANG-util.el. These functions now at @@ -17270,7 +17270,7 @@ also accept a subdir with a file called `index'. * texinfmt.el (texinfo-extra-inter-column-width): - Renamed from extra-inter-column-width. Doc fix. + Rename from extra-inter-column-width. Doc fix. (texinfo-multitable-buffer-name): Variable renamed from multitable-temp-buffer-name. (texinfo-multitable-rectangle-name): @@ -17391,8 +17391,8 @@ read-only data someday. (eldoc-docstring-message): If truncating symbol name, show ending of name rather than beginning. The former is generally more unique. - (eldoc-function-argstring-from-docstring-method-table): Handle - pathological `save-restriction' case. + (eldoc-function-argstring-from-docstring-method-table): + Handle pathological `save-restriction' case. [top level]: Add `indent-for-tab-command' to eldoc-message-commands. 1997-05-21 Richard Stallman @@ -17438,18 +17438,18 @@ (ada-font-lock-keywords-1): Move "task" before "task (body|type)" to correct highlighting (regexp depends on order). - * ada-mode.el (ada-in-char-const-p): Renamed from `ada-after-char-p'. + * ada-mode.el (ada-in-char-const-p): Rename from `ada-after-char-p'. Also test following character. (ada-adjust-case): Use better function `ada-in-char-const-p'. (ada-in-string-or-comment-p): Test for being in a char constant. - (ada-clean-buffer-before-saving): Changed default to t. + (ada-clean-buffer-before-saving): Change default to t. (ada-mode): Set `font-lock-defaults' for Emacs only, use properties for XEmacs. - * ada-mode.el (ada-indent-newline-indent): Simplified by just calling + * ada-mode.el (ada-indent-newline-indent): Simplify by just calling `ada-indent-current'. - * ada-mode.el (ada-end-stmt-re): Added word delimiters in regexp. + * ada-mode.el (ada-end-stmt-re): Add word delimiters in regexp. Removed `interactive' statements which were needed only for debugging. * ada-mode.el: @@ -17477,7 +17477,7 @@ (ada-goto-next-word): Generalized old `ada-goto-previous-word' for both directions. - * ada-mode.el (ada-indent-function): Removed unnecessary `package' case. + * ada-mode.el (ada-indent-function): Remove unnecessary `package' case. (ada-get-indent-case): Before testing for `=>', be sure there is an `is'. (ada-search-prev-end-stmt): Test for `separate' keyword on the @@ -17490,8 +17490,8 @@ * ada-mode.el: Doc fixes. (ada-mode): Support new font-lock-mode. - (ada-format-paramlist): Changed all `accept' to `access'. - (ada-insert-paramlist): Changed all `accept' to `access'. + (ada-format-paramlist): Change all `accept' to `access'. + (ada-insert-paramlist): Change all `accept' to `access'. (ada-in-comment-p): Use standard Emacs way `parse-partial-sexp'. (ada-font-lock-keywords-1): Regexps in not byte-compiled code behave different than byte-compiled regexps. @@ -17518,7 +17518,7 @@ 1997-05-20 Richard Stallman - * word-help.el (set-word-help-file): Renamed from set-help-file. + * word-help.el (set-word-help-file): Rename from set-help-file. * crisp.el (crisp-mode): Add autoload cookie. @@ -17528,7 +17528,7 @@ * dos-w32.el (add-untranslated-filesystem) (remove-untranslated-filesystem): Add interactive spec. - * crisp.el (crisp-last-last-command): Renamed from last-last-command + * crisp.el (crisp-last-last-command): Rename from last-last-command and defvar added. * levents.el (event-closest-point): Fix paren error. @@ -17606,12 +17606,12 @@ (compilation-revert-buffer): New function. (compilation-mode): Set revert-buffer-function. - * files.el (revert-without-query): Renamed from + * files.el (revert-without-query): Rename from find-file-revert-without-query. (find-file-noselect): Use new option. (revert-buffer): Check the option here too. - * cus-face.el (custom-facep): Defined (once again). + * cus-face.el (custom-facep): Define (once again). * simple.el (do-auto-fill): Check enable-kinsoku and enable-multibyte-characters. @@ -17628,7 +17628,7 @@ 1997-05-16 Richard Stallman - * autoload.el (update-autoloads-from-directories): Renamed from + * autoload.el (update-autoloads-from-directories): Rename from update-autoloads-from-directory. Take multiple directories as args. Use locate-library to find loaddefs.el and the top level Lisp dir. (batch-update-autoloads): Call update-autoloads-from-directories. @@ -17670,11 +17670,11 @@ * mule-cmds.el (set-language-info): Change the special treatment of key 'describe-function to 'documentation. - (describe-specified-language-support): Renamed from + (describe-specified-language-support): Rename from describe-language-support-internal. Get language name from last-command-event. - (describe-language-support): Call - describe-specified-language-support. + (describe-language-support): + Call describe-specified-language-support. * language/chinese.el: Delete functions describe-LANGUAGE-support. Delete 'describe-function entries and change 'documentation @@ -17791,13 +17791,13 @@ (default): Use `:mouse-down-action'. (menu-choice): Ditto. (widget-choice-mouse-down-action): New function. - (widget-info-link-action): Removed kludge to steal up event. + (widget-info-link-action): Remove kludge to steal up event. * cus-edit.el (widget-magic-mouse-down-action): New function. (custom-magic-value-create): Use it. - (custom-buffer-create-internal): Removed kludge to steal up event. + (custom-buffer-create-internal): Remove kludge to steal up event. - * widget.el (:glyph-up, :glyph-down, :glyph-inactive): New - keywords. + * widget.el (:glyph-up, :glyph-down, :glyph-inactive): + New keywords. * wid-edit.el (widget-glyph-insert-glyph): Support optional `down' and `inactive' glyphs. (widget-push-button-value-create): Ditto. @@ -17811,8 +17811,8 @@ (customize-variable-other-window, customize-face) (customize-face-other-window, customize-customized) (customize-saved, customize-apropos, custom-face-menu-create) - (custom-variable-menu-create, boolean, custom-menu-create): Updated - caller. + (custom-variable-menu-create, boolean, custom-menu-create): + Update caller. * cus-edit.el (custom-variable-action): Reset magic state. (custom-variable-menu): Allow `Reset to Current' on `changed' @@ -17853,24 +17853,24 @@ (choice, radio): Use it. (widget-prompt-value): Prepend widget type to prompt. - * wid-edit.el (widget-parent-action): Renamed from + * wid-edit.el (widget-parent-action): Rename from `widget-choice-item-action'. - (choice-item): Updated widget. + (choice-item): Update widget. * cus-edit.el (custom-magic): Ditto. - * wid-edit.el (widget-children-validate): Renamed from + * wid-edit.el (widget-children-validate): Rename from `widget-editable-list-validate'. - (editable-list, group): Updated widgets. + (editable-list, group): Update widgets. * cus-edit.el (custom, face): Ditto. - * wid-edit.el (widget-value-value-get): Renamed from + * wid-edit.el (widget-value-value-get): Rename from `widget-item-value-get'. - (item): Updated widget. + (item): Update widget. * cus-edit.el (face, custom): Ditto. - * wid-edit.el (widget-value-convert-widget): Renamed from + * wid-edit.el (widget-value-convert-widget): Rename from `widget-item-convert-widget'. - (item, editable-field): Updated widgets. + (item, editable-field): Update widgets. * cus-edit.el (face): Ditto. 1997-05-14 Simon Marshall @@ -17986,13 +17986,13 @@ * gnus-mule.el: Moved to `gnus' subdirectory. - * gnus/gnus-mule.el (gnus-mule-message-send-news-function): New - function to encode text before sending by news. + * gnus/gnus-mule.el (gnus-mule-message-send-news-function): + New function to encode text before sending by news. (gnus-mule-message-send-mail-function): New function to encode text before sending by mail. (gnus-mule-initialize): Add gnus-mule-message-send-news-function - to the hook message-send-news-hook. Add - gnus-mule-message-send-mail-function to the hook + to the hook message-send-news-hook. + Add gnus-mule-message-send-mail-function to the hook message-send-mail-hook. * help.el (help-with-tutorial): Fix a bug of handling non-English @@ -18036,16 +18036,16 @@ Setting of syntax and category for Devanagari characters are moved to characters.el. - * language/english.el (setup-english-environment): Set - sendmail-coding-system and rmail-file-coding-system to nil. + * language/english.el (setup-english-environment): + Set sendmail-coding-system and rmail-file-coding-system to nil. * language/ethio-util.el (fidel-to-tex-map): Name changed to ethio-fidel-to-tex-map. * language/european.el: Typo in comment fixed. - * language/japanese.el (setup-japanese-environment): Set - sendmail-coding-system and rmail-file-coding-system to + * language/japanese.el (setup-japanese-environment): + Set sendmail-coding-system and rmail-file-coding-system to 'iso-2022-jp. * language/korean.el: Bug fixed in making coding system @@ -18095,8 +18095,8 @@ (rmail-convert-file): Comment fixed. (rmail-revert): Don't decode RMAIL file again because the backup file is saved in Emacs' internal format. - (rmail-convert-to-babyl-format): Check - rmail-enable-decoding-message. + (rmail-convert-to-babyl-format): + Check rmail-enable-decoding-message. * term/x-win.el: Create bold, italic, and bold-italic variants of default fontset. Name a fontset created from user-specified ASCII @@ -18138,7 +18138,7 @@ * simple.el (assoc-ignore-case): Downcase KEY as well as element cars. * bibtex.el (assoc-ignore-case): Function deleted. - (bibtex-member-of-regexp): Renamed from member-of-regexp. + (bibtex-member-of-regexp): Rename from member-of-regexp. Call changed. * timer.el (timer-event-handler): Take timer as arg directly. @@ -18340,7 +18340,7 @@ (compilation-shell-minor-mode-map, compilation-shell-minor-mode): New variables. (compile-auto-highlight): Doc fix. - (compilation-error-regexp-alist): Removed unnecessary line break + (compilation-error-regexp-alist): Remove unnecessary line break in first regexp. Replaced \\(\\|.* on \\) by \\(.* on \\)? in regexp for Absoft FORTRAN 77 Compiler 3.1.3. Added regexp for SPARCcompiler Pascal. Divided long line in regexp for Cray C @@ -18354,7 +18354,7 @@ (compilation-leave-directory-regexp-alist): New variables. (compilation-file-regexp-alist) (compilation-nomessage-regexp-alist): New variables. - (grep-regexp-alist): Removed unnecessary ^ at beginning of regexp. + (grep-regexp-alist): Remove unnecessary ^ at beginning of regexp. (compilation-enter-directory-regexp) (compilation-leave-directory-regexp): Variables deleted. Replaced by compilation-enter-directory-regexp-alist and @@ -18394,7 +18394,7 @@ * cus-edit.el (custom-group-magic-alist): New variable. (custom-group-state-update): Use custom-group-magic-alist. - (customize-group): Renamed from `customize', + (customize-group): Rename from `customize', and rename argument to GROUP. (customize): New function. @@ -18418,7 +18418,7 @@ * time-stamp.el (time-stamp-old-format-warn): Fix a tag string. (time-stamp-format): Use %Y not %y in default value. - * crisp.el (crisp-load-scroll-all): Renamed from ...-lock. + * crisp.el (crisp-load-scroll-all): Rename from ...-lock. (crisp-mode): Use scroll-all... not scroll-lock... * scroll-all.el: Renamed from scroll-lock.el. @@ -18476,7 +18476,7 @@ * ange-ftp.el (ange-ftp-file-entry-p): If ange-ftp-get-files returns nil, don't try ange-ftp-hash-entry-exists-p, just give up. - * comint.el (comint-input-face): Deleted. + * comint.el (comint-input-face): Delete. * compile.el (compilation-error-regexp-alist): Add regexp for Perl -w. @@ -18515,34 +18515,34 @@ "In" or "Out" command tells you if you are already on or off the bus. * dunnet.el (dun-sauna-heat): - Changed "begin to sweat" to "are perspiring" + Change "begin to sweat" to "are perspiring" so that it makes sense whether you are heating up or cooling down. * dunnet.el (dun-help): - Changed author e-mail address, added web page. + Change author e-mail address, added web page. Added hint for batch mode. * dunnet.el (*global*): - Fixed spelling of Presely in global object list. - - * dunnet.el (*global*): - Added coconuts, tank, and lake as objects that are recognized. - - * dunnet.el (*global*): - Added `slip' as another way of describing the paper, + Fix spelling of Presely in global object list. + + * dunnet.el (*global*): + Add coconuts, tank, and lake as objects that are recognized. + + * dunnet.el (*global*): + Add `slip' as another way of describing the paper, and `chip' as another way of describing the CPU. * dunnet.el (*global*): Upcase abbreviations of directions in room descriptions. * dunnet.el (dun-login): - Fixed erroneous login message to better-describe ftp limitations. + Fix erroneous login message to better-describe ftp limitations. * dunnet.el (dun-rlogin): - Added error message if user tries to rlogin back to pokey. + Add error message if user tries to rlogin back to pokey. * dunnet.el (dun-load-d): - Fixed so that if restore file isn't found which in non-batch mode, + Fix so that if restore file isn't found which in non-batch mode, window will switch back to game. 1997-04-27 Richard Stallman @@ -18568,11 +18568,11 @@ 1997-04-26 Edward M Reingold - * cal-french.el (calendar-print-french-date): Label - French date in echo area. + * cal-french.el (calendar-print-french-date): + Label French date in echo area. - * cal-coptic.el (calendar-print-coptic-date): Label - Coptic/Ethiopic date in echo area. + * cal-coptic.el (calendar-print-coptic-date): + Label Coptic/Ethiopic date in echo area. 1997-04-25 Richard Stallman @@ -18614,7 +18614,7 @@ * cus-edit.el (custom-set-value): New command. (custom-set-variable): New command. - (customize-saved): Renamed from `customize-customized'. + (customize-saved): Rename from `customize-customized'. (customize-customized): New command. (custom-save-customized): New command. @@ -18677,7 +18677,7 @@ * cus-edit.el (custom-display-unselected-match): Matched too many displays. - * wid-edit.el (widget-field-face): Changed default background + * wid-edit.el (widget-field-face): Change default background color. * custom.el (custom-declare-variable): Set `custom-get' the right @@ -18801,7 +18801,7 @@ * sh-script.el (sh-case): Make this a simple define-skeleton as it was originally. Don't add a menu-enable property. - (sh-assignment-regexp): Renamed from sh-assignment-prefix + (sh-assignment-regexp): Rename from sh-assignment-prefix undoing a renaming made by mistake. * sgml-mode.el (sgml-transformation): Fix previous change. @@ -18946,7 +18946,7 @@ * cus-start.el: Add support for face documentation. - * cus-dep.el (custom-make-dependencies): Fixed generation of + * cus-dep.el (custom-make-dependencies): Fix generation of parens. Fixed message. @@ -18975,8 +18975,8 @@ 1997-04-14 Steven L Baur - * edebug.el (edebug-read-and-maybe-wrap-form): Protect - against pathological recursive calls. + * edebug.el (edebug-read-and-maybe-wrap-form): + Protect against pathological recursive calls. 1997-04-14 Karl Heuer @@ -19079,8 +19079,8 @@ variable instead. buffer-substring with 3 arguments is non-portable. * elp.el (elp-instrument-function, elp-instrument-list): - Handle function symbols that have already been instrumented. Do - not instrument them twice. + Handle function symbols that have already been instrumented. + Do not instrument them twice. * elp.el (elp-recycle-buffers-p): New variable. @@ -19128,18 +19128,18 @@ * cus-edit.el (customize-menu-create): New function. (custom-mode-customize-menu): Use it. - * cus-edit.el (custom-make-dependencies): Deleted function. + * cus-edit.el (custom-make-dependencies): Delete function. * cus-edit.el (customize-face): Sort faces. * cus-edit.el (custom-faces): New group. - (custom-magic-alist): Added. - (custom-variable-sample-face): Added. - (custom-variable-button-face): Added. - (custom-face-tag-face): Added. - (custom-group-tag-faces): Added. - (custom-group-tag-face): Added. - (customize): Removed from faces group. + (custom-magic-alist): Add. + (custom-variable-sample-face): Add. + (custom-variable-button-face): Add. + (custom-face-tag-face): Add. + (custom-group-tag-faces): Add. + (custom-group-tag-face): Add. + (customize): Remove from faces group. * cus-edit.el (custom-load-recursion): New variable. (custom-load-symbol): Use it. @@ -19151,14 +19151,14 @@ `custom-buffer-create'. (custom-buffer-create-other-window): New function. - * cus-edit.el (custom-guess-name-alist): Renamed from + * cus-edit.el (custom-guess-name-alist): Rename from `custom-guess-type-alist'. (custom-guess-doc-alist): New option. (custom-guess-type): Use them. - * cus-face.el (set-face-stipple): Removed Kyle Jones code. + * cus-face.el (set-face-stipple): Remove Kyle Jones code. - * cus-face.el (face-doc-string): Changed property name to + * cus-face.el (face-doc-string): Change property name to `face-documentation'. (set-face-doc-string): Ditto. @@ -19182,17 +19182,17 @@ unbound. (custom-menu-nesting): Don't define for XEmacs. - * cus-face.el (after-make-frame-hook): Removed - `custom-initialize-frame', as this is now in `frame.el'. + * cus-face.el (after-make-frame-hook): + Remove `custom-initialize-frame', as this is now in `frame.el'. * cus-edit.el (custom-guess-type-alist): New option. (custom-guess-type): New function. (custom-variable-type): New function. (custom-variable-value-create): Use it. - * cus-face.el (custom-face-attributes): Moved :family to the + * cus-face.el (custom-face-attributes): Move :family to the beginning of the list. - (custom-face-attributes): Added :strikethru attribute. + (custom-face-attributes): Add :strikethru attribute. * custom.el (custom-set-variables): If variable is already set, overwrite it here. @@ -19309,7 +19309,7 @@ (scheme-comment-indent, scheme-indent-offset) (scheme-indent-function, scheme-indent-line) (calculate-scheme-indent, scheme-indent-specform) - (scheme-indent-defform, scheme-indent-sexp): Removed; use lisp-mode + (scheme-indent-defform, scheme-indent-sexp): Remove; use lisp-mode equivalents. (scheme-imenu-generic-expression): New variable. (dsssl-imenu-generic-expression): New variable. @@ -19471,9 +19471,9 @@ 1997-03-30 Dan Nicolaescu - * icon.el (icon-mode-map): Added menus. + * icon.el (icon-mode-map): Add menus. (icon-imenu-generic-expression): New variable to be used for imenu. - (icon-mode): Added font-lock, imenu and hideshow support. + (icon-mode): Add font-lock, imenu and hideshow support. (icon-font-lock-keywords-1, icon-font-lock-keywords-2): New constants for different level of font-lock fontification. (icon-font-lock-keywords): New variable. Default expression to be @@ -19502,7 +19502,7 @@ * sh-script.el (sh-mode): If file has no #! line, set the syntax table based on the default shell. -1997-03-29 Barry A. Warsaw +1997-03-29 Barry A. Warsaw * Public Release 4.389. @@ -19555,23 +19555,23 @@ * term.el: Added a lot of new faces, they all start with term- and follow a simple lexicographical convention. Note that each change is commented: just search for -mm in the source. - (term-char-mode): Added all the "gray-keys" to term-raw-map. + (term-char-mode): Add all the "gray-keys" to term-raw-map. (term-send-up): Similar, decided to go for the more xterm-like \eOA bindings in place of the previous \e[A. (term-buffer-maximum-size): New variable. - (term-mode): Added some make-local: now term-buffer-maximum-size, + (term-mode): Add some make-local: now term-buffer-maximum-size, ange-ftp-default-user/password/an-pwd. (term-emulate-terminal): Quite some modifications to allow multiple outstanding ANSI style commands: notably all the -previous-parameter stuff. Call term-handle-ansi-terminal-messages. - (term-emulate-terminal): Added simple trimming function: at the + (term-emulate-terminal): Add simple trimming function: at the end we simply check if the buffer is > term-buffer-maximum-size and cut it accordingly. (term-handle-colors-array): New function. (term-handle-ansi-terminal-messages): New function. - (term-handle-ansi-escape): Modified to allow ANSI coloring. - (ansi-term): New function that creates multiple terminals. Put - in the standard C-x map too: I'm quite used to C-x C-f and C-c C-f + (term-handle-ansi-escape): Modify to allow ANSI coloring. + (ansi-term): New function that creates multiple terminals. + Put in the standard C-x map too: I'm quite used to C-x C-f and C-c C-f was too awkward. 1997-03-29 Richard Stallman @@ -19583,7 +19583,7 @@ * hideshow.el: Use overlays for hiding instead of selective display. Commented out the support for XEmacs because it doesn't support overlays. - (hs-special-modes-alist): Added support for java-mode. + (hs-special-modes-alist): Add support for java-mode. (hs-minor-mode-hook): New variable. (hs-c-start-regexp, hs-c-end-regexp, hs-forward-sexp-func) (hs-block-start-regexp, hs-block-end-regexp) @@ -19596,8 +19596,8 @@ (hs-hide-block-at-point, hs-hide-initial-comment-block) (java-hs-forward-sexp, hs-mouse-toggle-hiding): New functions. (hs-inside-comment-p, hs-hide-block) - (hs-show-block): Added support for single line comments. - (hs-hide-all): Added support for hiding comments. + (hs-show-block): Add support for single line comments. + (hs-hide-all): Add support for hiding comments. 1997-03-28 Richard Stallman @@ -19711,7 +19711,7 @@ 1997-03-20 Dan Nicolaescu * imenu.el (imenu-scanning-message): Support for bigger numbers. - (imenu--generic-function): Fixed probably a typo: named appeared + (imenu--generic-function): Fix probably a typo: named appeared twice in an item. Put function after name and beg in a special item because a normal item has name and beg (for orthogonality). (imenu-add-to-menubar): First test to see if the mode supports @@ -19742,8 +19742,8 @@ 1997-03-18 Kenichi Handa - * fontset.el (x-complement-fontset-spec): Setup - alternative-fontname-alist while complementing fontnames. + * fontset.el (x-complement-fontset-spec): + Setup alternative-fontname-alist while complementing fontnames. 1997-03-18 Naoto TAKAHASHI @@ -19758,11 +19758,11 @@ (quail-keyboard-layout): Docstring changed to reflect the above change. (quail-keyboard-layout-len): Increased for the above change. - (quail-keyboard-layout-alist): Modified for the above change. + (quail-keyboard-layout-alist): Modify for the above change. 1997-03-18 Kenichi Handa - * mule.el (make-char): Documented. + * mule.el (make-char): Document. (charset-plist): Return quoted list even if CHARSET is supplied by symbol. @@ -19780,8 +19780,8 @@ * language/viet-util.el (viet-decode-viqr-region): Supply correct argumnents to rassoc. - (viqr-post-read-conversion, viqr-pre-write-conversion): New - functions. + (viqr-post-read-conversion, viqr-pre-write-conversion): + New functions. * language/vietnamese.el: Set the above functions to the coding system viqr. @@ -19856,7 +19856,7 @@ * mailalias.el (mail-passwd-files): New variable. (mail-get-names): Use mail-passwd-files instead of always /etc/passwd. -1997-03-12 Barry A. Warsaw +1997-03-12 Barry A. Warsaw * cc-mode.el (c-lineup-C-comments): Handle more cases, especially when comment lines aren't prefixed with stars. @@ -19883,7 +19883,7 @@ map them into inher-intro, inher-cont, and func-decl-cont syntactic symbols. Do the indentation as of Java inheritance lines better. - (c-offsets-alist): Changed the syntactic symbol ansi-funcdecl-cont + (c-offsets-alist): Change the syntactic symbol ansi-funcdecl-cont to func-decl-cont. This symbol is useful in Java throws declarations. (c-lineup-java-inher): New function for lining up "implements" @@ -19957,8 +19957,8 @@ * make-mode.el (makefile-dependency-regex): Disallow "=" in name, so that "flags=-o:1" is treated as an assignment, not a dependency. - (makefile-dependency-regex, makefile-macroassign-regex): Disallow - spaces in symbol name. + (makefile-dependency-regex, makefile-macroassign-regex): + Disallow spaces in symbol name. 1997-03-11 Dan Nicolaescu @@ -19967,8 +19967,8 @@ 1997-03-12 Richard Stallman - * dired-aux.el (dired-fun-in-all-buffers): New arg FILE. Don't - operate on buffers whose wildcard pattern does not accept FILE. + * dired-aux.el (dired-fun-in-all-buffers): New arg FILE. + Don't operate on buffers whose wildcard pattern does not accept FILE. All callers changed. * dired.el (dired-glob-regexp): New function. @@ -20058,14 +20058,14 @@ (rmail-show-mime-function, rmail-mime-feature): New variables to control MIME feature. (rmail-file-coding-system): Default value is nil. - (rmail, rmail-convert-file, rmail-insert-inbox-text): Check - rmail-enable-mime. Read a file without any code conversion. + (rmail, rmail-convert-file, rmail-insert-inbox-text): + Check rmail-enable-mime. Read a file without any code conversion. (rmail-variables): Setup local variables rmail-buffer and rmail-view-buffer. - (rmail-decode-babyl-format, rmail-convert-babyl-format): Perform - code conversion of RMAIL file if rmail-enable-mime is nil. - (rmail-show-message): Make sure to be in rmail-buffer. If - rmail-enable-mime is t, call appropriate function to decode MIME + (rmail-decode-babyl-format, rmail-convert-babyl-format): + Perform code conversion of RMAIL file if rmail-enable-mime is nil. + (rmail-show-message): Make sure to be in rmail-buffer. + If rmail-enable-mime is t, call appropriate function to decode MIME format. (rmail-mail, rmail-reply): Call rmail-start-mail with argument rmail-view-buffer. @@ -20076,8 +20076,8 @@ rmail-summary-line-decoder. (rmail-summary-next-msg): Display rmail-view-buffer. (rmail-summary-mode): Make rmail-view-buffer buffer local. - (rmail-summary-rmail-update, rmail-summary-scroll-msg-up): Use - rmail-view-buffer instead of rmail-buffer. + (rmail-summary-rmail-update, rmail-summary-scroll-msg-up): + Use rmail-view-buffer instead of rmail-buffer. * mule-cmds.el (mule-keymap): Re-arranged. (set-language-info): Typo fixed in docstring. @@ -20188,8 +20188,8 @@ (turn-on-font-lock): Test font-lock-mode. Added commented out menu code. - * compile.el (compilation-mode-font-lock-keywords): Variable - definition deleted. New function. + * compile.el (compilation-mode-font-lock-keywords): + Variable definition deleted. New function. (compilation-mode-map): Add `...' to Compile menu entry. 1997-02-20 Yutaka NIIBE @@ -20239,8 +20239,8 @@ * help.el (help-with-tutorial): Prefix argument to specify a language interactively. - * isearch.el (isearch-mode-map): Define - isearch-toggle-input-method and + * isearch.el (isearch-mode-map): + Define isearch-toggle-input-method and isearch-toggle-specified-input-method in the map. (isearch-multibyte-characters-flag): New variable. (isearch-mode): Initialize it to nil. @@ -20272,8 +20272,8 @@ (sendmail-send-it): Perform code conversion on sending mail according to sendmail-coding-system. - * simple.el (kill-forward-chars, kill-backward-chars): Pay - attention to multibyte characters. + * simple.el (kill-forward-chars, kill-backward-chars): + Pay attention to multibyte characters. (what-cursor-position): With a prefix argument, print detailed info of a character on cursor position. (transpose-subr-1): Pay attention to multibyte characters. @@ -20369,8 +20369,8 @@ * diff.el (diff-process-setup): New function, sets up the compilation-exit-message-function so that it works with both asynchronous and synchronous sub-processes. - (diff): Bind compilation-exit-message-function. Run - compilation-finish-function when compile-internal returns if async + (diff): Bind compilation-exit-message-function. + Run compilation-finish-function when compile-internal returns if async processes aren't supported. 1997-02-08 Richard Stallman @@ -20432,7 +20432,7 @@ * iso-acc.el (iso-accents-compose): Handle case where unread-command-events is already nonempty. - * frame.el (set-frame-font): Renamed from set-default-font. + * frame.el (set-frame-font): Rename from set-default-font. 1997-02-01 Tom Tromey @@ -20484,7 +20484,7 @@ * compile.el (compilation-enter-directory-regexp) (compilation-leave-directory-regexp): Add .* at beginning. -1997-01-30 Barry A. Warsaw +1997-01-30 Barry A. Warsaw * cc-mode.el: Public Release 4.353. @@ -20504,7 +20504,7 @@ * cc-mode.el (c-Java-access-key): Set to nil since Java doesn't have C++-like access labels. - * cc-mode.el (c-style-alist): Added "python" style. + * cc-mode.el (c-style-alist): Add "python" style. * cc-mode.el (c-mode-menu): New function. (c-popup-menu, c-common-init): Use c-mode-menu. @@ -20525,9 +20525,9 @@ * cc-mode.el (c-emacs-features): Detect Infodock. (c-common-init, c-mode-map): Don't install menus for Infodock. - * cc-mode.el (c-indent-exp): Fixed infinite loop when multi-line C + * cc-mode.el (c-indent-exp): Fix infinite loop when multi-line C comment is last thing in buffer. - (c-guess-basic-offset): Fixed error when K&R C-like macro is first + (c-guess-basic-offset): Fix error when K&R C-like macro is first non-syntactic whitespace in file. * cc-mode.el (c-C++-comment-start-regexp): @@ -20705,7 +20705,7 @@ 1997-01-09 Simon Marshall - * font-lock.el (font-lock-unique): Deleted. + * font-lock.el (font-lock-unique): Delete. (font-lock-prepend-text-property, font-lock-append-text-property): Don't call it; behave as to-be-written builtins. Declare as defuns. (font-lock-fillin-text-property): Declare as a defun. @@ -20731,7 +20731,7 @@ (expand-mode-hook, expand-mode-name): Variables deleted. (expand-load-hook): Variable renamed from expand-mode-load-hook. (expand-map): Variable deleted. - (expand-jump-to-next-slot): Renamed from expand-jump-to-next-mark. + (expand-jump-to-next-slot): Rename from expand-jump-to-next-mark. Add autoload. (expand-jump-to-previous-slot): Add autoload. Renamed from expand-jump-to-previous-mark. @@ -20803,11 +20803,11 @@ 1997-01-02 Jens Toivo Berger Thielemann * word-help.el (word-help-mode-alist, reset-word-help) - (word-help-switch-help-file): Added support for completion. + (word-help-switch-help-file): Add support for completion. (word-help-complete, word-help-complete-list) (word-help-complete-index, word-help-extract-matches) (word-help-make-complete): New functions/variables for completion. - (word-help-mode-alist): Enhanced search regexps. + (word-help-mode-alist): Enhance search regexps. (word-help-index-mapper): Defaults now to extracting the first word. (word-help-mode-alist, word-help-index-mapper) (word-help-main-index, word-help-main-obarray) @@ -20850,8 +20850,8 @@ 1996-12-31 Richard Stallman - * simple.el (repeat-complex-command): Bind - minibuffer-history-position and minibuffer-history-sexp-flag + * simple.el (repeat-complex-command): + Bind minibuffer-history-position and minibuffer-history-sexp-flag only for the read-from-minibuffer call. 1996-12-30 Richard Stallman @@ -20929,7 +20929,7 @@ * expand.el: New file. - * skeleton.el (skeleton-positions): Renamed from skeleton-marks. + * skeleton.el (skeleton-positions): Rename from skeleton-marks. * skeleton.el (skeleton-marks): New variable. (skeleton-insert, skeleton-internal-1): Set skeleton-marks. @@ -20956,7 +20956,7 @@ (vip-convert-standard-file-name): New function. * ediff-util.el (ediff-file-under-version-control): New function. - (ediff-inferior-compare-regions): Improved interface. + (ediff-inferior-compare-regions): Improve interface. (ediff-maybe-checkout): New function. (ediff-maybe-save-and-delete-merge): New function. (ediff-setup): Now uses convert-standard-filename. @@ -20970,8 +20970,8 @@ subordinate Ediff sessions. * ediff-ptch.el (ediff-patch-file-internal): Now calls ediff-maybe-checkout. - (ediff-context-diff-label-regexp): Fixed regexp. - (ediff-map-patch-buffer): Fixed beg/end patch boundaries. + (ediff-context-diff-label-regexp): Fix regexp. + (ediff-map-patch-buffer): Fix beg/end patch boundaries. * ediff.el: Now supports autostore for merge jobs. 1996-12-27 Richard Stallman @@ -21018,15 +21018,15 @@ * vc-hooks.el (vc-user-login-name): New function. (vc-fetch-master-properties, vc-lock-from-permissions, vc-file-owner) - (vc-fetch-properties, vc-after-save, vc-mode-line, vc-status): Use - `vc-user-login-name' instead of `user-login-name'. + (vc-fetch-properties, vc-after-save, vc-mode-line, vc-status): + Use `vc-user-login-name' instead of `user-login-name'. * vc.el (vc-next-action-on-file, vc-update-change-log) (vc-backend-checkout, vc-backend-steal): Use `vc-user-login-name' instead of `user-login-name'. (vc-update-change-log): If `user-full-name' is nil, try `user-login-name'. Failing that, use uid as a string. - (vc-make-buffer-writable-hook): Removed (was unused). + (vc-make-buffer-writable-hook): Remove (was unused). 1996-12-20 Richard Stallman @@ -21294,7 +21294,7 @@ * thingatpt.el: Downcase arguments as Lisp symbols. Fix many doc strings. - (thing-at-point-file-name-chars): Renamed from file-name-chars. + (thing-at-point-file-name-chars): Rename from file-name-chars. Allow a colon. (thing-at-point-url-chars): New variable. (url): Define new kind of "thing". @@ -21309,7 +21309,7 @@ Two new arguments. (rmail-forward): Always call rmail-start-mail, never `mail'. - * sendmail.el (mail-reply-action): Renamed from mail-reply-buffer. + * sendmail.el (mail-reply-action): Rename from mail-reply-buffer. (mail-yank-original): Handle either an action or a buffer in mail-reply-action. (mail): Doc fix. @@ -21413,8 +21413,8 @@ (font-lock-face-attributes): Doc fix. (font-lock-match-c-style-declaration-item-and-skip-to-next): New function. Match just identifiers. Use it for C, Objective-C and Java. - (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match - templates too. + (font-lock-match-c++-style-declaration-item-and-skip-to-next): + Match templates too. (c-font-lock-extra-types, c++-font-lock-extra-types) (objc-font-lock-extra-types, java-font-lock-extra-types): Use these variables in EVAL forms, i.e., do not eval when font-lock.el is loaded. @@ -21432,7 +21432,7 @@ (fast-lock-get-face-properties): Rewrite for face lists. Use it. * lazy-lock.el (lazy-lock-submit-bug-report): Function deleted. - (lazy-lock-defer-on-scrolling): Renamed from lazy-lock-defer-driven. + (lazy-lock-defer-on-scrolling): Rename from lazy-lock-defer-driven. (lazy-lock-defer-on-the-fly): New variable from lazy-lock-defer-time. (lazy-lock-install): Use it. (lazy-lock-defer-time): Doc fix. Add top-level code to detect use of @@ -21441,15 +21441,15 @@ (lazy-lock-stealth-load): New variable. (lazy-lock-fontify-after-idle): Use it. (lazy-lock-mode): Doc fix. - (lazy-lock-defer-line-after-change): Renamed from + (lazy-lock-defer-line-after-change): Rename from lazy-lock-defer-after-change. (lazy-lock-defer-rest-after-change) (lazy-lock-fontify-line-after-change) (lazy-lock-fontify-rest-after-change): New functions. (lazy-lock-install-hooks): Add one depending on deferral variables. (lazy-lock-unstall): Remove them. Fontify if Font Lock mode still on. - (lazy-lock-fontify-window, lazy-lock-fontify-conservatively): Use - with-current-buffer rather than save-excursion. + (lazy-lock-fontify-window, lazy-lock-fontify-conservatively): + Use with-current-buffer rather than save-excursion. (lazy-lock-percent-fontified): Cast size to float before multiplying. 1996-11-14 Karl Heuer @@ -21553,7 +21553,7 @@ * comint.el (comint-output-filter): Run comint-output-filter-functions directly, not via comint-output-filter. - * compile.el (compile-auto-highlight): Renamed from + * compile.el (compile-auto-highlight): Rename from compile-highlight-display-limit. * time-stamp.el (time-stamp-dd/mm/yyyy): New function. @@ -21589,7 +21589,7 @@ 1996-11-02 Henry Guillaume * find-file.el (general): Enabled commentary for Finder. - (ff-search-directories): Changed /usr/include/* to /usr/include. + (ff-search-directories): Change /usr/include/* to /usr/include. (ff-get-file-name): Improve behavior when file is found in a buffer. 1996-11-02 Richard Stallman @@ -21679,7 +21679,7 @@ 1996-10-24 Dave Gillespie - * cl-macs.el (lexical-let): Fixed a bug involving nested + * cl-macs.el (lexical-let): Fix a bug involving nested lexical contexts and macros. 1996-10-23 Simon Marshall @@ -21740,7 +21740,7 @@ 1996-10-20 Kevin Rodgers - * compile.el (compilation-skip-to-next-location): Defined. + * compile.el (compilation-skip-to-next-location): Define. (compilation-next-error-locus, compilation-parse-errors): Respect it. 1996-10-17 Andre Spiegel @@ -21767,19 +21767,19 @@ 1996-10-14 Torbjorn Einarsson - * f90.el (f90-no-block-limit): Fixed bug for indentation of + * f90.el (f90-no-block-limit): Fix bug for indentation of elsewhere and elseif. (f90-looking-at-where-or-forall): Now allows for labeled forall and where statements. (f90-font-lock-keywords-2): New highlighting for labeled where and forall. Fixed small bug with else highlighting. - (f90-fill-region): Moved indentation to f90-break-line. + (f90-fill-region): Move indentation to f90-break-line. (f90-break-line): Will now always indent the second line. (f90-indent-line): Simpler test for auto-fill. - (f90-auto-fill-mode): Removed. - (f90-electric-insert): Added for possibility of auto-filling of + (f90-auto-fill-mode): Remove. + (f90-electric-insert): Add for possibility of auto-filling of lines without spaces, as well as early updating of line. - (f90-mode-map): Added bindings of operators to f90-electric-insert. + (f90-mode-map): Add bindings of operators to f90-electric-insert. (f90-do-auto-fill): Now also updates line (changes case). 1996-10-12 Richard Stallman @@ -21865,21 +21865,21 @@ * browse-url.el (browse-url): New function. (browse-url-CCI-host): New variable. - (browse-url-at-mouse): Added event-buffer and event-point + (browse-url-at-mouse): Add event-buffer and event-point functions for XEmacs compatibility. (browse-url-file-url): Check for EFS after alist, URL-encode special chars. (browse-url-grail): New function. (browse-url-interactive-arg): Add new-window logic. - (browse-url-looking-at): Fixed. + (browse-url-looking-at): Fix. (browse-url-lynx-xterm): New function. (browse-url-lynx-emacs): Use term.el instead of terminal.el. (browse-url-netscape): Contact/start Netscape in the - background. Multi-display support. Renamed - browse-url-netscape-send. URL-encode comma. + background. Multi-display support. + Renamed browse-url-netscape-send. URL-encode comma. (browse-url-netscape-command): New variable. (browse-url-netscape-startup-arguments): New variable. - (browse-url-url-at-point): Improved matching to supply missing + (browse-url-url-at-point): Improve matching to supply missing "http://". Other fixes for byte-compilation. @@ -21903,7 +21903,7 @@ * rmail.el (rmail-mode-2): Don't run rmail-mode-hook here. (rmail-mode, rmail): Run it here. -1996-10-08 Barry A. Warsaw +1996-10-08 Barry A. Warsaw * cc-mode.el (c-mode-map): Install FSF mode menu into menubar using the name @@ -21912,7 +21912,7 @@ additional FSF menu. * cc-mode.el: - Removed the following variables from the built-in "cc-mode" style: + Remove the following variables from the built-in "cc-mode" style: c-echo-syntactic-information-p c-string-syntax-p c-tab-always-indent @@ -21921,7 +21921,7 @@ * cc-mode.el (c-indent-command): Doc fix. - * cc-mode.el (c-style-alist): Added "linux" style. + * cc-mode.el (c-style-alist): Add "linux" style. * cc-mode.el (c-lineup-comment): Preserve comment-column. @@ -21975,10 +21975,10 @@ functions inside a nested class since they will twice add the indentation of the inner class to the running total. - The solution is to not give one of the two symbols a relpos. The - decision was made to omit the relpos of the 'inline-open symbol. + The solution is to not give one of the two symbols a relpos. + The decision was made to omit the relpos of the 'inline-open symbol. - (c-mode-help-address): Added cc-mode-help@python.org. + (c-mode-help-address): Add cc-mode-help@python.org. (c-recognize-knr-p): No longer a user variable. (c++-mode, java-mode): Set c-recognize-knr-p to nil. @@ -22058,7 +22058,7 @@ (sgml-font-lock-keywords): Add an element for comments. * rmailsum.el (rmail-summary-line-count-flag): - Renamed from rmail-summary-line-count-p. + Rename from rmail-summary-line-count-p. * rmailsum.el (rmail-summary-line-count-p): New variable. (rmail-make-basic-summary-line): Optionally exclude the line count. @@ -22128,8 +22128,8 @@ (ps-print-prologue-1, ps-print-prologue-2): New variables. Major rewrite of the PostScript code to handle landscape mode, multiple columns and new font management. - (ps-landscape-mode, ps-number-of-columns, ps-inter-column): New - variables. + (ps-landscape-mode, ps-number-of-columns, ps-inter-column): + New variables. Add landscape mode and multiple columns with interspacing. (ps-font-info-database, ps-font-family, ps-font-size) (ps-header-font-family, ps-header-font-size, ps-header-title-font) @@ -22142,10 +22142,10 @@ (/ReportAllFontInfo): New PostScript function to get all the font families of the printer. (ps-setup): New function. - (ps-line-lengths, ps-nb-pages-buffer, ps-nb-pages-region): New - utility functions. - (ps-page-dimensions-get-width, ps-page-dimensions-get-height): New - macros. + (ps-line-lengths, ps-nb-pages-buffer, ps-nb-pages-region): + New utility functions. + (ps-page-dimensions-get-width, ps-page-dimensions-get-height): + New macros. (/HeaderOffset): Fix bug with /PrintStartY. (/SetHeaderLines): Fix bug. @@ -22236,7 +22236,7 @@ * tex-mode.el (tex-main-file): Add missing initial value. (tex-file): Set tex-print-file to source-file always. - (tex-last-file-texed): Renamed from tex-last-buffer-texed + (tex-last-file-texed): Rename from tex-last-buffer-texed and now holds a file name. (tex-region): Test and set tex-last-file-texed. @@ -22286,15 +22286,15 @@ * ffap.el (path-separator): Duplicate definition deleted. (ffap-what-domain): Don't define mail-extr-all-top-level-domains here. - * refbib.el (r2b-capitalize-title-stop-words): Renamed from capit... - (r2b-capitalize-title-stop-regexp): Renamed from capit... - (r2b-capitalize-title-region): Renamed from capitalize... - (r2b-capitalize-title): Renamed from capitalize... + * refbib.el (r2b-capitalize-title-stop-words): Rename from capit... + (r2b-capitalize-title-stop-regexp): Rename from capit... + (r2b-capitalize-title-region): Rename from capitalize... + (r2b-capitalize-title): Rename from capitalize... - * bib-mode.el (bib-capitalize-title-stop-words): Renamed from capit... - (bib-capitalize-title-stop-regexp): Renamed from capit... - (bib-capitalize-title-region): Renamed from capitalize... - (bib-capitalize-title): Renamed from capitalize... + * bib-mode.el (bib-capitalize-title-stop-words): Rename from capit... + (bib-capitalize-title-stop-regexp): Rename from capit... + (bib-capitalize-title-region): Rename from capitalize... + (bib-capitalize-title): Rename from capitalize... * edmacro.el (insert-kbd-macro): Duplicate definition deleted. @@ -22353,18 +22353,18 @@ New variables. (ediff-convert-standard-file-name): New function. Added on-line help, moved some functions to and from ediff-util.el. - (ediff-file-remote-p): Modified. + (ediff-file-remote-p): Modify. (ediff-set-face-pixmap): New function. (ediff-odd-diff-pixmap, ediff-even-diff-pixmap, ediff-fine-diff-pixmap): New variables. - * ediff-ptch.el (ediff-context-diff-label-regexp): Fixed regexp. - (ediff-map-patch-buffer): Fixed beg/end patch boundaries. + * ediff-ptch.el (ediff-context-diff-label-regexp): Fix regexp. + (ediff-map-patch-buffer): Fix beg/end patch boundaries. Now checks for the return code from the patch program. Fixed ediff-patch-options, ediff-backup-extension, ediff-backup-specs. * ediff-merg.el, ediff-diff.el, ediff-init.el: * ediff-hook.el: Changed ediff-meta to ediff-mult. * ediff-ptch.el (ediff-backup-specs): New variable. - * ediff.el (ediff-documentation): Modified. + * ediff.el (ediff-documentation): Modify. * ediff-help.el: New file. * ediff-mult.el (ediff-intersect-directories) (ediff-meta-insert-file-info): Functions modified. @@ -22411,7 +22411,7 @@ * vc.el (vc-print-log): Set the display window so that it shows the current log entry completely. - * vc-hooks.el (vc-find-cvs-master): Fixed handling of "locally + * vc-hooks.el (vc-find-cvs-master): Fix handling of "locally added" files. 1996-09-16 Erik Naggum @@ -22488,15 +22488,15 @@ * bindings.el: New file, split out from loaddefs.el. * loadup.el: Load bindings.el. - * gud.el (gud-find-c-expr): Renamed from find-c-expr. + * gud.el (gud-find-c-expr): Rename from find-c-expr. Don't get fooled by if and while statements. - (gud-expr-compound): Renamed from expr-compound. - (gud-expr-compound-sep): Renamed from expr-compound-sep. - (gud-next-expr): Renamed from expr-next. - (gud-prev-expr): Renamed from expr-prev. - (gud-forward-sexp): Renamed from expr-forward-sexp. - (gud-backward-sexp): Renamed from expr-backward-sexp. - (gud-innermost-expr): Renamed from expr-cur. + (gud-expr-compound): Rename from expr-compound. + (gud-expr-compound-sep): Rename from expr-compound-sep. + (gud-next-expr): Rename from expr-next. + (gud-prev-expr): Rename from expr-prev. + (gud-forward-sexp): Rename from expr-forward-sexp. + (gud-backward-sexp): Rename from expr-backward-sexp. + (gud-innermost-expr): Rename from expr-cur. 1996-09-10 Per Abrahamsen @@ -22546,8 +22546,8 @@ 1996-09-05 Michael Kifer * viper-keym.el, viper.el (vip-scroll): - Changed to vip-scroll-screen, other modifications. - (vip-alternate-ESC): Changed to vip-alternate-Meta-key. + Change to vip-scroll-screen, other modifications. + (vip-alternate-ESC): Change to vip-alternate-Meta-key. * viper.el (vip-escape-to-vi, vip-prefix-arg-value) (vip-prefix-arg-value): Now work with prefix arguments and also will work with 2dw and d2d style commands. @@ -22556,7 +22556,7 @@ (vip-paren-match): Go to closing paren first. (vip-find-char-forward, vip-find-char-backward, vip-goto-char-forward) (vip-goto-char-backward): Functions modified. - (vip-set-hooks): Added viper to fortran-mode. + (vip-set-hooks): Add viper to fortran-mode. (viper-mode): Don't delete the startup message. * viper-keym.el: C-\ is now the meta key. C-z in insert mode now escapes to Vi. @@ -22565,9 +22565,9 @@ * viper-util.el, viper.el: Added pixmaps to replace-region and search faces. (vip-get-filenames-from-buffer): The argument is now optional. - (vip-ex-nontrivial-find-file-unix): Added the -d option to ls command. + (vip-ex-nontrivial-find-file-unix): Add the -d option to ls command. (vip-read-key): Inhibit quit added. - (vip-get-cursor-color): Fixed to work with XEmacs. + (vip-get-cursor-color): Fix to work with XEmacs. * viper-ex.el (ex-edit): Don't change to vi in dired mode. 1996-09-04 Richard Stallman @@ -22706,7 +22706,7 @@ (grep-regexp-alist, file-name-buffer-file-type-alist) (find-buffer-file-type, find-file-not-found-set-buffer-file-type) (find-file-binary, find-file-text, mode-line-format): - Moved to dos-nt.el. + Move to dos-nt.el. * winnt.el (save-to-unix-hook, revert-from-unix-hook) (using-unix-filesystems): Functions removed. === modified file 'lisp/ChangeLog.8' --- lisp/ChangeLog.8 2014-03-09 23:55:11 +0000 +++ lisp/ChangeLog.8 2014-08-28 22:18:39 +0000 @@ -3,13 +3,13 @@ * echistory.el (electric-command-history): Call Command-history-setup and command-history-mode using their new conventions. - * chistory.el (Command-history-setup): Don't switch buffers. Take - no args, and do not set major-mode, mode-name or the local map. + * chistory.el (Command-history-setup): Don't switch buffers. + Take no args, and do not set major-mode, mode-name or the local map. (command-history-mode): New function, does some of those things Command-history-setup used to do. (list-command-history): Call command-history-mode, not Command-history-setup. - (command-history): Renamed from command-history-mode. + (command-history): Rename from command-history-mode. 1999-12-31 Richard M. Stallman @@ -91,9 +91,9 @@ 1999-12-27 Jari Aalto - * add-log.el (change-log-version-number-regexp-list): Added tag + * add-log.el (change-log-version-number-regexp-list): Add tag :version 20.6. - (change-log-version-info-enabled): Added tag :version 20.6. + (change-log-version-info-enabled): Add tag :version 20.6. 1999-12-27 Jari Aalto @@ -103,13 +103,13 @@ (change-log-find-version): Rewritten. Use user-configurable version numbering regexp list change-log-version-number-regexp-list. - (change-log-find-version): Renamed to + (change-log-find-version): Rename to change-log-version-number-search. (add-log-file-name-function): New. - (change-log-search-vc-number): Added END parameter. Added doc + (change-log-search-vc-number): Add END parameter. Added doc string to function. - (change-log-version-rcs): Renamed. Was - change-log-search-vc-number. + (change-log-version-rcs): Rename. + Was change-log-search-vc-number. 1999-12-26 Thien-Thi Nguyen @@ -144,7 +144,7 @@ (hs-hide-block, hs-show-block, hs-show-region, hs-hide-level) (hs-mouse-toggle-hiding, hs-minor-mode): Rewrite. - (hs-isearch-show): Renamed from `hs-isearch-open-invisible'. + (hs-isearch-show): Rename from `hs-isearch-open-invisible'. (hs-isearch-show-temporary): New funcs. (hs-show-block-at-point, java-hs-forward-sexp): Delete funcs. @@ -214,9 +214,9 @@ * progmodes/antlr-mode.el: Minor syntax highlighting changes. (antlr-font-lock-default-face): Deletia. - (antlr-font-lock-tokendef-face): Changed color. - (antlr-font-lock-tokenref-face): Changed color. - (antlr-font-lock-literal-face): Changed color. + (antlr-font-lock-tokendef-face): Change color. + (antlr-font-lock-tokenref-face): Change color. + (antlr-font-lock-literal-face): Change color. (antlr-font-lock-additional-keywords): Minor changes. 1999-12-20 Carsten Dominik @@ -351,7 +351,7 @@ (reftex-index-phrases-sort-prefers-entry) (reftex-index-phrases-sort-in-blocks): New options. (reftex-index-macros): Option structure changed. - (reftex-index-macros-builtin): Added `repeat' item to each entry. + (reftex-index-macros-builtin): Add `repeat' item to each entry. (reftex-label-alist): Additional item in each entry to specify if the environment should be listed in the TOC. (eval-when-compile (require 'cl)) added. @@ -415,8 +415,8 @@ Additional argument FORMAT-KEY to preselect a citation format; (eval-when-compile (require 'cl)) added. - * textmodes/reftex-parse.el (reftex-context-substring): Optional - parameter to-end. + * textmodes/reftex-parse.el (reftex-context-substring): + Optional parameter to-end. (reftex-section-info): Deal with environment matches; (eval-when-compile (require 'cl)) added. @@ -440,12 +440,12 @@ (ps-mule-plot-composition): New function. (ps-mule-prepare-font-for-components): New function. (ps-mule-plot-components): New function. - (ps-mule-composition-prologue-generated): Renamed from + (ps-mule-composition-prologue-generated): Rename from ps-mule-cmpchar-prologue-generated. (ps-mule-composition-prologue): New named from ps-mule-cmpchar-prologue. Modified for new composition. (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar) - (ps-mule-prepare-cmpchar-font): Deleted. + (ps-mule-prepare-cmpchar-font): Delete. (ps-mule-string-encoding): New arg NO-SETFONT. (ps-mule-bitmap-prologue): In PostScript code of BuildGlyphCommon, check Composing, not Cmpchar. @@ -463,8 +463,8 @@ * international/fontset.el (vertical-centering-font-regexp): New variable. - * international/mule.el (mule-version): Updated to 5.0 (AOI). - (mule-version-date): Updated to 1999.12.7. + * international/mule.el (mule-version): Update to 5.0 (AOI). + (mule-version-date): Update to 1999.12.7. (with-category-table): New macro. * international/mule-cmds.el (encode-coding-char): Don't check @@ -477,9 +477,9 @@ * international/mule-util.el (set-nested-alist): Set BRANCHES (if non-nil) at the tail of ALIST. (compose-region, decompose-region, decompose-string) - (reference-point-alist, compose-chars): Moved to composite.el. + (reference-point-alist, compose-chars): Move to composite.el. (compose-chars-component, compose-chars-rule, decompose-composite-char): - Deleted. + Delete. * international/quail.el (quail-install-map): New optional arg NAME. (quail-get-translation): If DEF is a symbol but not a function, @@ -513,16 +513,16 @@ * language/thai-util.el (thai-category-table): Make it by make-category-table. (thai-composition-pattern): New variable. - (thai-compose-region, thai-compose-string): Use - with-category-table. + (thai-compose-region, thai-compose-string): + Use with-category-table. (thai-post-read-conversion): Just call thai-compose-region. - (thai-pre-write-conversion): Deleted. + (thai-pre-write-conversion): Delete. (thai-composition-function): New function. * language/tibet-util.el: Most functions rewritten. - (tibetan-char-p): Renamed from tibetan-char-examin. + (tibetan-char-p): Rename from tibetan-char-examin. (tibetan-composable-examin, tibetan-complete-char-examin) - (tibetan-vertical-stacking, tibetan-composition): Deleted. + (tibetan-vertical-stacking, tibetan-composition): Delete. (tibetan-add-components): New function. (tibetan-composition-function): New function. @@ -543,8 +543,8 @@ 1999-12-14 Gerd Moellmann - * international/mule-cmds.el (default-input-method): Specify - that it should be set after current-language-environment. + * international/mule-cmds.el (default-input-method): + Specify that it should be set after current-language-environment. * custom.el (custom-handle-keyword): Add :set-after. (custom-add-dependencies): New function. @@ -556,11 +556,11 @@ * progmodes/cc-make.el: Removed. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * Release of cc-mode 5.26 -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-cmds.el (c-forward-conditional): Handle an arbitrary target depth. Optionally count #else lines as clause limits, @@ -571,35 +571,35 @@ (c-down-conditional-with-else): New commands that uses the added functionality in `c-forward-conditional'. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-align.el (c-lineup-comment): Preserve the alignment with a comment on the previous line instead of preserving the comment-column. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm Fixes to IDL mode after input from Eric Eide : - * cc-engine.el (c-beginning-of-statement-1): Allow - `c-conditional-key' to be nil, for the benefit of IDL mode. + * cc-engine.el (c-beginning-of-statement-1): + Allow `c-conditional-key' to be nil, for the benefit of IDL mode. * cc-engine.el (c-guess-basic-syntax): Ditto. - cc-langs.el (C-IDL-class-key): Fixed. Don't match `class' + cc-langs.el (C-IDL-class-key): Fix. Don't match `class' but do match CORBA 2.3 `valuetype'. * cc-langs.el (c-IDL-access-key): New defconst. Should be nil for IDL. - * cc-langs.el (c-IDL-conditional-key): New defconst. Should - be nil for IDL. + * cc-langs.el (c-IDL-conditional-key): New defconst. + Should be nil for IDL. * cc-langs.el (c-IDL-comment-start-regexp): New defconst. Like C++. * cc-mode.el (idl-mode): Use new `c-IDL-*' defconsts. Also, set `c-method-key' and `c-baseclass-key' to nil. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-menus.el (cc-imenu-c++-generic-expression): Match classes with nonhanging open braces. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-align.el: Added docstrings to all lineup functions. @@ -610,12 +610,12 @@ comments. Use c-comment-prefix-regexp and comment-start-skip instead of hardcoded regexps. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm - * cc-cmds.el (c-beginning-of-defun, c-end-of-defun): Fixed eob + * cc-cmds.el (c-beginning-of-defun, c-end-of-defun): Fix eob behavior and return value as documented. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm Changes for new style variable init system: * cc-langs.el (c-common-init): Dito. @@ -639,12 +639,12 @@ the throws clause that might follow the function prototype in C++. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm - * cc-defs.el (c-beginning-of-macro): Fixed bug where point + * cc-defs.el (c-beginning-of-macro): Fix bug where point could move forward for macros that doesn't start in column 0. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-align.el (c-indent-multi-line-block) (c-lineup-whitesmith-in-block): Two new lineup functions for @@ -654,7 +654,7 @@ style. It should now handle all different braces uniformly in both hanging and non-hanging cases. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-cmds.el (c-indent-exp): Use a marker to save point to make it stay in the same position relative to the surrounding @@ -676,7 +676,7 @@ . Also extended the bsd and whitesmith styles with consistent brace placement for all constructs. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-cmds.el (c-context-line-break): Continue C++ comments too when point is in the middle of them. @@ -702,8 +702,8 @@ `normal-auto-fill-function' to implement the `c-ignore-auto-fill' variable. - * cc-cmds.el (c-beginning-of-statement): Use - `c-comment-prefix-regexp' to avoid ending up inside the + * cc-cmds.el (c-beginning-of-statement): + Use `c-comment-prefix-regexp' to avoid ending up inside the comment prefix. Better handling of comment starters and enders. Catch comments better when traversing code. Stop at preprocessor directives. @@ -711,7 +711,7 @@ * cc-defs.el (c-forward-comment): New subst to hide platform dependent quirks in `forward-comment'. - * cc-engine.el (c-literal-limits): Added NOT-IN-DELIMITER + * cc-engine.el (c-literal-limits): Add NOT-IN-DELIMITER argument. (c-literal-limits-fast): Implemented NEAR and NOT-IN-DELIMITER arguments. Activate this function by default when @@ -722,16 +722,16 @@ arguments. * cc-align.el (c-lineup-C-comments): Fixes to handle the - changed anchor position in the `c' syntactic symbol. Handle - more than stars in the comment prefix; use the new variable + changed anchor position in the `c' syntactic symbol. + Handle more than stars in the comment prefix; use the new variable `c-comment-prefix-regexp'. Don't indent text not preceded by a comment prefix to the right of the comment opener if it's long. * cc-langs.el: Fixes to mode initialization for new line breaking and paragraph filling method. Adaptive fill mode is - now activated at startup instead of deactivated. The - variables used for adaptive filling and paragraph movement are + now activated at startup instead of deactivated. + The variables used for adaptive filling and paragraph movement are also changed to incorporate the value of `c-comment-prefix-regexp'. `substitute-key-definition' is used to override some functions in the global map instead of @@ -741,31 +741,31 @@ javadoc markup at mode init. * cc-mode.el (c-setup-filladapt): A new convenience function - to configure Kyle E. Jones' Filladapt mode for CC Mode. This - function is intended to be used explicitly by the end user + to configure Kyle E. Jones' Filladapt mode for CC Mode. + This function is intended to be used explicitly by the end user only. * cc-vars.el (c-comment-prefix-regexp): New variable used to recognize the comment fill prefix inside comments. (c-block-comment-prefix): New name for - `c-comment-continuation-stars', which is now obsolete. It's - generalized to handle any character sequence. + `c-comment-continuation-stars', which is now obsolete. + It's generalized to handle any character sequence. (c-ignore-auto-fill): New variable used to selectively disable Auto Fill mode in specific contexts. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-cmds.el (c-comment-indent): Leave at least one space between the comment and the last nonblank character in the case where we look at the indentation of the comment on the previous line (case 4). - * cc-engine.el (c-beginning-of-statement-1): Added ``' to the + * cc-engine.el (c-beginning-of-statement-1): Add ``' to the list of characters that may start a statement (it's a sort of prefix operator in Pike, and isn't used at all in any of the other languages). -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-engine.el (c-guess-basic-syntax): Report brace list opens inside continued statements as statement-cont instead of @@ -775,12 +775,12 @@ context. Case 10B.2 changed. Also changed (the somewhat esoteric) case 9A to cope with this. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm - * cc-cmds.el (c-electric-brace): Added electric handling of + * cc-cmds.el (c-electric-brace): Add electric handling of the open brace for brace-elseif-brace. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-defs.el (c-with-syntax-table): New macro to easily switch syntax tables temporarily. @@ -789,26 +789,26 @@ member init argument lists split over several lines. Case 5D changed. - * cc-langs.el (c-Java-javadoc-paragraph-start): Added new tag + * cc-langs.el (c-Java-javadoc-paragraph-start): Add new tag @throws introduced in Javadoc 1.2. - * cc-menus.el (cc-imenu-java-generic-expression): Applied - patch from RMS to avoid infinite backtracking. + * cc-menus.el (cc-imenu-java-generic-expression): + Applied patch from RMS to avoid infinite backtracking. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-align.el (c-lineup-arglist): Handle "arglists" surrounded by [ ]. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-align.el (c-lineup-dont-change): Compensate properly for the column in langelem. - * cc-engine.el (c-syntactic-information-on-region): New - function to help debugging the syntactic analysis. + * cc-engine.el (c-syntactic-information-on-region): + New function to help debugging the syntactic analysis. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-align.el (c-lineup-template-args): Handle nested template arglists. @@ -824,18 +824,18 @@ * cc-styles.el (c-offsets-alist): Use `c-lineup-template-args' by default. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-engine.el (c-guess-basic-syntax): Pike allows a comma immediately before the closing paren in an arglist, so don't check that in Pike mode. Case 7A changed. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm - * cc-cmds.el (c-indent-region): Fixed bug where comment-only + * cc-cmds.el (c-indent-region): Fix bug where comment-only lines were ignored under certain conditions. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-align.el (c-lineup-template-args): New function for aligning continued template argument lists. @@ -844,68 +844,68 @@ lists containing function arglists split over several lines. Case 5D.1 changed. - * cc-engine.el (c-guess-basic-syntax): Fixed bug where + * cc-engine.el (c-guess-basic-syntax): Fix bug where template-args-cont didn't get recognized when the first - arglist opener line doesn't contain a template argument. New - case 5K. - -1999-12-12 Martin Stjernholm - - * cc-defs.el (c-point): Changed from subst to macro for + arglist opener line doesn't contain a template argument. + New case 5K. + +1999-12-12 Martin Stjernholm + + * cc-defs.el (c-point): Change from subst to macro for efficiency. - (c-beginning-of-defun-1, c-end-of-defun-1): New - beginning-of-defun/end-of-defun wrappers separated from + (c-beginning-of-defun-1, c-end-of-defun-1): + New beginning-of-defun/end-of-defun wrappers separated from c-point. * cc-menus.el (imenu-generic-expression) - (imenu-case-fold-search, imenu-progress-message): Dummy - definitions to avoid compiler warnings if imenu can't be + (imenu-case-fold-search, imenu-progress-message): + Dummy definitions to avoid compiler warnings if imenu can't be loaded. * cc-menus.el (cc-imenu-init): New function called at mode init. - * cc-mode.el (c-mode, c++-mode, objc-mode, java-mode): Moved - imenu initializations to cc-imenu-init. + * cc-mode.el (c-mode, c++-mode, objc-mode, java-mode): + Move imenu initializations to cc-imenu-init. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-engine.el (c-guess-basic-syntax): Slightly better check for lambda-intro-cont in Pike mode. Case 6 changed. - * cc-engine.el (c-looking-at-inexpr-block): Fixed bug where + * cc-engine.el (c-looking-at-inexpr-block): Fix bug where anything following "new Foo()" was considered an anonymous class body in Java mode. -1999-12-12 Barry A. Warsaw +1999-12-12 Barry A. Warsaw * cc-cmds.el (c-comment-line-break-function): When breaking in a string, don't insert a new line. -1999-12-12 Barry A. Warsaw +1999-12-12 Barry A. Warsaw * cc-engine.el (c-at-toplevel-p): New interface function which returns information useful to add-on authors. It tells you whether you're at a toplevel statement or not. -1999-12-12 Barry A. Warsaw +1999-12-12 Barry A. Warsaw * cc-cmds.el (c-comment-line-break-function): It is possible that forward-line does not land us at the bol, say if we're on the last line in a file. In that case, do a back-to-indentation instead of a forward-comment -1. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-engine.el (c-beginning-of-statement-1): Don't catch "default:" as normal label in case 4. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-engine.el (c-guess-basic-syntax): Use c-bitfield-key to recognize continued bitfield declarations. Case 5D.1 changed. * cc-langs.el: New variable c-bitfield-key. * cc-mode.el: New variable c-bitfield-key. -1999-12-12 Martin Stjernholm +1999-12-12 Martin Stjernholm * cc-engine.el (c-inside-bracelist-p): Tighter test for Java anonymous array expressions (i.e. "new Foo[] {.. bracelist @@ -917,8 +917,8 @@ keymap and minor-mode-alist stuff. Don't set zmacs-region-stays. (footnote-insert-text-marker, Footnote-insert-pointer-marker): Avoid `acons'. - (footnote-mode-line-string, Footnote-add-footnote): Remove - autoload cookie. + (footnote-mode-line-string, Footnote-add-footnote): + Remove autoload cookie. 1999-12-12 Richard Sharman @@ -967,8 +967,8 @@ * files.el (after-find-file): Use auto-save-visited-file-name if set. - * mail/feedmail.el (feedmail-find-eoh): Take - feedmail-queue-alternative-mail-header-separator into account. + * mail/feedmail.el (feedmail-find-eoh): + Take feedmail-queue-alternative-mail-header-separator into account. 1999-12-09 Stefan Monnier @@ -976,7 +976,7 @@ * font-lock.el (font-lock-multiline): New variable. (font-lock-add-keywords): Rename `major-mode' into `mode'. - (font-lock-remove-keywords): Added a dummy `mode' argument for + (font-lock-remove-keywords): Add a dummy `mode' argument for potential future support. (font-lock-fontify-anchored-keywords) (font-lock-fontify-keywords-region): Only handle multiline strings @@ -1059,8 +1059,8 @@ (x-defined-colors, face-color-supported-p, face-color-gray-p): Remove. - * facemenu.el (facemenu-read-color, list-colors-display): Use - defined-colors for all frame types. + * facemenu.el (facemenu-read-color, list-colors-display): + Use defined-colors for all frame types. (facemenu-color-equal): Use color-values for all frame types. * faces.el (read-face-attribute): For :foreground and :background @@ -1078,7 +1078,7 @@ types other than x and w32, but only if the terminal supports colors. Call tty-color-define instead of face-register-tty-color. - * term/x-win.el (xw-defined-colors): Renamed from + * term/x-win.el (xw-defined-colors): Rename from x-defined-colors. * term/w32-win.el (xw-defined-colors): Likewise. @@ -1091,7 +1091,7 @@ 1999-12-06 Inge Frick - * dired-aux.el (dired-do-shell-command): Changed documentation. + * dired-aux.el (dired-do-shell-command): Change documentation. (dired-shell-stuff-it): A `?' in COMMAND has now the same meaning as `*'. @@ -1103,11 +1103,11 @@ 1999-12-06 Sam Steingold - * progmodes/etags.el (etags-tags-completion-table): Modified the + * progmodes/etags.el (etags-tags-completion-table): Modify the regexp to allow for the CL symbols starting with `+*'. (tags-completion-table): Doc fix (it's an obarray, not an alist). - (tags-completion-table, tags-recognize-empty-tags-table): Remove - `function' quoting lambda. + (tags-completion-table, tags-recognize-empty-tags-table): + Remove `function' quoting lambda. (tags-with-face): New macro. (list-tags, tags-apropos): Use it. (tags-apropos-additional-actions): New user option. @@ -1116,31 +1116,31 @@ (tags-apropos-verbose): New user option. (etags-tags-apropos): Use it. (visit-tags-table-buffer, next-file): Use `unless'. - (recognize-empty-tags-table): Renamed to + (recognize-empty-tags-table): Rename to tags-recognize-empty-tags-table. (complete-tag): Call tags-complete-tag bypassing try-completion. 1999-12-06 Kenichi Handa - * international/mule.el (set-buffer-file-coding-system): Docstring - modified. + * international/mule.el (set-buffer-file-coding-system): + Docstring modified. 1999-12-05 Dirk Herrmann - * textmodes/bibtex.el (bibtex-hs-forward-sexp): Added to support + * textmodes/bibtex.el (bibtex-hs-forward-sexp): Add to support using the hideshow package. - (hs-special-modes-alist): Added entry for bibtex to allow the use + (hs-special-modes-alist): Add entry for bibtex to allow the use of the hideshow package. - (bibtex-hide-entry-bodies): Deleted as hiding of entry bodies is + (bibtex-hide-entry-bodies): Delete as hiding of entry bodies is not longer provided by bibtex.el directly. Instead the hideshow package should be used. - (bibtex-mode-map, bibtex-edit-menu, bibtex-mode): Delete - references to bibtex-hide-entry-bodies. + (bibtex-mode-map, bibtex-edit-menu, bibtex-mode): + Delete references to bibtex-hide-entry-bodies. 1999-12-05 Dirk Herrmann - * textmodes/bibtex.el: Copyright notice is up to date. Moved - maintainer information closer to the beginning of the bibtex.el + * textmodes/bibtex.el: Copyright notice is up to date. + Moved maintainer information closer to the beginning of the bibtex.el file. (bibtex-maintainer-salutation): New constant. (bibtex-version): New constant. @@ -1148,16 +1148,16 @@ bibtex-maintainer-salutation. (bibtex-entry-field-alist): Made booktitle field optional for @inproceedings entries when crossreferenced. - (bibtex-entry-field-alist): Added booktitle field to proceedings + (bibtex-entry-field-alist): Add booktitle field to proceedings entry type (for cross referencing). Thanks to Wagner Toledo Correa for the suggestion. - (bibtex-string-file-path): Fixed typo. + (bibtex-string-file-path): Fix typo. 1999-12-05 Carsten Dominik * textmodes/bibtex.el (bibtex-mode-map): Reserved the key `C-c &' for reftex.el. - (bibtex-edit-menu): Added `reftex-view-crossref-from-bibtex' to menu. + (bibtex-edit-menu): Add `reftex-view-crossref-from-bibtex' to menu. 1999-12-04 Dave Love @@ -1166,14 +1166,14 @@ 1999-12-04 Michael Kifer - * viper-cmd.el (viper-change-state): Use - viper-ESC-moves-cursor-back to decide whether to move the cursor + * viper-cmd.el (viper-change-state): + Use viper-ESC-moves-cursor-back to decide whether to move the cursor back. 1999-12-03 Kenichi Handa - * international/mule-util.el (truncate-string-to-width): Docstring - fixed. + * international/mule-util.el (truncate-string-to-width): + Docstring fixed. 1999-12-02 Stefan Monnier @@ -1200,8 +1200,8 @@ * vc.el (vc-update-change-log): Look for rcs2log under exec-directory. - * emacs-lisp/lisp-mode.el (lisp-mode-variables): Change - outline-regexp, add outline-level. + * emacs-lisp/lisp-mode.el (lisp-mode-variables): + Change outline-regexp, add outline-level. (lisp-outline-level): New. * calendar/appt.el (appt-convert-time): Handle "12:MMam", @@ -1284,8 +1284,8 @@ * cus-start.el: Add use-dialog-box. * add-log.el (change-log-mode-hook): Customize. - (add-log-current-defun): Use - fortran-{beginning,end}-of-subprogram. + (add-log-current-defun): + Use fortran-{beginning,end}-of-subprogram. 1999-11-26 Richard M. Stallman @@ -1330,10 +1330,10 @@ * ediff-merge.el (ediff-looks-like-combined-merge) (ediff-get-combined-region): - Changed to support the new format for ediff-combination-pattern. + Change to support the new format for ediff-combination-pattern. * ediff-diff.el (ediff-set-fine-overlays-in-one-buffer): - Changed to support the new format for ediff-combination-pattern. + Change to support the new format for ediff-combination-pattern. 1999-11-24 Dave Love @@ -1368,8 +1368,8 @@ imenu-generic-expression. * sql.el (sql-mode): Use ?_ and ?. instead of 95 and 46 when - setting font-lock-defaults' SYNTAX-ALIST. Set - imenu-generic-expression, imenu-case-fold-search, and + setting font-lock-defaults' SYNTAX-ALIST. + Set imenu-generic-expression, imenu-case-fold-search, and imenu-syntax-alist. * sql.el (sql-interactive-mode): Use ?_ and ?. instead of 95 @@ -1389,30 +1389,30 @@ 1999-11-23 Dave Love - * progmodes/fortran.el (fortran-comment-line-start): Renamed from + * progmodes/fortran.el (fortran-comment-line-start): Rename from comment-line-start. - (fortran-comment-line-start-skip): Renamed from + (fortran-comment-line-start-skip): Rename from comment-line-start-skip. (fortran-mode-map): Use renamed functions. Add manual and custom entries to menu. (fortran-mode-hook): Customize. - (fortran-comment-indent-function): Renamed from + (fortran-comment-indent-function): Rename from fortran-comment-hook. (delete-horizontal-regexp): Function deleted. - (fortran-electric-line-number): Simplified. - (fortran-beginning-of-subprogram): Renamed from + (fortran-electric-line-number): Simplify. + (fortran-beginning-of-subprogram): Rename from beginning-of-fortran-subprogram. - (fortran-end-of-subprogram): Renamed from + (fortran-end-of-subprogram): Rename from end-of-fortran-subprogram. - (fortran-mark-subprogram): Renamed from mark-fortran-subprogram. - (fortran-previous-statement, fortran-next-statement): Simplified. + (fortran-mark-subprogram): Rename from mark-fortran-subprogram. + (fortran-previous-statement, fortran-next-statement): Simplify. (fortran-blink-match): New function. (fortran-blink-matching-if, fortran-blink-matching-do): Use it. (fortran-indent-to-column): Don't use delete-horizontal-regexp. - (fortran-find-comment-start-skip, fortran-is-in-string-p): Use - line-end-position. + (fortran-find-comment-start-skip, fortran-is-in-string-p): + Use line-end-position. (fortran-fill): No longer interactive. Simplified. - (fortran-break-line): Simplified. + (fortran-break-line): Simplify. (fortran-analyze-file-format): Use char-after, not looking-at. * emacs-lisp/find-func.el (find-function-regexp): @@ -1432,7 +1432,7 @@ * emacs-lisp/easy-mmode.el: Changed maintainer. (easy-mmode-define-toggle): New BODY arg; Never append `-mode'; Use defcustom for the hooks; Improve the auto-generated docstrings. - (easy-mmode-define-minor-mode): Renamed `define-minor-mode'. + (easy-mmode-define-minor-mode): Rename `define-minor-mode'. (define-minor-mode): Add BODY arg; Only declare the keymap if provided; Improve the auto-generated docstrings. @@ -1498,8 +1498,8 @@ * speedbar.el: Clean up comment at the start of the file. Remove RCS id. - * progmodes/compile.el (compilation-parse-errors): Use - compilation-buffer-p instead of testing major-mode. + * progmodes/compile.el (compilation-parse-errors): + Use compilation-buffer-p instead of testing major-mode. 1999-11-18 Dave Pearson @@ -1546,9 +1546,9 @@ * goto-addr.el (goto-address-at-mouse) (goto-address-find-address-at-point): Use compose-mail. - (goto-address-mail-method): Removed variable. + (goto-address-mail-method): Remove variable. (goto-address-send-using-mh-e, goto-address-send-using-mhe) - (goto-address-send-using-mail): Removed functions. + (goto-address-send-using-mail): Remove functions. 1998-11-15 Sam Steingold @@ -1583,7 +1583,7 @@ 1999-11-14 Alex Schroeder - * ansi-color.el (ansi-color-apply): Updated regexps to include + * ansi-color.el (ansi-color-apply): Update regexps to include highlighted face. 1999-01-14 Johan Vromans @@ -1599,11 +1599,11 @@ 1999-11-13 Peter Breton - * net-utils.el (run-network-program, net-utils-run-program): Use - the new backquote syntax. + * net-utils.el (run-network-program, net-utils-run-program): + Use the new backquote syntax. (smbclient-program, smbclient-program-options) - (smbclient-prompt-regexp, smbclient-font-lock-keywords): New - variables. + (smbclient-prompt-regexp, smbclient-font-lock-keywords): + New variables. (smbclient, smbclient-list-shares): New functions 1999-11-12 Sam Steingold @@ -1638,7 +1638,7 @@ 1999-11-12 Peter Kleiweg - * progmodes/ps-mode.el (ps-mode-submit-bug-report): Added list + * progmodes/ps-mode.el (ps-mode-submit-bug-report): Add list of customizable variables to bug report message. Added system-type to package name in bug report. @@ -1655,8 +1655,8 @@ 1999-11-10 Peter Kleiweg - * progmodes/ps-mode.el (ps-mode-maintainer-address): New - constant. + * progmodes/ps-mode.el (ps-mode-maintainer-address): + New constant. (ps-mode-submit-bug-report): New function. Entry added to menu. 1999-11-10 William M. Perry @@ -1685,7 +1685,7 @@ 1999-11-08 Peter Kleiweg - * progmodes/ps-mode.el (ps-mode-print-function): Changed default + * progmodes/ps-mode.el (ps-mode-print-function): Change default lpr-command to "lp" for some system-types. (copied from lpr.el Emacs version 20.2.1). @@ -1727,8 +1727,8 @@ * isearch.el (isearch-complete-edit, isearch-ring-advance-edit): Use erase-field instead of erase-buffer. - * frame.el (blink-cursor-mode, blink-cursor-end): Use - internal-show-cursor with new interface. + * frame.el (blink-cursor-mode, blink-cursor-end): + Use internal-show-cursor with new interface. (blink-cursor-timer-function): New. (blink-cursor-start): Use blink-cursor-timer-function. @@ -1760,8 +1760,8 @@ 1999-11-01 Markus Rost - * dired-x.el (dired-smart-shell-command): Use - shell-command-history as in shell-command. + * dired-x.el (dired-smart-shell-command): + Use shell-command-history as in shell-command. 1999-11-01 Richard M. Stallman @@ -1775,7 +1775,7 @@ of show-cursor. (blink-cursor-start, blink-cursor-end): Ditto. - * textmodes/tex-mode.el (tex-default-mode): Changed to latex-mode. + * textmodes/tex-mode.el (tex-default-mode): Change to latex-mode. 1999-11-01 Richard M. Stallman @@ -1792,7 +1792,7 @@ * ediff.el: Version change. - * ediff-util.el (ediff-cleanup-mess): Fixed the case of dead windows. + * ediff-util.el (ediff-cleanup-mess): Fix the case of dead windows. make sure you are in a good frame before deleting other windows. (ediff-file-checked-in-p): Don't consider CVS @@ -1816,10 +1816,10 @@ * viper-keym.el: Fixed calls to viper-ex, change key C-c g to C-c C-g. - * viper-util.el (viper-nontrivial-find-file-function): Deleted. + * viper-util.el (viper-nontrivial-find-file-function): Delete. (viper-glob-unix-files, viper-glob-mswindows-files): New functions. (viper-save-cursor-color, viper-restore-cursor-color): - Improved cursor color handling. + Improve cursor color handling. (viper-get-saved-cursor-color-in-replace-mode) (viper-get-saved-cursor-color-in-insert-mode): New functions for better cursor color handling. @@ -1874,7 +1874,7 @@ `whitespace-check-' to nil. (whitespace-unchecked-whitespaces): New function to return the list of whitespaces for whom checks have been suppressed. - (whitespace-display-unchecked-whitespaces): Renamed to + (whitespace-display-unchecked-whitespaces): Rename to `whitespace-update-modeline' to reflect its functionality. 1999-10-30 Gerd Moellmann @@ -1895,8 +1895,8 @@ * progmodes/ada-stmt.el, progmodes/ada-xref.el: Doc-string and comment fixes. - * progmodes/compile.el (compilation-error-regexp-alist): Recognize - MIPS Pro 7.3 compiler error message syntax. + * progmodes/compile.el (compilation-error-regexp-alist): + Recognize MIPS Pro 7.3 compiler error message syntax. 1999-10-27 Dave Love @@ -1909,7 +1909,7 @@ 1999-10-27 Dave Love * emacs-lisp/advice.el: Doc fixes. - (ad-lemacs-p): Removed. + (ad-lemacs-p): Remove. (advice): Add :link to defgroup. 1999-10-27 Kenichi Handa @@ -1924,11 +1924,11 @@ 1999-10-27 Richard M. Stallman - * emacs-lisp/advice.el (ad-activate-internal): Renamed from + * emacs-lisp/advice.el (ad-activate-internal): Rename from ad-activate. All callers changed, including those in data.c. - (ad-activate-internal-off): Renamed from ad-activate-off. + (ad-activate-internal-off): Rename from ad-activate-off. All uses changed. - (ad-activate): Renamed from ad-activate-on. All uses changed. + (ad-activate): Rename from ad-activate-on. All uses changed. (ad-start-advice, ad-stop-advice, ad-recover-normality): Alter the definition of ad-activate-internal, not ad-activate. @@ -1951,7 +1951,7 @@ 1999-10-25 Sam Steingold - * Makefile (compile-files): Fixed the "tr" strings. + * Makefile (compile-files): Fix the "tr" strings. (EMACS): Set to ../src/emacs. 1999-10-25 Gerd Moellmann @@ -2037,10 +2037,10 @@ * ps-print-def.el: New file: common definitions for all parts of ps-print. - (ps-multibyte-buffer): Moved from ps-mule. + (ps-multibyte-buffer): Move from ps-mule. * ps-mule.el: File dependence fix. - (ps-multibyte-buffer): Moved to ps-print-def. + (ps-multibyte-buffer): Move to ps-print-def. * ps-print.el: Doc fix, better customization. (ps-print-region-function, ps-number-of-columns, ps-spool-tumble) @@ -2070,7 +2070,7 @@ * ps-print.el: Doc fix, n-up printing. (ps-print-version): New version number (5.0). - (ps-page-dimensions-database): Added document media. + (ps-page-dimensions-database): Add document media. (ps-n-up-printing, ps-n-up-margin, ps-n-up-border-p, ps-n-up-filling) (ps-page-order, ps-printing-region-p): New vars. (ps-n-up-printing, ps-n-up-filling, ps-header-sheet, ps-end-job): @@ -2085,8 +2085,8 @@ (ps-setup, ps-begin-file, ps-get-buffer-name, ps-begin-job) (ps-end-file, ps-dummy-page, ps-generate): Fix funs. (ps-print-prologue-1): Adjust PostScript programming for n-up printing. - (ps-count-lines): Changed to defun. - (ps-header-page): Changed to defsubst, fix fun. + (ps-count-lines): Change to defun. + (ps-header-page): Change to defsubst, fix fun. (ps-printing-region): Doc fix, adjust programming code. (ps-output-boolean, ps-background-pages, ps-background-text) (ps-background-image, ps-background, ps-get-boundingbox): @@ -2097,9 +2097,9 @@ * ps-print.el: Doc fix, duplex and setpagedevice configuration. (ps-print-version): New version number (4.2). (ps-spool-config, ps-spool-tumble): New vars. - (ps-print-prologue-1): Changed to defconst, adjust PostScript + (ps-print-prologue-1): Change to defconst, adjust PostScript programming, new PostScript procedure to handle errors. - (ps-print-prologue-2): Changed to defconst. + (ps-print-prologue-2): Change to defconst. (ps-print-duplex-feature): New const: duplex and tumble setting. (ps-setup, ps-begin-file): Fix funs. (ps-boolean-capitalized): New fun. @@ -2107,9 +2107,9 @@ 1999-10-19 Stefan Monnier * Makefile (dontcompilefiles): Obsoleted. - (DONTCOMPILE): Added emacs-lisp/cl-specs.el. + (DONTCOMPILE): Add emacs-lisp/cl-specs.el. (EL): Unused. - (temacs): Removed (unused). + (temacs): Remove (unused). (cus-load.el, finder-inf.el, loaddefs.el): New targets to build a dummy version of the file (necessary for the update to work properly). (autoloads): Force the use of `pwd`/loaddefs.el. @@ -2139,18 +2139,18 @@ value: \"lpr\" changed to "lpr". (ps-mode-version): New constant. (ps-mode-show-version): New function, added key in ps-mode-map. - (ps-run-messages): Removed. + (ps-run-messages): Remove. (ps-run-font-lock-keywords-2): New defcustom variable replacing ps-run-messages. These keywords now include the value of ps-run-prompt, making its fontification customizable. - (ps-run-init): Removed \\n from docstring, it is now added when + (ps-run-init): Remove \\n from docstring, it is now added when the value is used. - (ps-run-font-lock-keywords-1): Added checking for initial ^ in + (ps-run-font-lock-keywords-1): Add checking for initial ^ in ps-run-prompt. - (ps-mode): Added ps-run-font-lock-keywords-2 to list of + (ps-mode): Add ps-run-font-lock-keywords-2 to list of customizable variables in doc-string (its equivalent ps-run-messages was missing in previous version of the doc-string). - (ps-run-mode): Simplified assignment to font-lock-defaults, using + (ps-run-mode): Simplify assignment to font-lock-defaults, using symbols only. 1999-10-19 Alex Schroeder @@ -2177,7 +2177,7 @@ (set-display-table-and-terminal-coding-system): New function, containing code migrated out of set-language-environment. (set-language-environment, set-locale-environment): Use it. - (locale-translation-file-name): Moved here from startup.el. + (locale-translation-file-name): Move here from startup.el. (locale-language-names, locale-preferred-coding-systems): New vars. (locale-name-match, set-locale-environment): New functions. @@ -2253,7 +2253,7 @@ 1999-10-17 Sam Steingold - * bindings.el (completion-ignored-extensions): Added ".sparcf" + * bindings.el (completion-ignored-extensions): Add ".sparcf" for CMUCL on sparc and ".ufsl" for LispWorks. (bound-and-true-p): Bugfix: free variable `v'. @@ -2342,8 +2342,8 @@ 1999-10-12 Stefan Monnier - * simple.el (shell-command, shell-command-on-region): Use - make-temp-file. + * simple.el (shell-command, shell-command-on-region): + Use make-temp-file. (clone-buffer, clone-process, clone-buffer-hook): New functions. * subr.el (with-current-buffer): Don't use backquotes to avoid @@ -2369,16 +2369,16 @@ 1999-10-12 Richard Sharman * sh-script.el: Added support for indenting existing scripts. - (sh-mode-map): Added new bindings. - (sh-mode): Updated mode doc-string for new commands, added + (sh-mode-map): Add new bindings. + (sh-mode): Update mode doc-string for new commands, added make-local-variable calls, initialize mode-specific variables. - (sh-indent-line): Renamed to sh-basic-indent-line; sh-indent-line + (sh-indent-line): Rename to sh-basic-indent-line; sh-indent-line is now a different function. - (sh-header-marker): Changed docstring. + (sh-header-marker): Change docstring. (sh-set-shell): Initialize mode-specific variables. (sh-case, sh-for, sh-if, sh-indexed-loop, sh-repeat, sh-select) (sh-tmp-file, sh-until, sh-until, sh-while, sh-while-getopts): - Changed these define-skeleton calls to work with user-specified + Change these define-skeleton calls to work with user-specified indentation settings. (sh-basic-indent-line, sh-blink, sh-calculate-indent) (sh-check-paren-in-case, sh-check-rule, sh-do-nothing) @@ -2602,9 +2602,9 @@ (isearch-yank-x-selection, isearch-ring-advance-edit): Doc fix. (isearch-ring-retreat-edit): Doc fix. (isearch-mouse-yank): New command. - (isearch-last-command-char): Removed. Callers changed to use + (isearch-last-command-char): Remove. Callers changed to use last-command-char. - (isearch-char-to-string): Removed. Callers changed to use + (isearch-char-to-string): Remove. Callers changed to use char-to-string. 1999-09-26 Oleg S. Tihonov @@ -2652,7 +2652,7 @@ * textmodes/reftex-parse.el (reftex-parse-from-file): Scan for multiple thebibliography environments. - * textmodes/reftex-cite.el (reftex-pop-to-bibtex-entry): Fixed bug + * textmodes/reftex-cite.el (reftex-pop-to-bibtex-entry): Fix bug with recentering window. (reftex-extract-bib-entries-from-thebibliography) (reftex-offer-bib-menu, reftex-bibtex-selection-callback): @@ -2749,7 +2749,7 @@ `copy-file'. (dired-copy-file-recursive): New function. Copy directories recursively. - (dired-do-create-files): Added support for generalized directory + (dired-do-create-files): Add support for generalized directory target. How-to function may now return a function. New fluid variable `dired-one-file'. (dired-copy-how-to-fn): New variable. @@ -2770,8 +2770,8 @@ * whitespace.el (whitespace-modes): Add `change-log-mode' to the list of modes to be checked for bogus whitespaces. - * whitespace.el (whitespace-rescan-timer-time): Update - documentation. + * whitespace.el (whitespace-rescan-timer-time): + Update documentation. * whitespace.el (whitespace-display-unchecked-whitespaces): New function to update modeline with untested whitespaces. @@ -2816,8 +2816,8 @@ (widget-button-pressed-face): New variable. (widget-button-click): Use it. (widget-documentation-link-add): Specify mouse and button faces. - (widget-echo-help-mouse, widget-stop-mouse-tracking): Functions - removed now the functionality is built in. + (widget-echo-help-mouse, widget-stop-mouse-tracking): + Functions removed now the functionality is built in. * cus-edit.el: Don't define-widget-keywords. (multimedia): New group. @@ -2842,8 +2842,8 @@ (custom-variable-set, custom-variable-save, custom-face-state-set) (custom-variable-reset-saved, custom-variable-reset-standard) (custom-face-set, custom-face-save, custom-face-reset-saved) - (custom-face-reset-standard, customize-save-customized): Handle - custom comments. + (custom-face-reset-standard, customize-save-customized): + Handle custom comments. (custom-comment-face, custom-comment-tag-face): New face. (custom-comment): New widget. (custom-comment-create, custom-comment-delete) @@ -2936,8 +2936,8 @@ * emacs-lisp/byte-opt.el (byte-optimize-backward-char): (byte-optimize-backward-word): New optimizations. - (side-effect-free-fns, side-effect-and-error-free-fns): Add - entries. + (side-effect-free-fns, side-effect-and-error-free-fns): + Add entries. 1999-09-09 Gerd Moellmann @@ -2973,7 +2973,7 @@ 1999-09-08 Peter Breton - * generic-x.el (generic-define-unix-modes): Added new modes: + * generic-x.el (generic-define-unix-modes): Add new modes: inetd-conf-generic-mode, etc-services-generic-mode, etc-passwd-generic-mode. These are all defined for Unix by default. (apache-generic-mode): Use an imenu-generic-expression to list @@ -2985,11 +2985,11 @@ font-lock-defaults setting. (java-properties-generic-mode): Supports both ! and # as comment characters. - (java-properties-generic-mode): Added an imenu-generic-expression. - (java-properties-generic-mode): Reworked to support the various + (java-properties-generic-mode): Add an imenu-generic-expression. + (java-properties-generic-mode): Rework to support the various different ways to separate name and value (viz, '=', ':' and whitespace). - (show-tabs-generic-mode): Added this new generic-mode. + (show-tabs-generic-mode): Add this new generic-mode. 1999-09-08 Richard Stallman @@ -3059,7 +3059,7 @@ 1999-09-07 Dave Pearson - * quickurl.el (quickurl-list-focused-line): Removed. + * quickurl.el (quickurl-list-focused-line): Remove. (quickurl-list-insert): Now works out the focused line using `count-lines' instead of using `quickurl-list-focused-line'. @@ -3072,7 +3072,7 @@ * isearch.el (isearch-mode-map): Add mouse-2. - * mail/rmail.el (rmail-read-password): Deleted. + * mail/rmail.el (rmail-read-password): Delete. (rmail-get-pop-password): Use read-password. * quickurl.el: Don't conditionally define caddr. @@ -3085,8 +3085,8 @@ 1999-09-06 Stephen Eglen - * progmodes/octave-inf.el (inferior-octave-startup-args): Add - --no-line-editing so that TABs in source files are not interpreted + * progmodes/octave-inf.el (inferior-octave-startup-args): + Add --no-line-editing so that TABs in source files are not interpreted as completion requests. 1999-09-06 Gerd Moellmann @@ -3112,7 +3112,7 @@ 1999-09-06 Dave Love - * emacs-lisp/byte-opt.el (byte-boolean-vars): Removed. (Now primitive.) + * emacs-lisp/byte-opt.el (byte-boolean-vars): Remove. (Now primitive.) 1999-09-05 Richard Stallman @@ -3128,7 +3128,7 @@ 1999-09-05 Gerd Moellmann - * faces.el (header-line): Renamed from `top-line'. + * faces.el (header-line): Rename from `top-line'. 1999-09-05 Gerd Moellmann @@ -3183,20 +3183,20 @@ * startup.el (command-line): Compute the value of small-temporary-file-directory. - * ediff-init.el (ediff-temp-file-prefix): Use - small-temporary-file-directory if non-nil. + * ediff-init.el (ediff-temp-file-prefix): + Use small-temporary-file-directory if non-nil. * vc.el (vc-update-change-log): Likewise. * progmodes/cmacexp.el (c-macro-expansion): Likewise. - * simple.el (shell-command, shell-command-on-region): Use - make-temp-name properly. Use small-temporary-file-directory if + * simple.el (shell-command, shell-command-on-region): + Use make-temp-name properly. Use small-temporary-file-directory if non-nil, otherwise temporary-file-directory, to generate temporary files. - * dos-w32.el (direct-print-region-helper): Use - temporary-file-directory. (From Stefan Monnier.) + * dos-w32.el (direct-print-region-helper): + Use temporary-file-directory. (From Stefan Monnier.) 1999-09-02 Richard Stallman @@ -3237,8 +3237,8 @@ * progmodes/compile.el (compilation-error-regexp-alist): New item for SGI IRIX MipsPro compilers. - * speedbar.el (speedbar-directory-buttons): Recognize - device names when checking for file names. + * speedbar.el (speedbar-directory-buttons): + Recognize device names when checking for file names. * array.el (array-reconfigure-rows): Use generate-new-buffer. @@ -3271,8 +3271,8 @@ * comint.el (comint-input-ring-separator): New variable. (comint-read-input-ring): Doc change; use comint-input-ring-separator when reading file. - (comint-write-input-ring): Use - comint-input-ring-separator when writing file. + (comint-write-input-ring): + Use comint-input-ring-separator when writing file. 1999-08-29 Marc Girod @@ -3306,8 +3306,8 @@ * calendar/cal-move.el: Call the new hook in every movement function. - * calendar/calendar.el (calendar-goto-astro-day-number): Autoload - the right function name. + * calendar/calendar.el (calendar-goto-astro-day-number): + Autoload the right function name. 1999-08-26 Stephen Gildea @@ -3316,7 +3316,7 @@ (time-stamp): Support multi-line patterns. (time-stamp-inserts-lines): New variable. (time-stamp-count): New variable. - (time-stamp-string-preprocess): Fixed bug where "%%a" becomes + (time-stamp-string-preprocess): Fix bug where "%%a" becomes "Thu" instead of "%a". 1999-08-25 Gerd Moellmann @@ -3338,7 +3338,7 @@ 1999-08-24 Gerd Moellmann - * faces.el (margin): Renamed from bitmap-area. + * faces.el (margin): Rename from bitmap-area. 1999-08-24 Alex Schroeder @@ -3423,8 +3423,8 @@ 1999-08-16 Karl Heuer - * subr.el (assoc-ignore-case, assoc-ignore-representation): Moved - here from simple.el. + * subr.el (assoc-ignore-case, assoc-ignore-representation): + Move here from simple.el. 1999-08-16 Dave Love @@ -3461,17 +3461,17 @@ 1999-08-16 Carsten Dominik - * textmodes/reftex.el (reftex-pop-to-bibtex-entry): Fixed - conflict with pop-up-frames. + * textmodes/reftex.el (reftex-pop-to-bibtex-entry): + Fix conflict with pop-up-frames. (reftex-special-environment-parsers): New constant. (reftex-label-alist): car of an entry can also be a function. (reftex-what-special-env): Cew function. (reftex-label-location): Call `reftex-what-special-env'. (reftex-compile-variables): Check for symbol in `reftex-label-alist'. - (reftex-what-environment): Fixed bug with stacked environments of + (reftex-what-environment): Fix bug with stacked environments of same kind (e.g. enumerate). (reftex-process-string): Preserve default directory. - (reftex-label-alist-builtin): Changed prefixes of endnote and footnote. + (reftex-label-alist-builtin): Change prefixes of endnote and footnote. Also the magic words. (reftex-reference): Interpret new option `reftex-fref-is-default'. (reftex-replace-prefix-escapes): Interpret new `%S' format. @@ -3486,7 +3486,7 @@ boundaries has been moved to `F'. (reftex-select-label-map): Toggling display of file boundaries is now on the `F' key, for consistency with `reftex-toc-map'. - (reftex-erase-all-selection-and-index-buffers): Renamed from + (reftex-erase-all-selection-and-index-buffers): Rename from `reftex-erase-all-selection-buffer'. Now also kills the index buffers. (reftex-viewing-cross-references): Customization group renamed @@ -3604,7 +3604,7 @@ be the same size when necessary to fit all the rings in the window; and poles can be oriented horizontally. Face support is thrown in gratuitously. - (hanoi): Changed default number of rings back to 3. + (hanoi): Change default number of rings back to 3. (hanoi-unix, hanoi-unix-64): New commands. (hanoi-horizontal-flag, hanoi-move-period, hanoi-use-faces) (hanoi-pole-face, hanoi-base-face, hanoi-even-ring-face) @@ -3612,15 +3612,15 @@ (hanoi-internal, hanoi-current-time-float, hanoi-put-face) (hanoi-n, hanoi-insert-ring, hanoi-goto-char, hanoi-sit-for) (hanoi-ring-to-pos, hanoi-pos-on-tower-p): New functions. - (hanoi-0): Renamed from hanoi0, for symmetry with hanoi-n. - (hanoi-topos, hanoi-draw-ring): Removed. + (hanoi-0): Rename from hanoi0, for symmetry with hanoi-n. + (hanoi-topos, hanoi-draw-ring): Remove. 1999-08-12 Gerd Moellmann * faces.el (face-valid-attribute-values): Return an alist for families on ttys. - (face-read-integer): Handle unspecified face attributes. Add - completion for `unspecified'. + (face-read-integer): Handle unspecified face attributes. + Add completion for `unspecified'. (read-face-attribute): Handle unspecified font attributes. (face-valid-attribute-values): Add `unspecified' to lists so that it can be chosen via completion. @@ -3658,7 +3658,7 @@ (easy-menu-change): Doc fix. * info-look.el (info-lookup-guess-c-symbol): Use skip-syntax-backward. - (info-lookup-guess-default): Simplified and cleaned up. + (info-lookup-guess-default): Simplify and cleaned up. (info-lookup-guess-default*): Preserve point. * view.el (view-mode-disable): If buffer-read-only is nil, @@ -3678,13 +3678,13 @@ 1999-08-10 Alex Schroeder - * ansi-color.el (ansi-color-to-text-properties): Added New state 5 + * ansi-color.el (ansi-color-to-text-properties): Add New state 5 to prevent m-eating-bug. 1999-08-10 Eli Zaretskii - * term/pc-win.el (msdos-bg-mode): Remove. Call - frame-set-background-mode instead. All callers changed. + * term/pc-win.el (msdos-bg-mode): Remove. + Call frame-set-background-mode instead. All callers changed. (msdos-face-setup): Don't force color display parameter, it is set by frame-set-background-mode. (make-msdos-frame): Call x-handle-reverse-video and @@ -3695,8 +3695,8 @@ 1999-08-10 Dave Love - * emacs-lisp/advice.el (ad-make-single-advice-docstring): Treat - case with no docstring specially. + * emacs-lisp/advice.el (ad-make-single-advice-docstring): + Treat case with no docstring specially. 1999-08-09 Eli Zaretskii @@ -3705,8 +3705,8 @@ 1999-08-07 Dave Love - * man.el (Man-softhyphen-to-minus): Revert previous change. Avoid - unibyte to multibyte conversion of search-forward (from Handa), + * man.el (Man-softhyphen-to-minus): Revert previous change. + Avoid unibyte to multibyte conversion of search-forward (from Handa), but avoid the replacement if the language is Latin-N. 1999-08-06 Richard Stallman @@ -3811,14 +3811,14 @@ (apply-on-rectangle): New function, mostly replaces `operate-on-rectangle'. All callers changed. (move-to-column-force): Pass new second argument to `move-to-column'. - (kill-rectangle): Added optional prefix arg to fill lines. + (kill-rectangle): Add optional prefix arg to fill lines. (delete-rectangle): Ditto. (delete-whitespace-rectangle): Ditto. (delete-extract-rectangle): Ditto. (open-rectangle): Ditto. (clear-rectangle): Ditto. (delete-whitespace-rectangle-line): New function. - (delete-rectangle-line): Added third arg FILL. + (delete-rectangle-line): Add third arg FILL. (delete-extract-rectangle-line): Ditto. (open-rectangle-line): Ditto. (clear-rectangle-line): Ditto. @@ -3876,7 +3876,7 @@ frame-delete-all. * frame.el: Change comments to doc strings and other doc fixes. - (frame-delete-all): Moved to subr.el as `assoc-delete-all'. + (frame-delete-all): Move to subr.el as `assoc-delete-all'. Callers changed. (set-background-color, set-foreground-color, set-cursor-color) (set-mouse-color, set-border-color): Offer completion of colors. @@ -3948,7 +3948,7 @@ * mouse.el (x-fixed-font-alist): Add lucidasanstypewriter. * msb.el: Require cl only when compiling. - (msb--home-dir): Deleted. + (msb--home-dir): Delete. (msb--format-title): Use abbreviate-file-name. (msb--choose-file-menu): Simplify string comparison. @@ -3980,7 +3980,7 @@ 1999-07-26 Kenichi Handa * international/ccl.el (ccl-embed-symbol): New function. - (ccl-program-p): Deleted. Now it's implemented in C code. + (ccl-program-p): Delete. Now it's implemented in C code. (ccl-compile-call): Use ccl-embed-symbol to embed a symbol. (ccl-compile-translate-character): Likewise. (ccl-compile-map-single): Likewise. @@ -4021,19 +4021,19 @@ * fortran.el (fortran-mode-syntax-table): Change `\' to `\' syntax. - (fortran-fontify-string, fortran-match-!-comment): Deleted. + (fortran-fontify-string, fortran-match-!-comment): Delete. (fortran-font-lock-syntactic-keywords): New variable. (fortran-mode): Use it. (fortran-font-lock-keywords-1): Don't do comments. - (beginning-of-fortran-subprogram, end-of-fortran-subprogram): Save - match data. + (beginning-of-fortran-subprogram, end-of-fortran-subprogram): + Save match data. * textmodes/sgml-mode.el (sgml-validate-command): Use nsgmls. - * msb.el (msb-menu-bar-update-buffers): Renamed from + * msb.el (msb-menu-bar-update-buffers): Rename from menu-bar-update-buffers. - (msb-custom-set, msb--toggle-menu-type): Call - msb-menu-bar-update-buffers. + (msb-custom-set, msb--toggle-menu-type): + Call msb-menu-bar-update-buffers. (msb-mode): Revise the hook setting. * font-lock.el (turn-on-font-lock): Use tty-display-color-p. @@ -4079,9 +4079,9 @@ 1999-07-21 Gerd Moellmann - * cl-extra.el (cl-make-hash-table): Renamed from make-hash-table. - (cl-hash-table-p): Renamed from hash-table-p. - (cl-hash-table-count): Renamed from hash-table-count. + * cl-extra.el (cl-make-hash-table): Rename from make-hash-table. + (cl-hash-table-p): Rename from hash-table-p. + (cl-hash-table-count): Rename from hash-table-count. (maphash): Alias to cl-maphash removed. (gethash): Likewise. (puthash): Likewise. @@ -4148,7 +4148,7 @@ 1999-07-21 Gerd Moellmann - * faces.el (face-underline): Removed. + * faces.el (face-underline): Remove. (face-underline-color): Ditto. 1999-07-21 Gerd Moellmann @@ -4319,10 +4319,10 @@ * bindings.el (make-mode-line-mouse-sensitive): Use down-mouse-3 instead of mouse-3 to pop up menus. - (mode-line-kill-buffer): Removed. + (mode-line-kill-buffer): Remove. (make-mode-line-mouse-sensitive): Pop mouse buffer menu over buffer name. - (mode-line-buffer-menu-1): Removed. + (mode-line-buffer-menu-1): Remove. * startup.el (command-line-1): Call make-mode-line-mouse-sensitive. @@ -4405,7 +4405,7 @@ 1999-07-21 Gerd Moellmann - * faces.el (frame-update-faces): Copied from 20.2. + * faces.el (frame-update-faces): Copy from 20.2. (frame-update-face-colors): Ditto. Code removed that isn't applicable in the new face implementation. @@ -4424,12 +4424,12 @@ 1999-07-21 Gerd Moellmann - * faces.el (face-charset-registries): Removed since fontset.el + * faces.el (face-charset-registries): Remove since fontset.el is no always loaded. 1999-07-21 Gerd Moellmann - * faces.el (internal-get-face): Added as obsolete function for + * faces.el (internal-get-face): Add as obsolete function for compatibility. 1999-07-21 Gerd Moellmann @@ -4458,7 +4458,7 @@ * faces.el (face-id): Return the ID of a realized face for ASCII. - * fontset.el (x-charset-registries): Removed. Now in faces.el. + * fontset.el (x-charset-registries): Remove. Now in faces.el. (x-complement-fontset-spec): Use face-charset-registries. * faces.el (face-font-selection-order): Set font selection order @@ -4486,14 +4486,14 @@ * cus-face.el (custom-face-attributes): Add :bold and :italic for compatibility with old code. - * faces.el (set-face-attributes-from-resources): Additional - frame parameter. + * faces.el (set-face-attributes-from-resources): + Additional frame parameter. (make-face-x-resource-internal): Set attributes from resources for a given frame or all frames. 1999-07-21 Gerd Moellmann - * faces.el (all-faces): Removed. + * faces.el (all-faces): Remove. * custom.el (defface): Add new face attributes to function comment. @@ -4512,8 +4512,8 @@ * cus-face.el (custom-face-attributes): Use new face attributes. - * faces.el (set-face-attribute-from-resource): Initialize - from resources only for X and W32. + * faces.el (set-face-attribute-from-resource): + Initialize from resources only for X and W32. * cus-face.el (custom-declare-face): Don't make frame-local faces. @@ -4599,8 +4599,8 @@ * faces.el (eval-when-compile): Add set-face-shadow-thickness. (internal-facep): Increase vector size. (make-face): Ditto. - (face-shadow-thickness): Added. - (set-face-shadow-thickness): Added. + (face-shadow-thickness): Add. + (set-face-shadow-thickness): Add. (modify-face): Add optional shadow-thickness parameter. (make-face-x-resource-internal): Add shadows. (copy-face): Ditto. @@ -4646,8 +4646,8 @@ * fill.el (canonically-space-region, justify-current-line): Add * to interactive spec. (fill-region-as-paragraph, fill-paragraph, fill-region) - (fill-nonuniform-paragraphs, fill-individual-paragraphs): Check - readonly buffer in interactive spec. + (fill-nonuniform-paragraphs, fill-individual-paragraphs): + Check readonly buffer in interactive spec. * paragraphs.el (kill-paragraph, backward-kill-paragraph) (backward-kill-sentence, kill-sentence): Add * to interactive spec. @@ -4662,7 +4662,7 @@ 1999-07-19 John Wiegley - * term.el (ansi-term-fg-faces-vector): Added support for ANSI + * term.el (ansi-term-fg-faces-vector): Add support for ANSI color codes 39 and 49, which by the way lynx uses them seem to mean "foreground reset" and "background reset". @@ -4727,7 +4727,7 @@ 1999-07-08 Espen Skoglund - * pascal.el (pascal-calculate-indent): Fixed a bug occurring when + * pascal.el (pascal-calculate-indent): Fix a bug occurring when the `end' keyword was in the very beginning of the buffer. 1999-07-08 Richard Stallman @@ -4759,8 +4759,8 @@ * isearch.el (isearch-process-search-char): Write octal 200 correctly. - * startup.el (normal-top-level-add-subdirs-to-load-path): Avoid - doing a `stat' when it isn't necessary because that can cause + * startup.el (normal-top-level-add-subdirs-to-load-path): + Avoid doing a `stat' when it isn't necessary because that can cause trouble when an NFS server is down. 1999-07-04 Richard Stallman @@ -4869,8 +4869,8 @@ 1999-06-18 Andrew Innes - * mail/smtpmail.el (smtpmail-send-it): Use - convert-standard-filename to make file names for queued mail safe + * mail/smtpmail.el (smtpmail-send-it): + Use convert-standard-filename to make file names for queued mail safe on Windows (`:' is invalid in file names on Windows). 1999-06-17 Kenichi Handa @@ -4911,8 +4911,8 @@ 1999-06-15 Markus Rost - * mail/rmailsum.el (rmail-summary-output-to-rmail-file): Avoid - multiple output of the last message. + * mail/rmailsum.el (rmail-summary-output-to-rmail-file): + Avoid multiple output of the last message. 1999-06-14 Eli Zaretskii @@ -4977,8 +4977,8 @@ 1999-06-09 Dave Love - * progmodes/compile.el (compilation-error-regexp-alist): Allow - digits in program name in first pattern. + * progmodes/compile.el (compilation-error-regexp-alist): + Allow digits in program name in first pattern. 1999-06-09 Andre Spiegel @@ -4992,8 +4992,8 @@ 1999-06-05 Stephen Eglen - * iswitchb.el (iswitchb-default-keybindings): Add - iswitchb-minibuffer-setup to minibuffer-setup-hook here rather + * iswitchb.el (iswitchb-default-keybindings): + Add iswitchb-minibuffer-setup to minibuffer-setup-hook here rather than when package is loaded. 1999-06-04 Richard M. Stallman @@ -5033,7 +5033,7 @@ 1999-06-04 Eric M. Ludlam - * speedbar.el (speedbar-hack-buffer-menu): Fixed so if the user + * speedbar.el (speedbar-hack-buffer-menu): Fix so if the user does not select a buffer from the buffers menu, then the attached frame is not switched to anything. @@ -5128,8 +5128,8 @@ 1999-05-25 Ken'ichi Handa - * mail/smtpmail.el (smtpmail-send-it): Bind - smtpmail-code-conv-from properly. + * mail/smtpmail.el (smtpmail-send-it): + Bind smtpmail-code-conv-from properly. (smtpmail-send-data-1): If DATA is a multibyte string, encode it by smtpmail-code-conv-from. @@ -5238,13 +5238,13 @@ 1995-05-11 Joel N. Weber II - * comint.el (comint-password-prompt-regexp): Modified to match the + * comint.el (comint-password-prompt-regexp): Modify to match the output of ksu and ssh-add. 1999-05-11 Kenichi HANDA * language/korea-util.el (isearch-toggle-korean-input-method): - Adjusted for the change of input method handling in isearch.el. + Adjust for the change of input method handling in isearch.el. (isearch-hangul-switch-symbol-ksc): Likewise. (isearch-hangul-switch-hanja): Likewise. @@ -5266,8 +5266,8 @@ 1999-05-09 Ken'ichi Handa - * ps-print.el (ps-control-character): Call - ps-mule-prepare-ascii-font to setup ASCII fonts. + * ps-print.el (ps-control-character): + Call ps-mule-prepare-ascii-font to setup ASCII fonts. * ps-mule.el (ps-mule-begin-job): Redo this change "if ps-multibyte-buffer is nil, use @@ -5278,16 +5278,16 @@ * ispell.el (ispell-local-dictionary-alist): New variable for customizing local dictionaries not accessible by everyone. (ispell-dictionary-alist): Loads `ispell-local-dictionary-alist'. - (ispell-required-version): Changed format `(major minor + (ispell-required-version): Change format `(major minor revision)' to support general pattern matching. (ispell-tex-skip-alists): AMS Tex block comment and `\author' skip region commented out due to incorrect skip potential in std latex. - (ispell-word): Removed `when' macro. Fixed bug of not restoring + (ispell-word): Remove `when' macro. Fixed bug of not restoring cursor point on small words for calls from `ispell-minor-mode'. (check-ispell-version): Tests and accepts versions major.minor and above, with adjustments for interactions in 3.1.0-3.1.11. (ispell-get-line): No longer skips ispell process special characters. - (ispell-comments-and-strings): Removed `when' macro call. + (ispell-comments-and-strings): Remove `when' macro call. (ispell-minor-check): Requires ispell-word to restore cursor point. (ispell-buffer-local-parsing): Supports checking comments only. @@ -5308,7 +5308,7 @@ 1999-05-07 Joel N. Weber II - * comint.el (comint-password-prompt-regexp): Modified so that it + * comint.el (comint-password-prompt-regexp): Modify so that it matches the output of kinit. 1999-05-06 Greg Stark @@ -5450,8 +5450,8 @@ 1999-04-26 John Wiegley - * progmodes/compile.el (compilation-error-regexp-alist): Recognize - C++Builder 4.0 error message syntax. + * progmodes/compile.el (compilation-error-regexp-alist): + Recognize C++Builder 4.0 error message syntax. 1999-04-26 Mark Diekhans @@ -5460,8 +5460,8 @@ 1999-04-26 Yoshiki Hayashi - * textmodes/texinfmt.el (texinfo-format-buffer): Bind - coding-system-for-write, to avoid hanging when non-interactive. + * textmodes/texinfmt.el (texinfo-format-buffer): + Bind coding-system-for-write, to avoid hanging when non-interactive. 1999-04-26 Dirk Herrmann @@ -5666,12 +5666,12 @@ 1999-03-25 Andrew Innes - * w32-fns.el (set-default-process-coding-system): Copied from + * w32-fns.el (set-default-process-coding-system): Copy from dos-w32.el, but modified to use Unix line endings for process input, and to add a suitable entry to process-coding-system-alist for DOS shells. - * dos-fns.el (set-default-process-coding-system): Copied from + * dos-fns.el (set-default-process-coding-system): Copy from dos-w32.el. * dos-w32.el (set-default-process-coding-system): Move function to @@ -5712,8 +5712,8 @@ 1999-03-18 Simon Marshall - * font-lock.el (c-font-lock-keywords-2): Added "complex" type. - (java-font-lock-keywords-2): Added "strictfp" keyword. + * font-lock.el (c-font-lock-keywords-2): Add "complex" type. + (java-font-lock-keywords-2): Add "strictfp" keyword. 1999-03-17 Jason Rumney @@ -5722,8 +5722,8 @@ 1999-03-17 Eli Zaretskii - * international/mule-cmds.el (set-language-environment): Fix - previous change: don't use dos-codepage when unbound. + * international/mule-cmds.el (set-language-environment): + Fix previous change: don't use dos-codepage when unbound. 1999-03-17 Karl Heuer @@ -5747,7 +5747,7 @@ 1999-03-15 Simon Marshall - * font-lock.el (c-font-lock-keywords-2): Added "restrict" keyword. + * font-lock.el (c-font-lock-keywords-2): Add "restrict" keyword. 1999-03-14 Milan Zamazal @@ -5777,7 +5777,7 @@ * speedbar.el: Added commentary about stealthy functions. (speedbar-message): New function. (speedbar-y-or-n-p): New function. - (speedbar-with-attached-buffer): Moved macro before reference. + (speedbar-with-attached-buffer): Move macro before reference. Now uses `save-selected-window'. (speedbar-mouse-hscroll, speedbar-track-mouse, speedbar-refresh) (speedbar-generic-item-info, speedbar-item-info-file-helper) @@ -5820,8 +5820,8 @@ 1999-03-09 Dave Love - * textmodes/sgml-mode.el (html-mode): Use - sentence-end-double-space when setting sentence-end. + * textmodes/sgml-mode.el (html-mode): + Use sentence-end-double-space when setting sentence-end. 1999-03-09 Ken'ichi Handa @@ -5864,8 +5864,8 @@ 1999-03-06 Dave Love - * progmodes/cc-cmds.el (c-outline-level): Bind - buffer-invisibility-spec. + * progmodes/cc-cmds.el (c-outline-level): + Bind buffer-invisibility-spec. * progmodes/c-mode.el (c-outline-level): Likewise. @@ -5905,8 +5905,8 @@ 1999-03-03 Dave Love * options.el (edit-options): Doc fix. - (list-options): Don't lose with unbound symbols. Maintain - Edit-options-mode. + (list-options): Don't lose with unbound symbols. + Maintain Edit-options-mode. 1999-03-01 Dave Love @@ -5918,7 +5918,7 @@ (ispell-dictionary-alist): Don't setq it, if ispell-dictionary-alist-override is set. - * simple.el (shell-command-default-error-buffer): Renamed from + * simple.el (shell-command-default-error-buffer): Rename from shell-command-on-region-default-error-buffer. (shell-command-on-region): Mention in echo area when there is some error output. Mention success or failure, too. @@ -5964,8 +5964,8 @@ (ps-font-size, ps-header-font-size, ps-header-title-font-size): Specifies landscape and portrait sizes. (ps-setup, ps-print-quote, ps-line-lengths-internal, ps-nb-pages) - (ps-get-page-dimensions, ps-begin-file, ps-begin-job, ps-generate): Fun - fix. + (ps-get-page-dimensions, ps-begin-file, ps-begin-job, ps-generate): + Fun fix. (ps-get-font-size): New fun. (ps-font-size-internal, ps-header-font-size-internal) (ps-header-title-font-size-internal): New vars. @@ -6009,8 +6009,8 @@ 1999-02-23 Ken'ichi Handa - * international/encoded-kb.el (encoded-kbd-handle-8bit): Allow - inputting ?\240. + * international/encoded-kb.el (encoded-kbd-handle-8bit): + Allow inputting ?\240. 1999-02-23 Karl Heuer @@ -6027,8 +6027,8 @@ 1999-02-22 Eli Zaretskii - * arc-mode.el (archive-set-buffer-as-visiting-file): Save - excursion while calling set-auto-coding-function. + * arc-mode.el (archive-set-buffer-as-visiting-file): + Save excursion while calling set-auto-coding-function. * play/handwrite.el (handwrite): Require ps-print, and use ps-printer-name and ps-lpr-command. Call ps-print-region-function @@ -6036,8 +6036,8 @@ 1999-02-22 Kenichi Handa - * international/codepage.el (cp-coding-system-for-codepage-1): Put - charset-origin-alist property to a coding system for the codepage. + * international/codepage.el (cp-coding-system-for-codepage-1): + Put charset-origin-alist property to a coding system for the codepage. * international/mule.el: Modify comment for charset-origin-alist property of a coding system. @@ -6053,7 +6053,7 @@ 1999-02-21 Peter Breton - * dirtrack.el (dirtrack): Added docstring. Now returns input. + * dirtrack.el (dirtrack): Add docstring. Now returns input. 1999-02-18 Peter Breton @@ -6090,7 +6090,7 @@ (sql-stop): Use sql-input-ring-separator and sql-input-ring-file-name. (sql-input-ring-file-name): New variable with customization. (sql-input-ring-separator): New variable with customization. - (sql-set-sqli-buffer): Renamed from sql-change-sqli-buffer. + (sql-set-sqli-buffer): Rename from sql-change-sqli-buffer. Callers changed. (sql-show-sqli-buffer): The message for "sql-buffer is not set" now includes the name of the current buffer. @@ -6106,7 +6106,7 @@ 1999-02-18 Ken'ichi Handa - * international/mule.el (coding-system-list): Moved here from + * international/mule.el (coding-system-list): Move here from mule-util.el to avoid autoloading mule-util by the call of select-safe-coding-system. @@ -6122,12 +6122,12 @@ 1999-02-17 Peter Breton - * filecache.el (file-cache-filter-regexps): Added .class. + * filecache.el (file-cache-filter-regexps): Add .class. 1999-02-17 Ken'ichi Handa - * international/mule-util.el (decompose-region): Use - insert-buffer-substring instead of insert-buffer to avoid putting + * international/mule-util.el (decompose-region): + Use insert-buffer-substring instead of insert-buffer to avoid putting mark. 1999-02-17 Andreas Schwab @@ -6179,8 +6179,8 @@ 1999-02-16 Ken'ichi Handa - * language/japanese.el (japanese-shift-jis): Add - charset-origin-alist property. + * language/japanese.el (japanese-shift-jis): + Add charset-origin-alist property. 1999-02-15 Richard Stallman @@ -6209,10 +6209,10 @@ 1999-02-14 Richard Stallman * international/iso-transl.el: - (iso-transl-ae): Renamed from iso-transl-e-slash. - (iso-transl-a-ring): Renamed from iso-transl-a-slash. - (iso-transl-AE): Renamed from iso-transl-E-slash. - (iso-transl-A-ring): Renamed from iso-transl-A-slash. + (iso-transl-ae): Rename from iso-transl-e-slash. + (iso-transl-a-ring): Rename from iso-transl-a-slash. + (iso-transl-AE): Rename from iso-transl-E-slash. + (iso-transl-A-ring): Rename from iso-transl-A-slash. (iso-transl-char-map): Related changes. * format.el (format-replace-strings): Fix value of TO in REVERSE case. @@ -6229,7 +6229,7 @@ 1999-02-12 Alex Schroeder * sql.el: Set version to 1.3.2. - (sql-solid-program): Added support for solid. + (sql-solid-program): Add support for solid. (sql-help): Doc mentions sql-solid. (sql-solid): Entry function for Solid. (sql-buffer): Doc explains the use of the variable and how to @@ -6243,16 +6243,16 @@ (sql-change-sqli-buffer): New function to change sql-buffer. (sql-mode): Doc explains how to change sql-buffer. (sql-send-paragraph): New function to send a paragraph. - (sql-mode-map): Added keybinding for sql-send-paragraph. + (sql-mode-map): Add keybinding for sql-send-paragraph. (sql-mysql): Doc corrected. (sql-ms): Doc corrected. * sql.el (sql-server): Doc fix. - (sql-mysql): Added the use of sql-server to specify the host, + (sql-mysql): Add the use of sql-server to specify the host, sql-database now specifies database instead of host. (sql-mode-menu): Send... menu items are only active if sql-buffer is non-nil. - (sql-help): Changed tag of entry functions a bit. + (sql-help): Change tag of entry functions a bit. * sql.el: Added keywords from `finder-by-keyword'. (sql-mode): Made sql-buffer a local variable, changed the @@ -6267,10 +6267,10 @@ sql-user and sql-password used during login. (sql-sybase): Quoted *SQL* in doc string, added comma. (sql-oracle): Likewise. - (sql-interactive-mode): Added extensive documentation for having + (sql-interactive-mode): Add extensive documentation for having multiple SQL buffers sending their stuff to different SQLi buffers, each running a different process. - (sql-buffer): Changed doc from *SQL* to SQLi. + (sql-buffer): Change doc from *SQL* to SQLi. (sql-get-login): Doc fix. 1999-02-12 Ken'ichi Handa @@ -6301,8 +6301,8 @@ 1999-02-12 Ken'ichi Handa - * international/quail.el (quail-show-kbd-layout): Bind - blink-matching-paren to nil. + * international/quail.el (quail-show-kbd-layout): + Bind blink-matching-paren to nil. * ps-mule.el (ps-mule-font-info-database-bdf): Fix ENCODING field for ASCII and Latin-1. @@ -6313,8 +6313,8 @@ 1999-02-12 Kenichi Handa - * international/mule-cmds.el (language-info-alist): Remove - description about charset-origin-alist. + * international/mule-cmds.el (language-info-alist): + Remove description about charset-origin-alist. * international/mule.el: Comment added for a new coding system property `charset-origin-alist'. @@ -6330,8 +6330,8 @@ ("Cyrillic-KOI8"): Remove charset-origin-alist property. ("Cyrillic-ALT"): Likewise. - * language/vietnamese.el (vietnamese-viqr): Add - charset-origin-alist property. + * language/vietnamese.el (vietnamese-viqr): + Add charset-origin-alist property. ("Vietnamese"): Remove charset-origin-alist property. * simple.el (what-cursor-position): Don't use the variable @@ -6371,8 +6371,8 @@ 1999-02-08 Eli Zaretskii - * international/codepage.el (cp-coding-system-for-codepage-1): On - MS-DOS, use dos-unsupported-char-glyph for characters not + * international/codepage.el (cp-coding-system-for-codepage-1): + On MS-DOS, use dos-unsupported-char-glyph for characters not supported by the codepage. (cp-make-coding-systems-for-codepage): Likewise. @@ -6381,7 +6381,7 @@ * international/mule-util.el (coding-system-list): Don't sort coding-system-list here. - * international/mule.el (coding-system-lessp): Moved here from + * international/mule.el (coding-system-lessp): Move here from mule-util.el. (add-to-coding-system-list): New function. (make-subsidiary-coding-system, make-coding-system) @@ -6427,18 +6427,18 @@ 1999-02-05 Alex Schroeder * progmodes/sql.el: Changed version to 1.2.1. - (sql-pop-to-buffer-after-send-region): Improved documentation. - (sql-mysql-program): Added MySQL support. + (sql-pop-to-buffer-after-send-region): Improve documentation. + (sql-mysql-program): Add MySQL support. (sql-prompt-length): Made prompt-length configurable. (sql-mode-syntax-table): Made apostrophe (') be a string delimiter. - (sql-help): Added MySQL support, changed documentation. + (sql-help): Add MySQL support, changed documentation. (sql-send-region): A message is displayed if something is sent. - (sql-mode): Added buffer-local comment-start. + (sql-mode): Add buffer-local comment-start. (sql-interactive-mode): Use sql-prompt-length to set left-margin. - (sql-interactive-mode): Added buffer-local comment-start. + (sql-interactive-mode): Add buffer-local comment-start. (sql-oracle): Set sql-prompt-length. (sql-sybase): Set sql-prompt-length. - (sql-mysql): Added MySQL support. + (sql-mysql): Add MySQL support. (sql-ingres): Set sql-prompt-length. (sql-ms): Set sql-prompt-length. (sql-postgres): Set sql-prompt-length. @@ -6495,8 +6495,8 @@ 1999-02-01 Ken'ichi Handa - * international/mule-util.el (compose-chars-component): Add - autoload cookie. + * international/mule-util.el (compose-chars-component): + Add autoload cookie. 1999-01-31 Ken'ichi Handa @@ -6506,8 +6506,8 @@ 1999-01-31 Markus Rost - * progmodes/compile.el (compilation-next-error-locus): Don't - decrease argument FIND-AT-LEAST of compilation-next-error-locus. + * progmodes/compile.el (compilation-next-error-locus): + Don't decrease argument FIND-AT-LEAST of compilation-next-error-locus. 1999-01-31 Eli Zaretskii @@ -6538,8 +6538,8 @@ * tex-mode.el (tex-mode-map): Replace validate-tex-buffer by tex-validate-buffer. (plain-tex-mode, latex-mode, slitex-mode): Likewise. - (tex-validate-buffer): Renamed from validate-tex-buffer. Works - now with recent occur-mode. + (tex-validate-buffer): Rename from validate-tex-buffer. + Works now with recent occur-mode. (tex-validate-region): Really walk through all Sexps. (tex-region): Bind shell-dirtrack-verbose. (tex-file, tex-bibtex-file): Likewise. @@ -6639,8 +6639,8 @@ 1999-01-25 Edward M. Reingold - * calendar/diary-lib.el (mark-diary-entries): Use - assoc-ignore-case and do not capitalize when matching month and + * calendar/diary-lib.el (mark-diary-entries): + Use assoc-ignore-case and do not capitalize when matching month and day names. * calendar/calendar.el (calendar-read-date): Ditto. @@ -6734,8 +6734,8 @@ 1999-01-23 Ken'ichi Handa - * international/fontset.el (create-fontset-from-x-resource): Make - style variants. + * international/fontset.el (create-fontset-from-x-resource): + Make style variants. 1999-01-22 Dave Love @@ -6748,7 +6748,7 @@ 1999-01-22 Jason Rumney - * term/w32-win.el (w32-standard-fontset-spec): Simplified. + * term/w32-win.el (w32-standard-fontset-spec): Simplify. 1999-01-22 Felix Lee @@ -6782,8 +6782,8 @@ 1999-01-19 Jason Rumney - * term/w32-win.el (w32-standard-fontspec-spec): Change - iso8859-5 to koi8-r. Add iso8859-9. + * term/w32-win.el (w32-standard-fontspec-spec): + Change iso8859-5 to koi8-r. Add iso8859-9. 1999-01-19 Dave Love @@ -6807,8 +6807,8 @@ * textmodes/tex-mode.el (tex-define-common-keys): Remove key binding of tex-feed-input. (tex-mode-map): Bind tex-feed-input here. - (tex-start-shell): Use compilation-shell-minor-mode. Set - comint-input-filter-functions before running tex-shell-hook. + (tex-start-shell): Use compilation-shell-minor-mode. + Set comint-input-filter-functions before running tex-shell-hook. (tex-start-tex): Forget compilation errors. (tex-compilation-parse-errors): Rewritten to work also with compile-mouse-goto-error and compile-goto-error. Adjusted to @@ -6827,8 +6827,8 @@ 1999-01-18 Ken'ichi Handa - * international/ccl.el (ccl-compile-translate-character): Handle - the case that a translation table is CCL register correctly. + * international/ccl.el (ccl-compile-translate-character): + Handle the case that a translation table is CCL register correctly. * international/mule-cmds.el (select-safe-coding-system): Highlight at most 256 characters. @@ -6893,8 +6893,8 @@ 1999-01-17 Andrew Innes - * dos-w32.el (find-buffer-file-type-coding-system): Use - default-buffer-file-coding-system when file doesn't exist (and + * dos-w32.el (find-buffer-file-type-coding-system): + Use default-buffer-file-coding-system when file doesn't exist (and isn't covered by a special case) instead of forcing undecided-dos against the user's wishes. @@ -6916,8 +6916,8 @@ * lpr.el (printer-name): Update docstring about usage on MS-DOS and MS-Windows. (lpr-command) [ms-dos, windows-nt]: Initialize to empty string on - DOS and Windows platforms, to indicate direct printing. Update - the docstring accordingly. + DOS and Windows platforms, to indicate direct printing. + Update the docstring accordingly. * ps-print.el (ps-printer-name): Update docstring about usage on MS-DOS and MS-Windows. @@ -6952,8 +6952,8 @@ 1999-01-16 Dave Love - * help.el (temp-buffer-setup-hook, temp-buffer-show-hook): Revert - last change. + * help.el (temp-buffer-setup-hook, temp-buffer-show-hook): + Revert last change. 1999-01-15 Dave Love @@ -7002,8 +7002,8 @@ 1999-01-13 Eli Zaretskii * international/codepage.el (cp850-decode-table): Replace nil - entries with codes of similary looking glyphs. (Suggested by - Jason Rumney .) + entries with codes of similary looking glyphs. ( + Suggested by Jason Rumney .) 1999-01-13 Dave Love @@ -7026,12 +7026,12 @@ * cus-start.el: Add inhibit-eol-conversion. - * help.el (temp-buffer-setup-hook, temp-buffer-show-hook): Swap - the values round. + * help.el (temp-buffer-setup-hook, temp-buffer-show-hook): + Swap the values round. 1999-01-11 Richard Stallman - * help.el (help-mode-finish): Renamed from help-mode-maybe. + * help.el (help-mode-finish): Rename from help-mode-maybe. Don't switch to Help mode here. (temp-buffer-setup-hook): Use help-mode-finish. (help-mode-setup): New function. @@ -7145,11 +7145,11 @@ 1999-01-06 Eli Zaretskii - * international/codepage.el (cp-coding-system-for-codepage-1): Add - the valid-codes property. + * international/codepage.el (cp-coding-system-for-codepage-1): + Add the valid-codes property. - * international/mule-cmds.el (prefer-coding-system): Call - set-coding-priority, so that the internal array of priorities is + * international/mule-cmds.el (prefer-coding-system): + Call set-coding-priority, so that the internal array of priorities is also updated. * international/mule-util.el @@ -7164,8 +7164,8 @@ * emacs-lisp/debug.el (debug): Leave recursive minibuffer enabled if it was enabled before. - * view.el (View-revert-buffer-scroll-page-forward): Bind - view-scroll-auto-exit instead of obsolete view-mode-auto-exit. + * view.el (View-revert-buffer-scroll-page-forward): + Bind view-scroll-auto-exit instead of obsolete view-mode-auto-exit. * files.el (recover-session): Preserve point when inserting explanation. @@ -7438,9 +7438,9 @@ (cperl-syntaxify-by-font-lock): Set to t, should be safe now. Better default, customizes to `message' too, off in text-mode. - (cperl-array-face): Renamed from `font-lock-emphasized-face', + (cperl-array-face): Rename from `font-lock-emphasized-face', `defface'd. - (cperl-hash-face): Renamed from `font-lock-other-emphasized-face'. + (cperl-hash-face): Rename from `font-lock-other-emphasized-face'. `defface'd. (cperl-emacs-can-parse): New state variable. (cperl-indent-line): Corrected to use global state. @@ -7488,7 +7488,7 @@ inside of POD too. (cperl-backward-to-noncomment): Better treatment of PODs and HEREs. (cperl-clobber-mode-lists): New configuration variable. - (cperl-not-bad-style-regexp): Updated. + (cperl-not-bad-style-regexp): Update. Init: `cperl-is-face' was busted. (cperl-make-face): New macros. (cperl-force-face): New macros. @@ -7503,7 +7503,7 @@ (cperl-tags-hier-init): Gross hack to pretend we work (are we?). Another try to work around XEmacs problems. Better progress messages. (toplevel): Require custom unprotected => failure on 19.28. - (cperl-xemacs-p): Defined when compile too. + (cperl-xemacs-p): Define when compile too. (cperl-find-tags): Was writing line/pos in a wrong order, pos off by 1 and not at beg-of-line. (cperl-etags-snarf-tag): New macro. @@ -7599,8 +7599,8 @@ (speedbar-this-file-in-vc) Fix SCCS to use s. not p. files. (speedbar-tag-group-name-minimum-length): New variable. (speedbar-frame-parameter): New compatibility function. - (speedbar-frame-mode): Updated to use speedbar-frame-parameter. - (speedbar-apply-one-tag-hierarchy-method): Fixed up taging sub + (speedbar-frame-mode): Update to use speedbar-frame-parameter. + (speedbar-apply-one-tag-hierarchy-method): Fix up taging sub groups to keep things in the right order, and to help with some naming conventions. (speedbar-create-tag-hierarchy): Enable buffer local version of @@ -7726,8 +7726,8 @@ (ps-mule-plot-string): Set ps-mule-current-charset. (ps-mule-initialize): Add autoload cookie. Don't set ps-mule-font-info-database here. - (ps-mule-begin-job): Renamed from ps-mule-begin. Update - ps-mule-font-info-database and ps-control-or-escape-regexp. + (ps-mule-begin-job): Rename from ps-mule-begin. + Update ps-mule-font-info-database and ps-control-or-escape-regexp. (ps-mule-begin-page): New fun. * ps-print.el: Mule related code moved to ps-mule.el. @@ -7749,7 +7749,7 @@ * ps-print.el (ps-mule-font-info-database): Doc-string modified. (ps-mule-external-libraries): New element FEATURE. - (ps-mule-init-external-library): Adjusted for the above change. + (ps-mule-init-external-library): Adjust for the above change. (ps-mule-generate-font): Likewise. (ps-mule-generate-glyphs): Likewise. (ps-mule-prepare-font): Likewise. @@ -7766,7 +7766,7 @@ Handle the case of unknown charset. (find-multibyte-characters): If invalid multibyte characters are found, return the corresponding strings instead of character codes. - (find-multibyte-characters): Adjusted for the above change. + (find-multibyte-characters): Adjust for the above change. (select-safe-coding-system): For a unibyte buffer, always returns DEFAULT-CODING-SYSTEM. (get-charset-property): Fix previous change. Make it a function. @@ -7786,8 +7786,8 @@ 1998-12-14 Andreas Schwab - * textmodes/texinfo.el (texinfo-tex-buffer): Bind - tex-start-options-string to empty string. + * textmodes/texinfo.el (texinfo-tex-buffer): + Bind tex-start-options-string to empty string. (texinfo-tex-region): Use texinfo-tex-trailer as documented. 1998-12-14 Andrew Innes @@ -7839,7 +7839,7 @@ * help.el (symbol-file-load-history-loaded): Variable renamed, and defvar moved from loadhist.el. - (symbol-file): Renamed from describe-function-find-file. + (symbol-file): Rename from describe-function-find-file. Load fns-VERSION.el here. (describe-variable, describe-function-1): Use symbol-file. @@ -7968,7 +7968,7 @@ * vc.el (vc-dired-window-configuration, vc-ediff-windows) (vc-ediff-result, vc-dired-switches, vc-dired-terse-mode): - Added defvars to suppress compilation warnings. + Add defvars to suppress compilation warnings. 1998-11-30 Ken Stevens @@ -7984,13 +7984,13 @@ ispell-message-text-end, ispell-add-per-file-word-list. (ispell-dictionary-alist-1, ispell-dictionary-alist2): A coding system is now required for all languages. Casechars improved for - castellano, castellano8, and norsk dictionaries. Dictionary - norsk7-tex added. Dictionary polish added. + castellano, castellano8, and norsk dictionaries. + Dictionary norsk7-tex added. Dictionary polish added. (ispell-dictionary-alist): Redefined at load-time to support dictionary changes. (ispell-menu-map): Redefined at load-time to support menu changes. (ispell-check-version): New alias for `check-ispell-version'. - (ispell-parse-output): Fixed matching for ispell error messages. + (ispell-parse-output): Fix matching for ispell error messages. Correctly returns spelling suggestions in order generated by ispell process. (check-ispell-version): Ensure `case-fold-search' doesn't get @@ -8002,12 +8002,12 @@ (ispell-kill-ispell): Ensures ispell process has terminated before starting new process. This can otherwise confuse process filters and hang the ispell process. - (ispell-begin-skip-region-regexp, ispell-skip-region): Improved - skipping support for sgml. + (ispell-begin-skip-region-regexp, ispell-skip-region): + Improve skipping support for sgml. (ispell-minor-check): Support sgml labels. Fix mapping ^M to \r which could cause `ispell-complete-word' to hang. - (ispell-message): Improved message reference matching. Ensure - `case-fold-search' doesn't get redefined. + (ispell-message): Improve message reference matching. + Ensure `case-fold-search' doesn't get redefined. (ispell-buffer-local-parsing): Ensure `case-fold-search' doesn't get redefined. Fixed bug in returning to nroff mode from tex mode. (ispell-add-per-file-word-list): Ensure `case-fold-search' doesn't @@ -8108,8 +8108,8 @@ 1998-11-22 Andrew Innes - * mail/rmail.el (rmail-set-message-counters-counter): Detect - messages that have been added with DOS line endings and convert + * mail/rmail.el (rmail-set-message-counters-counter): + Detect messages that have been added with DOS line endings and convert the line endings for such messages. 1998-11-22 Emilio Lopes @@ -8131,8 +8131,8 @@ 1998-11-21 Lars Magne Ingebrigtsen - * message.el (message-ignored-supersedes-headers): Remove - NNTP-Posting-Date. + * message.el (message-ignored-supersedes-headers): + Remove NNTP-Posting-Date. 1998-11-21 Richard Stallman @@ -8243,8 +8243,8 @@ (tar-extract): Avoid multibyte<->unibyte conversion in insert-buffer-substring by setting both buffers unibyte temporarily. - (tar-copy): Set the buffer unibyte while doing a work. Write - without code conversion. + (tar-copy): Set the buffer unibyte while doing a work. + Write without code conversion. (tar-expunge): Set the buffer unibyte while doing a work. (tar-alter-one-field): Likewise. (tar-clear-modification-flags): Compare byte position with @@ -8262,7 +8262,7 @@ 1998-11-15 Dave Love * progmodes/fortran.el: Fix previous change: - (fortran-end-prog-re1): Changed. + (fortran-end-prog-re1): Change. (fortran-check-end-prog-re): New function. (beginning-of-fortran-subprogram, end-of-fortran-subprogram): Use it. @@ -8281,15 +8281,15 @@ New options. (reftex-use-text-after-label-as-context): Option removed. (reftex-extract-bib-entries): Protect use in non-latex buffers. - (reftex-toc-visit-location): Renamed from `reftex-toc-visit-line'. + (reftex-toc-visit-location): Rename from `reftex-toc-visit-line'. (reftex-latin1-to-ascii): Works now with and without Mule. - (reftex-truncate): Removed special stuff for Emacs 20.2. + (reftex-truncate): Remove special stuff for Emacs 20.2. (reftex-get-offset): Made more general. - (reftex-show-label-location): Renamed from + (reftex-show-label-location): Rename from `reftex-select-label-callback'. (reftex-pop-to-label): Function removed (using `reftex-show-label-location' instead. - (reftex-insert-docstruct): Renamed from + (reftex-insert-docstruct): Rename from `reftex-make-and-insert-label-list'. Function args changed. (reftex-toc): Now uses `reftex-insert-docstruct' and `reftex-find-start-point'. @@ -8327,7 +8327,7 @@ 1998-11-11 Per Starbäck - * ispell.el (ispell-dictionary-alist-2): Removed svenska, renamed + * ispell.el (ispell-dictionary-alist-2): Remove svenska, renamed svenska8 to svenska, and fixed and extended CASECHARS for it. 1998-11-11 Andrew Innes @@ -8338,8 +8338,8 @@ 1998-11-11 Kenichi Handa - * international/mule-util.el (compose-chars-component): Signal - error if CH is a rule-based composition character. + * international/mule-util.el (compose-chars-component): + Signal error if CH is a rule-based composition character. (compose-chars): Signal error if an already composed character is going to be composed by rule-base. @@ -8465,8 +8465,8 @@ 1998-11-04 Kenichi Handa - * international/quail.el (quail-show-guidance-buf): Call - set-minibuffer-window to set minibuffer window of the current + * international/quail.el (quail-show-guidance-buf): + Call set-minibuffer-window to set minibuffer window of the current frame correctly. 1998-11-03 Theodore Jump @@ -8527,13 +8527,13 @@ 1998-10-30 Kenichi Handa - * international/quail.el (quail-start-translation): Handle - switching of the frame in read-key-sequence. + * international/quail.el (quail-start-translation): + Handle switching of the frame in read-key-sequence. (quail-start-conversion): Likewise. (quail-show-guidance-buf): Detach quail-guidance-buf from any windows before setting an appropriate window for it. - (quail-hide-guidance-buf): Use window-minibuffer-p. Set - quail-guidance-win to nil. + (quail-hide-guidance-buf): Use window-minibuffer-p. + Set quail-guidance-win to nil. (quail-update-guidance): If quail-guidance-buf is not in the selected frame, call quail-show-guidance-buf again. @@ -8565,14 +8565,14 @@ * emacs-lisp/eldoc.el (eldoc-argument-case): Fix customize type. - * emacs-lisp/lisp-mnt.el (lm-report-bug): Use - report-emacs-bug-address instead of undefined bug-gnu-emacs. - - * international/mule-cmds.el (select-message-coding-system): Doc - fix. - - * international/mule-diag.el (describe-coding-system): Describe - all flags. + * emacs-lisp/lisp-mnt.el (lm-report-bug): + Use report-emacs-bug-address instead of undefined bug-gnu-emacs. + + * international/mule-cmds.el (select-message-coding-system): + Doc fix. + + * international/mule-diag.el (describe-coding-system): + Describe all flags. * mail/sendmail.el (sendmail-coding-system) (default-sendmail-coding-system): Doc fix. @@ -8580,8 +8580,8 @@ * simple.el (shell-command-on-region): Doc fix. * loadup.el: Write fns-*.el in current directory instead of - data-directory since no installation directory exists yet. Mark - buffer unmodified afterwards. + data-directory since no installation directory exists yet. + Mark buffer unmodified afterwards. * loadhist.el (symbol-file): Load fns-*.el from exec-directory instead of data-directory since it is architecture dependent. @@ -8597,11 +8597,11 @@ 1998-10-27 Richard Stallman - * progmodes/tcl-mode.el (tcl-font-lock-keywords): Added itcl and + * progmodes/tcl-mode.el (tcl-font-lock-keywords): Add itcl and namespace related keywords such as `class', `body', `private', `variable', `namespace eval', etc. (tcl-imenu-generic-expression): Handle itcl body and class definitions. - (tcl-mode): Added ":" as a word constituent to the syntax-alist of + (tcl-mode): Add ":" as a word constituent to the syntax-alist of imenu and font-lock so that searches for \sw would find words containing colons. @@ -8730,9 +8730,9 @@ (profile-functions): Simplify. (profile-print): Use float. Make output include space separators. (profile-add-time): New helper function. - (profile-function-prolog): Renamed from profile-start-function. + (profile-function-prolog): Rename from profile-start-function. Handle profile-distinct. - (profile-function-epilog): Renamed from profile-update-function. + (profile-function-epilog): Rename from profile-update-function. Handle profile-distinct. (profile-a-function): If the function to be profiled is an autoload form, load it. If it's lazy-loaded, fetch it. @@ -8882,8 +8882,8 @@ 1998-10-14 Emilio Lopes - * progmodes/fortran.el (fortran-join-line): Use - `delete-indentation' instead of issuing an error message if not on + * progmodes/fortran.el (fortran-join-line): + Use `delete-indentation' instead of issuing an error message if not on a continuation line. Provide for joining several lines using prefix arg. @@ -8916,7 +8916,7 @@ 1998-10-13 Geoff Voelker * ls-lisp.el (ls-lisp-use-insert-directory-program): New variable. - (ls-lisp-insert-directory): Renamed from insert-directory. + (ls-lisp-insert-directory): Rename from insert-directory. (insert-directory): New function. 1998-10-13 Richard Stallman @@ -9049,7 +9049,7 @@ 1998-10-06 Peter Breton - * generic.el (generic-mode-with-type): Added hooks for generic-modes. + * generic.el (generic-mode-with-type): Add hooks for generic-modes. * net-utils.el (ftp, nslookup): Require comint. (network-service-connection): Likewise. @@ -9059,7 +9059,7 @@ (whois-get-tld): New function. * dirtrack.el: Mentioned dirtrack-debug-toggle in the docs. - (dirtrack-debug-toggle): Added this function. + (dirtrack-debug-toggle): Add this function. 1998-10-06 Lars Magne Ingebrigtsen @@ -9074,9 +9074,9 @@ * arc-mode.el (archive-mode-revert): Arg no-auto-save renamed from no-autosave. * tar-mode.el (tar-mode-revert): Likewise. - * ediff-util.el (ediff-arrange-auto-save-in-merge-jobs): Renamed - from ediff-arrange-autosave-in-merge-jobs. Callers changed. - * gnus/message.el (message-auto-save-directory): Renamed from + * ediff-util.el (ediff-arrange-auto-save-in-merge-jobs): + Rename from ediff-arrange-autosave-in-merge-jobs. Callers changed. + * gnus/message.el (message-auto-save-directory): Rename from message-autosave-directory. All references changed. 1998-10-06 Jonathan I. Kamens @@ -9091,15 +9091,15 @@ * replace.el (perform-replace): Position point properly before and after the recursive edit of C-r. - * progmodes/etags.el (tags-reset-tags-tables): Properly - find the markers in the old rings that are being discarded. + * progmodes/etags.el (tags-reset-tags-tables): + Properly find the markers in the old rings that are being discarded. 1998-10-06 Markus Rost * apropos.el (apropos-print): Control invalid characters. * play/landmark.el (lm-font-lock-face-O, lm-font-lock-face-X): - Renamed from lm-font-lock-O-face, lm-font-lock-X-face to avoid + Rename from lm-font-lock-O-face, lm-font-lock-X-face to avoid confusing customize. 1998-10-06 Eli Zaretskii @@ -9109,12 +9109,12 @@ 1998-10-05 Simon Marshall - * menu-bar.el (menu-bar-tools-menu): Added entry for Speedbar. + * menu-bar.el (menu-bar-tools-menu): Add entry for Speedbar. 1998-10-04 Eric Ludlam - * speedbar.el (speedbar-initial-expansion-list-name): Remove - customization since it is not useful in this case. + * speedbar.el (speedbar-initial-expansion-list-name): + Remove customization since it is not useful in this case. (speedbar-frame-mode): Check if cfx or cfy is a list, and make sure it gets evalled to a number. Also verify that set-frame-name fn exists before calling it. @@ -9133,8 +9133,8 @@ 1998-10-02 Dave Love - * outline.el (hide-region-body): Bind - outline-view-change-hook to nil while making repeated calls to + * outline.el (hide-region-body): + Bind outline-view-change-hook to nil while making repeated calls to outline-flag-region. Run it once at the end. (hide-other, hide-sublevels, show-children): Likewise. @@ -9240,8 +9240,8 @@ * textmodes/texinfo.el (texinfo-show-structure): Bind inhibit-read-only. - * isearch.el (isearch-search-and-update): Properly - handle upper case letters in the reverse-search special case. + * isearch.el (isearch-search-and-update): + Properly handle upper case letters in the reverse-search special case. 1998-09-25 Markus Rost @@ -9329,14 +9329,14 @@ whenever appt-mode-string has changed. (appt-add, appt-delete): Add autoload cookies. (appt-check): Catch errors from calling `diary'. - (appt-max-time): Renamed from max-time. + (appt-max-time): Rename from max-time. (appt-now-displayed, appt-display-count): New variables. (appt-timer): Don't create one if we already have one. * textmodes/tex-mode.el (tex-compilation-parse-errors): More general code to use the source buffer instead of the zap file. - * hilit-chg.el (highlight-compare-with-file): Renamed from + * hilit-chg.el (highlight-compare-with-file): Rename from compare-with-file. * loadhist.el (load-history-loaded): New variable. @@ -9368,9 +9368,9 @@ * emacs-lisp/eldoc.el (eldoc-message): Check for 1-arg case, and store string in eldoc-last-message without consing a new string. Rearrange logic from nested if's into cond's. - (eldoc-print-fnsym-args): Renamed to eldoc-get-fnsym-args-string. + (eldoc-print-fnsym-args): Rename to eldoc-get-fnsym-args-string. Do not print message; just return string. - (eldoc-get-var-docstring): Renamed from eldoc-print-var-docstring. + (eldoc-get-var-docstring): Rename from eldoc-print-var-docstring. Do not print message; just return string. Cache that string in eldoc-last-data. (eldoc-last-data): Make into a vector. @@ -9395,14 +9395,14 @@ * progmodes/vhdl-mode.el (vhdl-header-file): Fix customize type. - * progmodes/cpp.el (cpp-face-light-list, cpp-face-dark-list): Fix - customize type. + * progmodes/cpp.el (cpp-face-light-list, cpp-face-dark-list): + Fix customize type. * progmodes/cperl-mode.el (cperl-lazy-help-time): Fix customize type. - * progmodes/compile.el (compilation-error-screen-columns): New - variable. + * progmodes/compile.el (compilation-error-screen-columns): + New variable. (compilation-next-error-locus): Use it to decide whether to use forward-char or move-to-column. @@ -9419,8 +9419,8 @@ * startup.el (site-run-file): Fix customize type. - * speedbar.el (speedbar-initial-expansion-list-name): Fix - customize type. + * speedbar.el (speedbar-initial-expansion-list-name): + Fix customize type. * shell.el (shell-input-autoexpand): Fix customize type. @@ -9445,24 +9445,24 @@ 1998-09-16 Kenichi Handa - * international/mule-cmds.el (reset-language-environment): Call - update-coding-systems-internal. + * international/mule-cmds.el (reset-language-environment): + Call update-coding-systems-internal. * international/mule-conf.el: Call update-coding-systems-internal at the tail. 1998-09-14 Dave Love - * vc-hooks.el (vc-menu-map): Change the vc-directory label. Don't - use the menu-enable properties, pending doing it correctly and + * vc-hooks.el (vc-menu-map): Change the vc-directory label. + Don't use the menu-enable properties, pending doing it correctly and acceptably fast. * map-ynp.el (map-y-or-n-p): Mention RET, `q' in the help text. 1998-09-13 Dave Love - * progmodes/hideshow.el (hs-grok-mode-type): Check - comment-{start,end} non-nil as well as bound. Report an error if + * progmodes/hideshow.el (hs-grok-mode-type): + Check comment-{start,end} non-nil as well as bound. Report an error if we can't grok the mode. 1998-09-13 Richard Stallman @@ -9603,9 +9603,9 @@ (reftex-label-illegal-re): Default changed, removed Latin1. (reftex-latin1-to-ascii): New function. (reftex-what-environment): Check for section regexp before use. - (reftex-find-tex-file, reftex-find-bib-file): Fixed bug with + (reftex-find-tex-file, reftex-find-bib-file): Fix bug with absolute path names. - (reftex-TeX-master-file): Changed sequence of file checks. + (reftex-TeX-master-file): Change sequence of file checks. (reftex-do-citation): Bibview cache only with RefTeX mode on. 1998-09-06 Richard Stallman @@ -9679,7 +9679,7 @@ 1998-09-04 Peter Breton - * net-utils.el (netstat-program-options): Changed from nil to "-a" + * net-utils.el (netstat-program-options): Change from nil to "-a" so that by default netstat shows all network connections. 1998-09-04 Bob Weiner @@ -9699,8 +9699,8 @@ 1998-09-03 Bill Richter - * international/quail.el (quail-choose-completion-string): Store - completion `choice' in `quail-current-str'; don't insert it. + * international/quail.el (quail-choose-completion-string): + Store completion `choice' in `quail-current-str'; don't insert it. 1998-09-02 Kenichi Handa @@ -9727,8 +9727,8 @@ 1998-09-01 Dave Love - * international/mule-cmds.el (current-language-environment): Fix - setter function. + * international/mule-cmds.el (current-language-environment): + Fix setter function. 1998-09-01 Simon Marshall @@ -9808,8 +9808,8 @@ * ange-ftp.el (ange-ftp-allow-child-lookup): Reinstate checking dired-local-variables-file for dired-x. - * emacs-lisp/find-func.el (find-function-search-for-symbol): Look - for compressed library files too. + * emacs-lisp/find-func.el (find-function-search-for-symbol): + Look for compressed library files too. 1998-08-26 Kenichi Handa @@ -9842,8 +9842,8 @@ 1998-08-26 Lars Magne Ingebrigtsen - * gnus/gnus-start.el (gnus-save-newsrc-file): Bind - coding-system-for-write before saving. + * gnus/gnus-start.el (gnus-save-newsrc-file): + Bind coding-system-for-write before saving. 1998-08-26 Kevin Rodgers (tiny change) @@ -9861,15 +9861,15 @@ * repeat.el (repeat): Doc fix. [From rms:] (repeat-previous-repeated-command): New variable. - (repeat): Check for real-last-command being null or repeat. Set - repeat-previous-repeated-command. + (repeat): Check for real-last-command being null or repeat. + Set repeat-previous-repeated-command. * browse-url.el (browse-url-netscape): Fix format for hex escapes. 1998-08-25 Kenichi Handa - * gnus/message.el (message-send-mail-with-sendmail): Bind - coding-system-for-write by the return value of + * gnus/message.el (message-send-mail-with-sendmail): + Bind coding-system-for-write by the return value of select-message-coding-system. (message-send-mail-with-qmail): Likewise. @@ -9904,7 +9904,7 @@ * ps-print.el: Add codes to make ps-print.el work also on Emacs 20.2 and the earlier version. - (ps-mule-encode-7bit, ps-mule-encode-8bit): Modified for 20.2. + (ps-mule-encode-7bit, ps-mule-encode-8bit): Modify for 20.2. (ccl-encode-ethio-unicode, ps-mule-encode-ethiopic): Likewise. (ps-mule-find-wrappoint): Likewise. (ps-mule-generate-font): Change `X' to `x' in format control-string. @@ -9940,8 +9940,8 @@ New vars. (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar) (ps-mule-prepare-cmpchar-font): New funs. - (ps-mule-bitmap-prologue-generated, ps-mule-bitmap-prologue): New - vars. + (ps-mule-bitmap-prologue-generated, ps-mule-bitmap-prologue): + New vars. (ps-mule-generate-bitmap-prologue, ps-mule-generate-bitmap-font) (ps-mule-generate-bitmap-glyph): New funs. (ps-mule-initialize, ps-mule-begin): New funs. @@ -9963,10 +9963,10 @@ 1998-08-23 Kenichi HANDA - * international/mule-cmds.el (select-message-coding-system): New - function. - (set-language-environment-coding-systems): Set - default-sendmail-coding-system. + * international/mule-cmds.el (select-message-coding-system): + New function. + (set-language-environment-coding-systems): + Set default-sendmail-coding-system. * mail/sendmail.el (sendmail-coding-system): Doc-string modified. (default-sendmail-coding-system): New variable. === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2014-03-09 23:55:11 +0000 +++ lisp/ChangeLog.9 2014-08-28 22:18:39 +0000 @@ -49,7 +49,7 @@ This avoids a call to eshell-file-attributes, which can be expensive in some situations. - * eshell/em-ls.el (eshell-ls-dired-initial-args): Added an extra + * eshell/em-ls.el (eshell-ls-dired-initial-args): Add an extra customization variable, to differentiate ls-in-dired from regular uses of ls. @@ -404,7 +404,7 @@ tcl-end-of-defun, tcl-submit-bug-report. (tcl-xemacs-menu): Fix up and pass it directly to easymenu. (tcl-add-emacs-menu): Remove. - (tcl-fill-mode-map, tcl-fill-inferior-map): Moved into the defvar. + (tcl-fill-mode-map, tcl-fill-inferior-map): Move into the defvar. (tcl-keyword-list): Add `chain'. (tcl-font-lock-syntactic-keywords): New variable. (tcl-pps-has-arg-6): Remove. @@ -414,14 +414,14 @@ (tcl-mode): Use define-derived-mode. Simplify. Set comment-indent-function. (tcl-indent-command): Use line-beginning-position and comment-indent. - (tcl-calculate-indent): Renamed from calculate-tcl-indent. + (tcl-calculate-indent): Rename from calculate-tcl-indent. (tcl-indent-line): Use tcl-calculate-indent. - (tcl-indent-exp): Renamed from indent-tcl-exp. Use new names. - (tcl-add-log-defun): Renamed from add-log-tcl-defun. Use match-string. + (tcl-indent-exp): Rename from indent-tcl-exp. Use new names. + (tcl-add-log-defun): Rename from add-log-tcl-defun. Use match-string. (tcl-filter): Use with-current-buffer, simplify. (inferior-tcl-mode): Use define-derived-mode. - (tcl-hairy-in-comment): Renamed tcl-in-comment. - (tcl-simple-in-comment, tcl-in-comment): Removed. + (tcl-hairy-in-comment): Rename tcl-in-comment. + (tcl-simple-in-comment, tcl-in-comment): Remove. (tcl-files-alist): New function. (tcl-help-snarf-commands): Use it and return the result directly rather than through a global variable. @@ -493,7 +493,7 @@ (view-lossage): Call `help-setup-xref' instead of doing it manually. * subr.el (symbol-file-load-history-loaded) - (load-symbol-file-load-history, symbol-file): Moved from `help.el'. + (load-symbol-file-load-history, symbol-file): Move from `help.el'. * loadup.el ("button"): Load removed. @@ -556,7 +556,7 @@ * woman.el (woman-mode-map): Copy button-buffer-map instead of making a new keymap. Don't bind mouse-2. Bind M-mouse-2 to `woman-follow-word' instead of `woman-mouse-2'. - (woman-follow-word): Renamed from `woman-mouse-2'. + (woman-follow-word): Rename from `woman-mouse-2'. Follow current unconditionally, since this function is now only bound to M-mouse-2. Use accessor functions. (WoMan-highlight-references): Use `make-text-button'. @@ -912,7 +912,7 @@ * calculator.el (calculator-copy-displayer): New user-option. (calculator-displayer-prev, calculator-displayer-next): - Renamed from calculator-displayed-{left,right}. + Rename from calculator-displayed-{left,right}. (calculator, calculator-standard-displayer) (calculator-num-to-string, calculator-update-display) (calculator-copy, calculator-put-value): Bug and display fixes. @@ -974,8 +974,8 @@ Use make-keymap instead of copy-keymap, since copying the global keymap messes up the menu bar. - * info.el (Info-goto-node, Info-menu): Doc fix. Suggested by - Roland Winkler . + * info.el (Info-goto-node, Info-menu): Doc fix. + Suggested by Roland Winkler . 2001-09-21 Eli Zaretskii @@ -1074,8 +1074,8 @@ * mail/rmail.el (top-level): Require mule-utils when compiling. (rmail-decode-babyl-format): Use detect-coding-with-priority instead of detect-coding-region, to favor detection of emacs-mule - encoded Babyl files written by rmailout.el etc. Suggested by - Kenichi Handa . + encoded Babyl files written by rmailout.el etc. + Suggested by Kenichi Handa . 2001-09-14 Eli Zaretskii @@ -1183,7 +1183,7 @@ 2001-09-07 Gerd Moellmann * isearch.el (isearch-intersects-p): New function. - (isearch-close-unnecessary-overlays): Renamed from *unecessary*, + (isearch-close-unnecessary-overlays): Rename from *unecessary*, use isearch-intersects-p, and clean up. 2001-09-07 Eli Zaretskii @@ -1215,7 +1215,7 @@ * emacs-lisp/edebug.el (edebug-window-live-p): Use get-window-with-predicate. - * window.el (get-window-with-predicate): Renamed from some-window. + * window.el (get-window-with-predicate): Rename from some-window. (some-window): Make it an alias. 2001-09-06 Gerd Moellmann @@ -1326,7 +1326,7 @@ 2001-08-31 Gerd Moellmann - * isearch.el (isearch-mouse-2): Renamed from isearch-mouse-yank. + * isearch.el (isearch-mouse-2): Rename from isearch-mouse-yank. Instead of running mouse-yank-at-click, see what the event is bound to outside Isearch and run that. @@ -1584,8 +1584,8 @@ 2001-08-20 Gerd Moellmann - * textmodes/texnfo-upd.el (texinfo-every-node-update): Remove - some spaces from a message. From Pavel Janík . + * textmodes/texnfo-upd.el (texinfo-every-node-update): + Remove some spaces from a message. From Pavel Janík . * whitespace.el (whitespace-global-mode): Add autoload cookie. @@ -1665,7 +1665,7 @@ * Makefile.in (DONTCOMPILE): Remove sc.el. - * Makefile.in (finder_setwins): Renamed from nonobsolete_setwins. + * Makefile.in (finder_setwins): Rename from nonobsolete_setwins. Don't include term/. * mail/sc.el: Moved to obsolete/. @@ -1745,7 +1745,7 @@ * calendar/calendar.el (calendar-mode-line-format): Use make-mode-line-mouse-map instead of make-mode-line-mouse2-map. - * bindings.el (make-mode-line-mouse-map): Renamed from + * bindings.el (make-mode-line-mouse-map): Rename from make-mode-line-mouse2-map. Take additional arg MOUSE. (mode-line-modified): Use mouse-3 instead of mouse-2. (mode-line-buffer-identification-keymap): Bind keys differently. @@ -1842,9 +1842,9 @@ * uniquify.el (uniquify-ref-base, uniquify-ref-filename) (uniquify-ref-buffer, uniquify-ref-proposed): New functions. (uniquify-fix-item-base, uniquify-fix-item-filename) - (uniquify-fix-item-buffer, uniquify-fix-item-proposed): Deleted. + (uniquify-fix-item-buffer, uniquify-fix-item-proposed): Delete. Callers changed. - (uniquify-set-proposed): Changed to work with a vector item. + (uniquify-set-proposed): Change to work with a vector item. (uniquify-rationalize-file-buffer-names): Use a list of arrays for the fix list, and a list of strings for the non-file buffer names. Both changes reduce consing. @@ -1880,7 +1880,7 @@ * uniquify.el: These changes correct a corner case that the old code managed correctly. - (uniquify-fix-item-proposed): Renamed from + (uniquify-fix-item-proposed): Rename from uniquify-fix-item-min-proposed. (uniquify-set-proposed): New function. (uniquify-rationalize-file-buffer-names): Code reshuffled for @@ -1946,7 +1946,7 @@ 2001-07-27 Gerd Moellmann * emacs-lisp/lisp-mode.el (last-sexp-setup-props): New function. - (last-sexp-toggle-display): Renamed from last-sexp-print. + (last-sexp-toggle-display): Rename from last-sexp-print. (last-sexp-toggle-display, eval-last-sexp-1): Use last-sexp-setup-props. @@ -1978,8 +1978,8 @@ * emacs-lisp/lisp-mode.el (eval-print-last-sexp, eval-defun): Mention the effect of eval-expression-print-length and - eval-expression-print-level in the doc strings. Suggested by - Kevin Gallagher . + eval-expression-print-level in the doc strings. + Suggested by Kevin Gallagher . 2001-07-25 Gerd Moellmann @@ -2013,7 +2013,7 @@ * uniquify.el: Overall speedup changes when using many buffers. (uniquify-fix-item-base, uniquify-fix-item-filename) - (uniquify-fix-item-buffer): Changed defmacro to defalias (cosmetic). + (uniquify-fix-item-buffer): Change defmacro to defalias (cosmetic). (uniquify-fix-item-unrationalized-buffer): Deleted: was the fourth place in the item, but was never used. (uniquify-fix-item-min-proposed): New defalias: the fourth place @@ -2026,7 +2026,7 @@ of buffer whose name was changed, but that return value was never used. (uniquify-item-lessp): Replaces uniquify-filename-lessp, works on the cached proposed name, does much less consing and is quicker. - (uniquify-filename-lessp): Deleted. + (uniquify-filename-lessp): Delete. (uniquify-rationalize-a-list): Use dolist (cosmetic change). Do not bind locally the uniquify-possibly-resolvable flag. Use the cached proposed name is possible. @@ -2075,7 +2075,7 @@ with-syntax-table. (ediff-coding-system-for-read): From ediff-diff.el. (ediff-coding-system-for-write): New variable. - (ediff-highest-priority): Fixed the bug having to do with disappearing + (ediff-highest-priority): Fix the bug having to do with disappearing overlays. (ediff-file-remote-p): Use file-remote-p, if available. (ediff-listable-file): New function. @@ -2088,8 +2088,8 @@ Use ediff-coding-system-for-read. (ediff-patch-file-internal): Use ediff-coding-system-for-write. - * ediff-diff.el (ediff-coding-system-for-read): Moved to ediff-init.el. - (ediff-match-diff3-line, ediff-get-diff3-group): Improved pattern. + * ediff-diff.el (ediff-coding-system-for-read): Move to ediff-init.el. + (ediff-match-diff3-line, ediff-get-diff3-group): Improve pattern. * ediff.el: Date of last update, copyright years. @@ -2099,8 +2099,8 @@ of Scott Bronson. (ex-cmd-assoc, ex-compile, ex-cmd-one-letr): New functions. (viper-check-sub, viper-get-ex-command, viper-execute-ex-command): - Deleted functions. - (viper-get-ex-com-subr, viper-ex, ex-mark): Changed to use the new + Delete functions. + (viper-get-ex-com-subr, viper-ex, ex-mark): Change to use the new ex-token-list. (viper-get-ex-address-subr): Convert registers to char data type. @@ -2111,7 +2111,7 @@ (viper-read-key): Use viper-read-key-sequence. * viper.el (viper-major-mode-modifier-list): - Added inferior-emacs-lisp-mode. + Add inferior-emacs-lisp-mode. (this-major-mode-requires-vi-state): New function that uses simple heuristics to decide if vi state is appropriate. (set-viper-state-in-major-mode): Use this-major-mode-requires-vi-state. @@ -2212,9 +2212,9 @@ * progmodes/tcl.el (tcl-fill-mode-map): Use tcl-indent-exp. (tcl-mode): Use tcl-add-log-defun. (tcl-indent-line): Use tcl-calculate-indent. - (tcl-calculate-indent): Renamed from calculate-tcl-indent. - (tcl-indent-exp): Renamed from indent-tcl-exp. - (tcl-add-log-defun): Renamed from add-log-tcl-defun. + (tcl-calculate-indent): Rename from calculate-tcl-indent. + (tcl-indent-exp): Rename from indent-tcl-exp. + (tcl-add-log-defun): Rename from add-log-tcl-defun. (tcl-indent-for-comment): Call comment-indent-function properly and handle the case where it returns nil. @@ -2251,7 +2251,7 @@ * mouse-sel.el (mouse-sel-bindings): Instead of unbinding mouse-1 etc., bind them to `ignore'. - * eshell/esh-mode.el (eshell-send-invisible): Renamed from + * eshell/esh-mode.el (eshell-send-invisible): Rename from send-invisible, which is already defined in Comint. (eshell-watch-for-password-prompt): Use it. @@ -2518,11 +2518,11 @@ 2001-07-11 Stefan Monnier - * vc.el (vc-prefix-map): Moved back to vc-hooks.el. + * vc.el (vc-prefix-map): Move back to vc-hooks.el. (vc-dired-mode-map): Fix the madness. * vc-hooks.el (vc-mode): Dummy function for doc purposes. - (vc-prefix-map): Moved back from vc.el. + (vc-prefix-map): Move back from vc.el. 2001-07-11 Gerd Moellmann @@ -2554,7 +2554,7 @@ * startup.el (normal-top-level): Don't operate on the initial frame if we failed to create one. -2001-07-10 Martin Stjernholm +2001-07-10 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-exp): Keep the indentation of the block itself, i.e. only indent the contents in it. @@ -2586,7 +2586,7 @@ * toolbar/*.pbm: Cleaned up. From Luis Fernandes . -2001-07-09 Martin Stjernholm +2001-07-09 Martin Stjernholm * progmodes/cc-cmds.el: Extended the kludge to interoperate with the delsel and pending-del packages wrt to the new function @@ -3115,7 +3115,7 @@ 2001-05-28 Miles Bader - * comint.el (comint-carriage-motion): Renamed from + * comint.el (comint-carriage-motion): Rename from `comint-cr-magic'. Operate on the buffer instead of the string (for use as a comint post-output filter, instead of as a pre-output filter). Handle backspaces too. Add to the @@ -3226,7 +3226,7 @@ 2001-05-21 Stefan Monnier * diff-mode.el (diff-jump-to-old-file, diff-update-on-the-fly): - Renamed by removing the silly `-flag' suffix. + Rename by removing the silly `-flag' suffix. (diff-mode, diff-minor-mode, diff-find-source-location): Update. 2001-05-20 Stefan Monnier @@ -3313,7 +3313,7 @@ 2001-05-18 Simon Josefsson - * mail/smtpmail.el (maybe-append-domain): Renamed to + * mail/smtpmail.el (maybe-append-domain): Rename to `smtpmail-maybe-append-domain'. (smtpmail-via-smtp): Use the new name. @@ -3501,13 +3501,13 @@ 2001-05-08 John Wiegley * calendar/timeclock.el (timeclock-workday-remaining): - Changed logic for determining how much time is remaining. + Change logic for determining how much time is remaining. (timeclock-workday-elapsed): Don't accept a "relative" argument for the current day's elapsed time. What could that have meant? (timeclock-workday-elapsed-string): No "relative" argument anymore. - (timeclock-when-to-leave): Changed logic, similarly to what was + (timeclock-when-to-leave): Change logic, similarly to what was done for `timeclock-workday-remaining'. - (timeclock-find-discrep): Removed "today-only" argument, which had + (timeclock-find-discrep): Remove "today-only" argument, which had no meaning. Fixed some more math problems. The function now returns a three member list: (TOTAL-TIME-DISCREPANCY TODAYS-TIME-DISCREPANCY TODAYS-ELAPSED-TIME). @@ -3601,10 +3601,10 @@ * mail/rmail.el (rmail-mode-map): Use rmail-sort-by-labels instead of rmail-sort-by-keywords. - * mail/rmailsort.el (rmail-sort-by-labels): Renamed from + * mail/rmailsort.el (rmail-sort-by-labels): Rename from rmail-sort-by-keywords. - * mail/rmailsum.el (rmail-summary-sort-by-labels): Renamed from + * mail/rmailsum.el (rmail-summary-sort-by-labels): Rename from rmail-summary-sort-by-keywords. Doc fix. (rmail-summary-mode): Doc fix. @@ -3626,15 +3626,15 @@ * progmodes/cperl-mode.el (cperl-font-lock-keywords) (cperl-font-lock-keywords-1, cperl-font-lock-keywords-2): - Renamed from perl-font-lock-keywords to avoid clashes. + Rename from perl-font-lock-keywords to avoid clashes. (cperl-mode, cperl-load-font-lock-keywords, cperl-init-faces) (cperl-load-font-lock-keywords-1, cperl-load-font-lock-keywords-2): - Updated correspondingly. + Update correspondingly. * diff-mode.el (diff-nonexistent-face, diff-font-lock-keywords): Typo `nonexistant' -> `nonexistent'. -2001-05-04 Martin Stjernholm +2001-05-04 Martin Stjernholm * progmodes/cc-cmds.el (c-electric-delete, c-electric-delete-forward): Split `c-electric-delete' into two functions where @@ -3644,7 +3644,7 @@ * progmodes/cc-mode.el: `c-electric-delete-forward' is now bound to C-d to get the electric behavior on that key too. - (c-fill-paragraph): Fixed bogus direct use of + (c-fill-paragraph): Fix bogus direct use of c-comment-prefix-regexp, which caused an error when it's a list. 2001-05-03 Eli Zaretskii @@ -3785,7 +3785,7 @@ 2001-04-23 John Wiegley - * eshell/em-unix.el (eshell/diff): Fixed problems that were + * eshell/em-unix.el (eshell/diff): Fix problems that were occurring with Emacs 21's diff.el/compile.el interaction layer. 2001-04-23 Colin Walters @@ -3796,28 +3796,28 @@ 2001-04-23 John Wiegley - * eshell/em-smart.el (eshell-smart-redisplay): Added some safety + * eshell/em-smart.el (eshell-smart-redisplay): Add some safety code to work around a redisplay problem I've been having. 2001-04-23 John Wiegley * calendar/timeclock.el (timeclock-day-required): If the time required for a particular day is not set, use `timeclock-workday'. - (timeclock-find-discrep): Added some sample code in a comment. + (timeclock-find-discrep): Add some sample code in a comment. * eshell/eshell.el (eshell-command): Made a few changes so that `eshell-command' could be called programmatically. - * eshell/esh-mode.el (eshell-non-interactive-p): Moved to eshell.el. + * eshell/esh-mode.el (eshell-non-interactive-p): Move to eshell.el. - * eshell/eshell.el (eshell-non-interactive-p): Moved from esh-mode.el. + * eshell/eshell.el (eshell-non-interactive-p): Move from esh-mode.el. 2001-04-23 John Wiegley * calendar/timeclock.el: Updated copyright. (timeclock-generate-report): Don't report the daily or two-week total, if no time has been worked in that period. - (timeclock-find-discrep): Moved call to `file-readable-p'; removed + (timeclock-find-discrep): Move call to `file-readable-p'; removed final computational form, which was unnecessary; corrected a parsing problem when timeclock-relative was nil. @@ -3876,7 +3876,7 @@ 2001-04-20 Alex Schroeder - * sql.el (sql-mode-menu): Added highlighting entries. + * sql.el (sql-mode-menu): Add highlighting entries. (sql-highlight-oracle-keywords): New function. (sql-highlight-postgres-keywords): New function. (sql-highlight-ansi-keywords): New function. @@ -3887,7 +3887,7 @@ 2001-04-19 Karl Fogel - * saveplace.el (save-place-alist-to-file): Removed no-effect code + * saveplace.el (save-place-alist-to-file): Remove no-effect code that inserted file content only to delete it immediately. Probably a cut-and-paste bug. Thanks to Juanma Barranquero for the patch. @@ -3914,7 +3914,7 @@ * language/slovak.el ("Slovak"): Add tutorial entry. - * net/browse-url.el (browse-url-new-window-flag): Renamed from + * net/browse-url.el (browse-url-new-window-flag): Rename from browse-url-new-window-p. 2001-04-17 Eli Zaretskii @@ -3933,13 +3933,13 @@ 2001-04-17 Eli Zaretskii * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff): Don't invoke CVS as - an async subprocess if start-process is unavailable. Suggested by - Tim Van Holder . + an async subprocess if start-process is unavailable. + Suggested by Tim Van Holder . 2001-04-15 Eli Zaretskii - * info.el (Info-additional-directory-list): Doc fix. Suggested by - Kai Großjohann . + * info.el (Info-additional-directory-list): Doc fix. + Suggested by Kai Großjohann . 2001-04-14 Eli Zaretskii @@ -4053,7 +4053,7 @@ 2001-04-10 John Wiegley - * calendar/timeclock.el (timeclock-generate-report): Added a + * calendar/timeclock.el (timeclock-generate-report): Add a missing insert of the project name. 2001-04-09 Gerd Moellmann @@ -4445,37 +4445,37 @@ * mail/sendmail.el (sendmail-send-it): Don't parse Resent-* headers. Always invoke sendmail with option -t. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * Release of cc-mode 5.28. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-mode.el, progmodes/cc-vars.el (c-common-init) (c-default-style): - Removed the hardcoded switch to "java" style in Java mode. + Remove the hardcoded switch to "java" style in Java mode. It's instead taken care of by the default value for c-default-style. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-align.el (c-lineup-math): Fix bug where lineup was triggered by equal signs in string literals. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-cmds.el (c-fill-paragraph): Fixed bug in the paragraph + * progmodes/cc-cmds.el (c-fill-paragraph): Fix bug in the paragraph limit detection when at the ends of the buffer. - * progmodes/cc-engine.el (c-guess-basic-syntax): Removed bogus check for + * progmodes/cc-engine.el (c-guess-basic-syntax): Remove bogus check for "for" statement clause in case 7F; a better one is done earlier in case 7D anyway. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-cmds.el (c-guess-fill-prefix): Improved the heuristics + * progmodes/cc-cmds.el (c-guess-fill-prefix): Improve the heuristics somewhat more and did a small optimization. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el (c-beginning-of-statement, c-end-of-statement): Use the limit argument only to limit the syntactic context @@ -4486,7 +4486,7 @@ fixes to the paragraph and comment prefix recognition, block comment ender handling etc. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el (c-fill-paragraph): Take more care to preserve the relative position of the point. @@ -4505,12 +4505,12 @@ this doesn't apply to idl-mode, since IDL afaik doesn't have statements at all.) -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-engine.el (c-inside-bracelist-p): Fix for handling bracelists where the declaration contains template arguments. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el (c-comment-indent): Use `c-get-syntactic-indentation' to correctly calculate the @@ -4521,10 +4521,10 @@ indentation sum calculation from `c-indent-line' to a separate function. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el (c-beginning-of-statement, c-comment-indent): - Fixed places where it was assumed that preprocessor directives + Fix places where it was assumed that preprocessor directives have to start in column zero. * progmodes/cc-engine.el (c-beginning-of-member-init-list): Handle C++ @@ -4536,7 +4536,7 @@ they'll get indented consistently with the same type of expression in a normal block. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el (c-fill-paragraph): The kludge that checks whether the adaptive filling package fails to keep the comment @@ -4548,18 +4548,18 @@ * progmodes/cc-cmds.el (c-fill-paragraph): Made the way the paragraph around point is recognized more robust. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-engine.el: * progmodes/cc-lobotomy.el (c-state-cache) (c-in-literal-cache, c-auto-fill-prefix, c-lit-limits) - (c-lit-type): Fixed all internal variables used dynamically so + (c-lit-type): Fix all internal variables used dynamically so that they are always bound. * progmodes/cc-cmds.el, progmodes/cc-engine.el: Improve recovery of syntactic errors: - (c-indent-region): Fixed reporting of syntactic errors so that + (c-indent-region): Fix reporting of syntactic errors so that the region is fully reindented even when an error occurs. The last syntactic error is printed afterwards. Also cleanup up a whole lot of code that tried to optimize indentation of whole @@ -4567,7 +4567,7 @@ (c-indent-sexp): Use c-indent-region. - (c-parsing-error): Changed this variable to hold the message + (c-parsing-error): Change this variable to hold the message for any syntactic error that is discovered. (c-parse-state): Search backward from point instead of the bod @@ -4578,16 +4578,16 @@ dangling "else" clauses instead of throwing an error, and fall back to a reasonable position. - (c-indent-line): Added argument to avoid reporting syntactic errors. + (c-indent-line): Add argument to avoid reporting syntactic errors. (c-show-syntactic-information): Don't report any syntactic errors. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-cmds.el (c-beginning-of-statement): Fixed bugs with + * progmodes/cc-cmds.el (c-beginning-of-statement): Fix bugs with paragraph recognition when moving by sentence in literals. - * progmodes/cc-langs.el (c-Java-javadoc-paragraph-start): Modified + * progmodes/cc-langs.el (c-Java-javadoc-paragraph-start): Modify paragraph start regexp for javadoc to recognize javadoc markup in general instead of a specific set of keywords, to be more future-safe. @@ -4610,24 +4610,24 @@ (c-current-comment-prefix): New variable containing the actual regexp from c-comment-prefix-regexp for the current buffer. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-cmds.el (c-electric-brace): Fixed check for special brace + * progmodes/cc-cmds.el (c-electric-brace): Fix check for special brace lists: We can't look at the syntax, since a brace list can get recognized as a plain statement-cont. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug where a + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug where a special brace list opener broken over two lines got recognized as a statement on the second line. Case 9A changed. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-cmds.el (c-electric-brace): Fixed bug in c-state-cache + * progmodes/cc-cmds.el (c-electric-brace): Fix bug in c-state-cache adjustment after line is reindented. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-defs.el (c-point): Added optional argument for position + * progmodes/cc-defs.el (c-point): Add optional argument for position to use instead of the current point. * progmodes/cc-defs.el, progmodes/cc-engine.el (c-add-class-syntax): @@ -4635,7 +4635,7 @@ starts at boi, to avoid the extra level of indentation in that case. Cases 4, 16A and 17E affected. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el: Use `indent-according-to-mode' instead of direct calls to `c-indent-line', to adhere better to Emacs conventions. @@ -4643,17 +4643,17 @@ * progmodes/cc-engine.el (c-indent-line): Use the syntax already bound to `c-syntactic-context', if there is any. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-engine.el (c-get-offset): Fixed bug where the indentation + * progmodes/cc-engine.el (c-get-offset): Fix bug where the indentation wasn't added up correctly when a lineup function returned nil. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-engine.el (c-collect-line-comments): Fixed bug where + * progmodes/cc-engine.el (c-collect-line-comments): Fix bug where empty lines were ignored when collecting line comments backwards. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-align.el (c-lineup-dont-change): Return an absolute indentation column to work correctly in the case when several @@ -4662,17 +4662,17 @@ * progmodes/cc-engine.el, progmodes/cc-styles.el: * progmodes/cc-vars.el (c-evaluate-offset) (c-get-offset, c-indent-line, c-valid-offset, c-read-offset) - (c-set-offset): Added absolute indentation column settings by + (c-set-offset): Add absolute indentation column settings by using the vector type. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-vars.el (c-electric-paren, c-cleanup-list): Implemented two new cleanups `space-before-funcall' and `compact-empty-funcall'. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-defs.el (c-paren-re, c-identifier-re): Two new macros for helping building regexps. @@ -4684,32 +4684,32 @@ complete keyword lists. `c-keywords' is set to a regexp matching all keywords in the current language. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-engine.el (c-beginning-of-statement-1): Added '#' to the + * progmodes/cc-engine.el (c-beginning-of-statement-1): Add '#' to the list of characters to skip backwards over at the beginning of a statement, since it can precede string literals in Pike. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-cmds.el (c-guess-fill-prefix): Fixed bug with prefix + * progmodes/cc-cmds.el (c-guess-fill-prefix): Fix bug with prefix recognition when standing on the last line in a C++ comment with nothing but whitespace after the prefix. - * progmodes/cc-engine.el (c-backward-to-start-of-if): Fixed bug when + * progmodes/cc-engine.el (c-backward-to-start-of-if): Fix bug when given no limit argument. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-engine.el (c-inside-bracelist-p): Fixed brace list + * progmodes/cc-engine.el (c-inside-bracelist-p): Fix brace list recognition for the `[]= operator symbol in Pike. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-bytecomp.el (cc-eval-when-compile): New macro that works around a bug in `eval-when-compile' in the byte compiler. - * progmodes/cc-engine.el (c-forward-token-1): Fixed bug with return + * progmodes/cc-engine.el (c-forward-token-1): Fix bug with return value when count is zero and there's no token start within the limit. (c-guess-basic-syntax): Don't add 'comment-intro to lines with @@ -4719,12 +4719,12 @@ * progmodes/cc-mode-19.el: Fixes so that checks that must be done at compile time also are done then. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-defs.el: Make sure cc-mode-19 is loaded both at compile time and at runtime, and only when it's needed. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm Major cleanup for less error prone and more warning free compilation, including some fixes for bugs due to different @@ -4757,7 +4757,7 @@ README: Updated installation instructions. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el, progmodes/cc-langs.el, progmodes/cc-mode.el: Moved around things to improve the modularity: @@ -4766,11 +4766,11 @@ the various variables for configuring the language syntax. * progmodes/cc-engine.el, progmodes/cc-styles.el (c-evaluate-offset) - (c-get-offset): Moved from cc-styles to cc-engine since file + (c-get-offset): Move from cc-styles to cc-engine since file dependency analysis suggests they belong there (which also makes more sense). Thanks to Martin Buchholz for doing the analysis. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el (c-fn-region-is-active-p): New function that wraps the corresponding macro, for use in places that aren't @@ -4781,19 +4781,19 @@ * progmodes/cc-mode.el (c-prepare-bug-report-hooks): Hook variable to add things to the bug report. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm - * progmodes/cc-cmds.el (c-guess-fill-prefix): Fixed bug where the + * progmodes/cc-cmds.el (c-guess-fill-prefix): Fix bug where the returned prefix could contain a newline when the search for a good prefix line failed. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-cmds.el (c-toggle-auto-state, c-toggle-hungry-state) (c-toggle-auto-hungry-state): Made the argument optional, as the documentation says it is. -2000-03-21 Martin Stjernholm +2000-03-21 Martin Stjernholm * progmodes/cc-engine.el (c-guess-basic-syntax): Don't treat the Pike multiline string syntax, #"...", as a cpp macro. @@ -4871,8 +4871,8 @@ of Scott Bronson. (ex-cmd-assoc, ex-cmd-one-letr): New functions. (viper-check-sub, viper-get-ex-command, viper-execute-ex-command): - Deleted functions. - (viper-get-ex-com-subr, viper-ex, ex-mark): Changed to use the new + Delete functions. + (viper-get-ex-com-subr, viper-ex, ex-mark): Change to use the new ex-token-list. * viper-util.el: Spaces, indentation. @@ -4886,9 +4886,9 @@ 2001-03-16 John Wiegley - * calendar/timeclock.el (timeclock-reread-log): Fixed problem with + * calendar/timeclock.el (timeclock-reread-log): Fix problem with first-time checkins. - (timeclock-log-data): Fixed problem with reading timelog log file. + (timeclock-log-data): Fix problem with reading timelog log file. Resulting data in the "day list" was incorrect. (timeclock-find-discrep): Check if `timeclock-file' is readable before opening it. @@ -5023,7 +5023,7 @@ 2001-03-09 Gerd Moellmann - * help.el (string-key-binding): Renamed from + * help.el (string-key-binding): Rename from mode-line-key-binding. Handle any event on a string. Check for `keymap' properties as well as `local-map' properties. @@ -5074,7 +5074,7 @@ 2001-03-07 Stefan Monnier * log-edit.el (log-edit-common-indent): New var. - (log-edit-set-common-indentation): Renamed from + (log-edit-set-common-indentation): Rename from log-edit-delete-common-indentation. Use the new var. (log-edit-insert-changelog, log-edit-done-hook): Use the new name. @@ -5405,8 +5405,8 @@ * startup.el (fancy-splash-screens): Use display-hourglass instead of display-busy-cursor. - * frame.el (display-hourglass): Renamed from busy-cursor. - (hourglass-delay): Renamed from busy-cursor-delay-seconds. + * frame.el (display-hourglass): Rename from busy-cursor. + (hourglass-delay): Rename from busy-cursor-delay-seconds. (show-cursor-in-non-selected-windows): Doc fix. 2001-02-20 Dave Love @@ -5557,9 +5557,9 @@ 2001-02-12 Michael Kifer - * ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks + * ediff-diff.el (ediff-make-diff2-buffer): Remove bogus checks for remote files. - (ediff-coding-system-for-read): Replaced the no-conversion default + (ediff-coding-system-for-read): Replace the no-conversion default with raw-text. * ediff-init.el: Removed :version from defcustom vars. @@ -5720,7 +5720,7 @@ 2001-02-06 Gerd Moellmann - * dabbrev.el (dabbrev-ignored-buffer-regexps): Renamed from + * dabbrev.el (dabbrev-ignored-buffer-regexps): Rename from dabbrev-ignored-regexps. 2001-02-06 Eli Zaretskii @@ -6061,14 +6061,14 @@ 2001-01-25 John Wiegley - * eshell/esh-util.el (eshell-ange-ls-uids): Changed use of `alist' + * eshell/esh-util.el (eshell-ange-ls-uids): Change use of `alist' to `repeat' in the :type field. - * pcomplete.el (pcomplete-file-ignore): Changed a :type field to + * pcomplete.el (pcomplete-file-ignore): Change a :type field to allow a choice of regexp or nil. (pcomplete-dir-ignore): Same. - * eshell/em-unix.el (eshell/occur): Fixed bug causing `occur' (as + * eshell/em-unix.el (eshell/occur): Fix bug causing `occur' (as a command) to always fail. 2001-01-25 Gerd Moellmann @@ -6117,14 +6117,14 @@ 2001-01-24 Sam Steingold - * dired.el (dired-replace-in-string): Removed. + * dired.el (dired-replace-in-string): Remove. (dired-sort-toggle): Use `replace-regexps-in-string' instead of `dired-replace-in-string'. * dired-aux.el (dired-shell-stuff-it, dired-rename-subdir) (dired-rename-subdir-2, dired-insert-subdir-doinsert): Ditto. - * gs.el (gs-replace-in-string): Removed. + * gs.el (gs-replace-in-string): Remove. (gs-options): Use `replace-regexps-in-string' instead of `gs-replace-in-string'. @@ -6248,7 +6248,7 @@ 2001-01-19 Michael Kifer - * ediff-hook.el (ediff-xemacs-init-menus): Fixed add-menu-button. + * ediff-hook.el (ediff-xemacs-init-menus): Fix add-menu-button. * ediff-init.el (subst-char-in-string): Define and use it, unless it's already defined. @@ -6309,7 +6309,7 @@ overlay priorities should make it unnecessary, right? (isearch-highlight): Face suppressing behavior removed. (isearch-dehighlight): Face suppressing behavior removed. - (isearch-set-lazy-highlight-faces-at): Removed. + (isearch-set-lazy-highlight-faces-at): Remove. 2001-01-17 Kenichi Handa @@ -6546,19 +6546,19 @@ 2000-01-09 Alex Schroeder - * ansi-color.el (ansi-color-process): Removed, Emacs and XEmacs + * ansi-color.el (ansi-color-process): Remove, Emacs and XEmacs both use ansi-color-process-output, now. (ansi-color-process-output): Doesn't return string anymore. It is installed in comint-output-filter-functions for both Emacs and XEmacs, now. - (ansi-color-unfontify-region): Simplified code removing variables + (ansi-color-unfontify-region): Simplify code removing variables pos and start-ansi. (ansi-color-apply): Put text-property ansi-color before putting text-property face because ansi-color-unfontify-region is called immediately after the call to put-text-property. (ansi-color-context-region): Doc change. - (ansi-color-filter-region): Simplified code. - (ansi-color-apply-on-region): Changed start to start-marker, using + (ansi-color-filter-region): Simplify code. + (ansi-color-apply-on-region): Change start to start-marker, using a marker explicitly. Put text-property ansi-color before putting text-property face because ansi-color-unfontify-region is called immediately after the call to put-text-property. @@ -6566,15 +6566,15 @@ 2000-01-09 Alex Schroeder * ansi-color.el (ansi-color-faces-vector): Doc change. - (ansi-color-for-comint-mode): Changed :type property to choice. - (ansi-color-last-context): Removed. + (ansi-color-for-comint-mode): Change :type property to choice. + (ansi-color-last-context): Remove. (ansi-color-process-output): Don't use ansi-color-last-context, as the main functions will store their context now. (ansi-color-context): Doc change. (ansi-color-filter-apply): Rewrote it based on ansi-color-apply. Uses ansi-color-context such that repeated calls will strip partial escape sequences, too. - (ansi-color-apply): Simplified code. Colorize end of string if + (ansi-color-apply): Simplify code. Colorize end of string if face is not null. Store context in new (FACE STRING) format, such that repeated calls will strip partial escape sequences, too. Append faces to face property using ansi-color-apply-sequence such @@ -6583,7 +6583,7 @@ (ansi-color-filter-region): Rewrote it based on ansi-color-apply-on-region. Uses ansi-color-context-region such that repeated calls will strip partial escape sequences, too. - (ansi-color-apply-on-region): Simplified code. Colorize end of + (ansi-color-apply-on-region): Simplify code. Colorize end of region if face is not null. Store context in new (FACE POS) format, such that repeated calls will strip partial escape sequences, too. Append faces to face property using @@ -6644,8 +6644,8 @@ decide what to do. This function is added to comint-preoutput-filter-functions when the package is loaded. - (ansi-color-for-shell-mode-set): Removed. - (ansi-color-for-shell-mode): Removed. + (ansi-color-for-shell-mode-set): Remove. + (ansi-color-for-shell-mode): Remove. 2000-01-09 Alex Schroeder @@ -6696,14 +6696,14 @@ * vc.el (vc-default-latest-on-branch-p): New function, replaces constant implementations in backends. - * vc-cvs.el (vc-cvs-latest-on-branch-p): Removed. - (vc-cvs-checkout): Renamed arg WRITABLE to EDITABLE. + * vc-cvs.el (vc-cvs-latest-on-branch-p): Remove. + (vc-cvs-checkout): Rename arg WRITABLE to EDITABLE. - * vc-rcs.el (vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg + * vc-rcs.el (vc-rcs-checkout, vc-rcs-cancel-version): Rename arg WRITABLE to EDITABLE. - * vc-sccs.el (vc-sccs-latest-on-branch-p): Removed. - (vc-sccs-checkout, vc-sccs-cancel-version): Renamed arg WRITABLE + * vc-sccs.el (vc-sccs-latest-on-branch-p): Remove. + (vc-sccs-checkout, vc-sccs-cancel-version): Rename arg WRITABLE to EDITABLE. 2001-01-08 Eli Zaretskii @@ -6713,7 +6713,7 @@ 2001-01-08 Gerd Moellmann - * isearch.el (isearch-old-signal-hook): Removed. + * isearch.el (isearch-old-signal-hook): Remove. (isearch-mode): Add isearch-done to kbd-macro-termination-hook instead of setting signal-hook-function. (isearch-done): Remove isearch-done from kbd-macro-termination-hook. @@ -6791,7 +6791,7 @@ 2001-01-04 Gerd Moellmann * tooltip.el (tooltip-cancel-delayed-tip) - (tooltip-start-delayed-tip): Renamed from tooltip-disable-timeout + (tooltip-start-delayed-tip): Rename from tooltip-disable-timeout and tooltip-add-timeout. (tooltip-show): Set border color from faces's foreground. (tooltip-show-help-function): If called with the same help string @@ -6825,8 +6825,8 @@ (dired-guess-shell-alist-default): Don't use xloadimage for PNG. (dired-guess-shell-alist-user): Customize. (dired-x-help-address): Set to bug-gnu-emacs. - (dired-x-maintainer, dired-x-file, dired-x-version): Deleted. - (dired-default-directory): Renamed from default-directory. + (dired-x-maintainer, dired-x-file, dired-x-version): Delete. + (dired-default-directory): Rename from default-directory. * hl-line.el (hl-line): Doc fix. @@ -6917,7 +6917,7 @@ * international/fontset.el (x-complement-fontset-spec): Resolve ASCII font name so that the same family name is used for fonts registered in x-font-name-charset-alist. - (create-fontset-from-fontset-spec): Adjusted for the above change. + (create-fontset-from-fontset-spec): Adjust for the above change. The name of fontset alias should be a unresolved ASCII font name. 2000-12-28 Gerd Moellmann @@ -6932,13 +6932,13 @@ 2000-12-28 Kenichi Handa - * textmodes/artist.el (artist-butlast): Deleted. + * textmodes/artist.el (artist-butlast): Delete. (artist-ellipse-mirror-quadrant): Use butlast instead of artist-butlast. - * subr.el (butlast, nbutlast): Moved from cl.el to here. + * subr.el (butlast, nbutlast): Move from cl.el to here. - * emacs-lisp/cl.el (butlast, nbutlast): Moved to subr.el. + * emacs-lisp/cl.el (butlast, nbutlast): Move to subr.el. 2000-12-27 Eli Zaretskii @@ -6987,13 +6987,13 @@ 2000-12-25 Michael Kifer - * viper-init.el (viper-restore-cursor-type): Added condition-case guard. + * viper-init.el (viper-restore-cursor-type): Add condition-case guard. * ediff-init.el (ediff-quit-hook, ediff-suspend-hook): - Changed initialization; use add-hook. + Change initialization; use add-hook. (ediff-file-remote-p): Use file-local-copy. - * ediff-ptch.el (ediff-prompt-for-patch-buffer): Improved defaults. + * ediff-ptch.el (ediff-prompt-for-patch-buffer): Improve defaults. * ediff.el (ediff-patch-buffer): Bug fix. (ediff-revision): Allow selection of the file at the prompt. @@ -7037,7 +7037,7 @@ 2000-08-22 Emmanuel Briot - * xml.el (top level comment): Updated to reflect the fact that + * xml.el (top level comment): Update to reflect the fact that white spaces are relevant in the XML file. (xml-parse-file): Do not kill an existing Emacs buffer if the file to parse was already edited. This allows for on-the-fly analysis @@ -7158,7 +7158,7 @@ * progmodes/idlwave.el: Fixed copyright notice. - * textmodes/reftex-dcr.el (reftex-view-crossref): Added SPACE and + * textmodes/reftex-dcr.el (reftex-view-crossref): Add SPACE and TAB as key separators. 2000-12-19 Alex Schroeder @@ -7166,7 +7166,7 @@ * sql.el (sql-sybase-options): New option. (sql-sybase): Use it. Add sql-database to the list of parameters provided for login. The options -w 2048 -n are not used any more. - (sql-postgres-options): Changed default from "--pset" to "-P". + (sql-postgres-options): Change default from "--pset" to "-P". (sql-mysql-options): Doc change. (sql-stop): Doc change. @@ -7190,7 +7190,7 @@ 2000-12-18 Dave Love * simple.el (mail-user-agent): Doc fix. - (input-mode-8-bit): Removed. + (input-mode-8-bit): Remove. * international/mule.el (set-keyboard-coding-system): Doc fix. (keyboard-coding-system): New option. @@ -7373,12 +7373,12 @@ * international/characters.el: Fix cases and syntaxes for mule-unicode-0100-24ff. - * dired.el (dired-move-to-filename-regexp): Fixed for the case + * dired.el (dired-move-to-filename-regexp): Fix for the case that a Japanese character is not appended after day and year. * info.el (Info-suffix-list): Change format for a command that requires arguments. - (info-insert-file-contents): Adjusted for the above change. + (info-insert-file-contents): Adjust for the above change. 2000-12-12 Andreas Schwab @@ -7482,7 +7482,7 @@ * textmodes/reftex.el (reftex-scanning-info-available-p): New function. (reftex-TeX-master-file): Check for `tex-main-file' early enough. - * textmodes/reftex-global.el (reftex-create-tags-file): Fixed bug + * textmodes/reftex-global.el (reftex-create-tags-file): Fix bug when master file is not open. 2000-12-09 Stefan Monnier @@ -7670,12 +7670,12 @@ 2000-12-05 Rob Riepel - * emulation/tpu-edt.el (tpu-help): Fixed previous screen logic. - (tpu-search-highlight): Fixed comparison of overlay end positions. + * emulation/tpu-edt.el (tpu-help): Fix previous screen logic. + (tpu-search-highlight): Fix comparison of overlay end positions. (tpu-trim-line-ends): Implemented trimming logic locally. * emulation/tpu-extras.el (tpu-write-file-hook) - (tpu-set-cursor-bound): Replaced picture-clean with tpu-trim-line-ends. + (tpu-set-cursor-bound): Replace picture-clean with tpu-trim-line-ends. 2000-12-05 Kenichi Handa @@ -7956,8 +7956,8 @@ for the menu and would make command `imenu' awkward to use. (antlr-skip-file-prelude): With ANTLR-2.7+, you can specify named header actions and more than one. - (antlr-font-lock-tokendef-face): Changed color. - (antlr-font-lock-tokenref-face): Changed color. + (antlr-font-lock-tokendef-face): Change color. + (antlr-font-lock-tokenref-face): Change color. (antlr-font-lock-additional-keywords): Also highlight lowercase. (antlr-mode-syntax-table): New variable. (antlr-mode): Populate and use it instead `java-mode-syntax-table'. @@ -8198,7 +8198,7 @@ * ediff-init.el (ediff-abbrev-jobname): Use capitalize. - * ediff-wind.el (ediff-skip-unsuitable-frames): Deleted the + * ediff-wind.el (ediff-skip-unsuitable-frames): Delete the redundant skip-small-frames test. * viper-cmd.el (viper-change-state-to-vi): Disable overwrite mode. @@ -8297,11 +8297,11 @@ * progmodes/ada-mode.el (ada-mode): Use it instead of `ada-remove-trailing-spaces'. - (ada-remove-trailing-spaces): Removed. + (ada-remove-trailing-spaces): Remove. * textmodes/two-column.el (2C-merge): Recommend it in the doc. - * textmodes/picture.el (picture-clean): Removed. + * textmodes/picture.el (picture-clean): Remove. (picture-mode-exit): Call it instead of `picture-clean'. 2000-11-22 Gerd Moellmann @@ -8333,7 +8333,7 @@ (string-rectangle): Check delete-selection-mode. * emacs-lisp/edebug.el (edebug-version) - (edebug-maintainer-address): Deleted. + (edebug-maintainer-address): Delete. (edebug-submit-bug-report): Just alias to report-emacs-bug. (edebug-read-function): Account for other `'#' read forms. (edebug-mode-menus): Make some items toggles. @@ -8344,11 +8344,11 @@ * recentf.el (recentf-menu-items-for-commands) (recentf-make-menu-items, recentf-make-menu-item) - (recentf-filter-changer): Added :help and :active menu-item properties. + (recentf-filter-changer): Add :help and :active menu-item properties. (recentf-build-dir-rules, recentf-dump-variable) (recentf-edit-list, recentf-open-files-item) - (recentf-open-files): Replaced unnecessary `mapcar' with new + (recentf-open-files): Replace unnecessary `mapcar' with new built-in `mapc'. 2000-11-23 Miles Bader @@ -8521,7 +8521,7 @@ since this function is only concerned with master state. * vc-hooks.el (vc-workfile-unchanged-p) - (vc-default-workfile-unchanged-p): Moved here from vc.el. + (vc-default-workfile-unchanged-p): Move here from vc.el. * vc.el (vc-workfile-unchanged-p) (vc-default-workfile-unchanged-p): See above. @@ -8581,7 +8581,7 @@ (vc-cvs-print-log, vc-cvs-diff): Use asynchronous mode only for remote repositories. - * vc.el (vc-annotate): Changed handling of prefix arg; now asks + * vc.el (vc-annotate): Change handling of prefix arg; now asks for both version and ratio in the minibuffer. * vc-cvs.el (vc-cvs-annotate-command): New optional arg VERSION. @@ -8638,7 +8638,7 @@ 2000-11-15 Eli Zaretskii - * textmodes/texinfo.el (texinfo-insert-@uref): Renamed from + * textmodes/texinfo.el (texinfo-insert-@uref): Rename from texinfo-insert-@url. (texinfo-insert-@url): A defalias for texinfo-insert-@uref. (texinfo-mode-map): Bind "C-c C-c u" to texinfo-insert-@uref. @@ -9030,9 +9030,9 @@ 2000-11-06 Miles Bader - * mwheel.el (mouse-wheel-scroll-amount): Renamed from + * mwheel.el (mouse-wheel-scroll-amount): Rename from `mwheel-scroll-amount'. - (mouse-wheel-follow-mouse): Renamed from `mwheel-follow-mouse'. + (mouse-wheel-follow-mouse): Rename from `mwheel-follow-mouse'. (mouse-wheel-mode): Use (featurep 'xemacs) instead of string-matching against the version string. @@ -9050,7 +9050,7 @@ * international/mule-conf.el (compound-text): Define this coding system here. Make x-ctext and ctext aliases of it. - * language/european.el (compound-text, ctext): Moved to + * language/european.el (compound-text, ctext): Move to international/mule-conf.el. 2000-11-05 Andrew Innes @@ -9263,13 +9263,13 @@ (ps-color-device): Use `color-values' to determine if device supports color. (ps-color-values): Try to use `x-color-values' when using XEmacs. - (ps-print-page-p): Changed from defsubst to defun. - (ps-page-number): Changed from defmacro to defun. + (ps-print-page-p): Change from defsubst to defun. + (ps-page-number): Change from defmacro to defun. (ps-header-sheet, ps-header-page): Fix bug on selected pages for printing. (ps-print-ensure-fontified): Ensure fontification when jit-lock is on. (ps-end-file, ps-dummy-page): Funs eliminated. - (ps-print-color-scale): Changed default value. + (ps-print-color-scale): Change default value. (ps-page-n-up, ps-print-page-p): New internal vars. (ps-print-preprint, ps-output, ps-begin-file, ps-begin-page) (ps-plot-region, ps-generate, ps-end-job): Code fix. @@ -9281,8 +9281,8 @@ 2000-10-31 Kenichi Handa * term/mac-win.el (decode-mac-roman, encode-mac-roman, mac-roman): - Moved to european.el. - (ccl-encode-mac-roman-font, fontset-mac): Modified for + Move to european.el. + (ccl-encode-mac-roman-font, fontset-mac): Modify for mule-unicode-2500-33ff and mule-unicode-e000-ffff. (mac-roman-kbd-insert, mac-roman-kbd-mode): These functions deleted. (mac-roman-kbd-mode, mac-roman-kbd-mode-map): These variables deleted. @@ -9327,7 +9327,7 @@ * international/mule-cmds.el (encode-coding-char): Check property safe-chars instead of safe-charsets. - * international/fontset.el (fontset-default): Modified for + * international/fontset.el (fontset-default): Modify for mule-unicode-2500-33ff and mule-unicode-e000-ffff. (x-font-name-charset-alist): Likewise. (ccl-encode-unicode-font): New CCL program. Record it in @@ -9367,7 +9367,7 @@ * eshell/esh-mode.el (window-height test): Make certain that `eshell-stringify-t' is non-nil. - (eshell-password-prompt-regexp): Changed to a much simpler + (eshell-password-prompt-regexp): Change to a much simpler password regexp. (eshell-send-input): If `eshell-invoke-directly' returns t, directly invoke the parsed command using `eval'. This improves @@ -9391,7 +9391,7 @@ (eshell-rewrite-if-command): Use `eshell-protect' to wrap the call bodies. (eshell-separate-commands): Whitespace fix. - (eshell-complex-commands): Added a new list of names, for + (eshell-complex-commands): Add a new list of names, for determining whether a given command is as simple as it looks. (eshell-invoke-directly): New function. Returns t if a command should be invoked directly (using `eval'), rather than indirectly @@ -9401,10 +9401,10 @@ * eshell/em-unix.el (eshell-default-target-is-dot): New variable, which provides an emulation of the DOS shell behavior of assuming that cp/mv/ln should copy/move/link to the current directory. - (eshell-remove-entries): Added a doc string. - (eshell-shuffle-files): Removed the check for `target' being null. - (eshell-mvcp-template, eshell-mvcpln-template): Renamed - `eshell-mvcp-template' to `eshell-mvcpln-template', and extended + (eshell-remove-entries): Add a doc string. + (eshell-shuffle-files): Remove the check for `target' being null. + (eshell-mvcp-template, eshell-mvcpln-template): + Rename `eshell-mvcp-template' to `eshell-mvcpln-template', and extended it to do a smarter check of whether a destination was provided. (eshell/mv, eshell/cp): Enable `:preserve-args'. (eshell/ln): Enable `:preserve-args', and use @@ -9413,7 +9413,7 @@ (eshell/du, eshell/diff, eshell/locate): Stringify the argument list after flattening it. This makes it possible to cat files with numerical names. - (eshell-unix-initialize): Added several names to + (eshell-unix-initialize): Add several names to `eshell-complex-commands. (eshell-unix-command-complex-p): Return t if a given command name may result in external processes being invoked. @@ -9428,12 +9428,12 @@ (eshell-refresh-windows): Use `if' instead of `when'. (eshell-smart-scroll-window): Calling `save-current-buffer' was not necessary. - (eshell-currently-handling-window): Added a missing global variable. + (eshell-currently-handling-window): Add a missing global variable. * eshell/em-ls.el (eshell-do-ls): Code simplification. (eshell-ls-sort-entries, eshell-ls-entries, eshell-ls-dir): Whitespace fix. - (eshell-ls-exclude-hidden): Added this variable in addition to + (eshell-ls-exclude-hidden): Add this variable in addition to `eshell-ls-exclude-regexp'. This one prevents files beginning with . from even being read, which can improve memory consumption quite a bit. @@ -9441,7 +9441,7 @@ read file entries beginning with a dot. In home directories with lots of hidden files, fully two-thirds of the time spent in ls is used to read directory entries that are immediately thrown away. - (eshell-ls-initial-args): Added back this configuration variable, + (eshell-ls-initial-args): Add back this configuration variable, for specifying default initial arguments to every call to ls. Much faster than using an alias to do the same thing. (eshell-do-ls): Use `eshell-ls-initial-args', if set. @@ -9450,7 +9450,7 @@ * eshell/em-dirs.el (eshell/pwd): Small code simplification. * eshell/esh-util.el: Don't require `ange-ftp' if it's not available. - (eshell-stringify-t): Added a customization variable, to indicate + (eshell-stringify-t): Add a customization variable, to indicate whether `t' should be rendered as a string at all. If not, one can still determine if the result of an expression is true using "file-exists-p FILE && echo true". @@ -9460,7 +9460,7 @@ * eshell/esh-module.el: Whitespace fix. * eshell/em-alias.el (eshell-alias-initialize): - Added `eshell-command-aliased-p' to `eshell-complex-commands'. + Add `eshell-command-aliased-p' to `eshell-complex-commands'. (eshell-command-aliased-p): New function that returns t if a command name names an aliased. @@ -9476,10 +9476,10 @@ characters. * viper-util.el (viper-memq-char, viper=): New functions for working with characters. - (viper-change-cursor-color): Fixed buglet. + (viper-change-cursor-color): Fix buglet. Many functions changed to use viper= instead of = when comparing characters. - * viper.el (viper-insert-state-mode-list): Added eshell. + * viper.el (viper-insert-state-mode-list): Add eshell. * ediff-init.el (ediff-before-setup-hook): New hook. Several typos fixed in various docstrings. @@ -9712,7 +9712,7 @@ (delimit-columns-end): New vars. (delimit-columns-customize, delimit-columns-format): New funs. (delimit-columns-region, delimit-columns-rectangle) - (delimit-columns-rectangle-line): Modified to support column + (delimit-columns-rectangle-line): Modify to support column formatting. 2000-10-24 Dave Love @@ -9820,9 +9820,9 @@ * woman.el (woman-italic-face, woman-bold-face) (woman-unknown-face): Add dark-background variants. - (woman-default-faces): Renamed from `woman-colour-faces'. + (woman-default-faces): Rename from `woman-colour-faces'. Set using the stored defaults, rather than using hard-wired colors. - (woman-monochrome-faces): Renamed from `woman-black-faces'. + (woman-monochrome-faces): Rename from `woman-black-faces'. Just make the foreground `unspecified' rather than "black". (woman-menu): Rename menu entries accordingly. @@ -9865,13 +9865,13 @@ (vc-delete-automatic-version-backups, vc-make-version-backup): New functions. (vc-before-save): Use the latter. - (vc-default-make-version-backups-p): Added `-p' suffix to avoid + (vc-default-make-version-backups-p): Add `-p' suffix to avoid confusion. - * vc-cvs.el (vc-cvs-make-version-backups-p): Added `-p' suffix as + * vc-cvs.el (vc-cvs-make-version-backups-p): Add `-p' suffix as expected by vc[-hooks].el. - * vc.el (vc-checkout): Added `-p' suffix in call to + * vc.el (vc-checkout): Add `-p' suffix in call to vc-make-version-backups-p; use vc-make-version-backup to actually make the backup. (vc-version-other-window, vc-version-backup-file): Handle both @@ -9882,7 +9882,7 @@ 2000-10-22 Miles Bader * comint.el (comint-highlight-input, comint-highlight-prompt): - Renamed, `-face' at end removed. + Rename, `-face' at end removed. (comint-send-input, comint-output-filter): Use renamed faces. * window.el (fit-window-to-buffer): Change defaulting of @@ -9989,7 +9989,7 @@ * dirtrack.el (dirtrack): Fix call to run-hooks. - * cmuscheme.el (cmuscheme-program-name): Renamed from + * cmuscheme.el (cmuscheme-program-name): Rename from scheme-program-name because xscheme.el contains a defcustom with the same name. As a consequence, customizing group `cmuscheme' loaded `xscheme' which redefined run-scheme. @@ -10090,8 +10090,8 @@ 2000-10-18 Miles Bader - * comint.el (comint-delete-output): Renamed from `comint-kill-output'. - (comint-kill-output): Changed into an alias for `comint-delete-output', + * comint.el (comint-delete-output): Rename from `comint-kill-output'. + (comint-kill-output): Change into an alias for `comint-delete-output', and made obsolete. (comint-mode-map): Rename references to comint-kill-output. @@ -10113,7 +10113,7 @@ * diff-mode.el (diff-header-face, diff-file-header-face): Add specific setting for dark background. - (diff-context-face): Renamed from diff-comment-face. + (diff-context-face): Rename from diff-comment-face. Set explicitly rather than inheriting from font-lock-comment-face. 2000-10-17 Eli Zaretskii @@ -10208,7 +10208,7 @@ * whitespace.el: Doc fixes. (top-level): Don't add hooks here. - (whitespace-running-emacs): Deleted. + (whitespace-running-emacs): Delete. (timer): Don't require. (whitespace): Add back :version conditional on xemacs test. (whitespace-spacetab-regexp, whitespace-indent-regexp) @@ -10302,7 +10302,7 @@ 2000-10-13 John Wiegley - * eshell/esh-util.el (require): Added a missing `require' form, + * eshell/esh-util.el (require): Add a missing `require' form, needed when compiling (for an ange-ftp macro definition). 2000-10-13 Dave Love @@ -10318,10 +10318,10 @@ 2000-10-13 Stephen Gildea - * time-stamp.el (time-stamp): Fixed bug in new multi-line code + * time-stamp.el (time-stamp): Fix bug in new multi-line code that breaks with old list format timestamps. (time-stamp-warn-inactive, time-stamp-old-format-warn) - (time-stamp-count, time-stamp-conversion-warn): Improved doc strings. + (time-stamp-count, time-stamp-conversion-warn): Improve doc strings. 2000-10-13 John Wiegley @@ -10333,7 +10333,7 @@ 2000-10-13 John Wiegley - * desktop.el (desktop-buffer-modes-to-save): Added a global for + * desktop.el (desktop-buffer-modes-to-save): Add a global for specifying what "other" kinds of buffers should be saved. This used to be hard-coded. (desktop-buffer-misc-functions): A global for specifying how @@ -10345,7 +10345,7 @@ (desktop-buffer-info-misc-data): Aux function for determining Info buffer auxiliary info. (desktop-buffer-dired-misc-data): Likewise, but for dired buffers. - (desktop-buffer-info): Changed this function to use the info + (desktop-buffer-info): Change this function to use the info gathered above. (desktop-create-buffer): Be a little more careful about what `minor-mode' means before calling it. This is important for some @@ -10363,7 +10363,7 @@ (eshell-ls-annotate): Use `eshell-file-attributes'. (eshell-ls-file): Made the user-id printing code a bit smarter. - * eshell/esh-util.el (eshell-ange-ls-uids): Added variable, to + * eshell/esh-util.el (eshell-ange-ls-uids): Add variable, to allow identification of alias user ids in remote directories. It's manual, but there's no other way to know when the current user on the local machine, is also the owning user on the remote machine. @@ -10386,7 +10386,7 @@ full-fledged FTP client, with much more manipulation ability than most other clients. - * eshell/em-unix.el (eshell-du-prefer-over-ange): Added a new + * eshell/em-unix.el (eshell-du-prefer-over-ange): Add a new variable, which means that Eshell's du should always be preferred in remote directories. (eshell-shuffle-files): Use `eshell-file-attributes', rather than @@ -10395,7 +10395,7 @@ when reading remote directories. This is an Eshell-specific variable (not part of ange-ftp). (eshell/ln): Bind `ange-cache'. - (eshell/du): Added some extra logic for determining when to use + (eshell/du): Add some extra logic for determining when to use Eshell's du (which is slow), and when to use the external version (which may or may not exist). @@ -10404,7 +10404,7 @@ `get-buffer-process', since backgrounded processes don't count in the context of this function's logic. - * eshell/esh-arg.el (eshell-parse-double-quote): Moved a call to + * eshell/esh-arg.el (eshell-parse-double-quote): Move a call to `forward-char', so that null strings are parsed correctly. 2000-09-13 John Wiegley @@ -10471,7 +10471,7 @@ 2000-10-12 Gerd Moellmann * startup.el (fancy-splash-screens): Don't add a pre-command hook. - (fancy-splash-pre-command, fancy-splash-pending-command): Removed. + (fancy-splash-pre-command, fancy-splash-pending-command): Remove. (command-line-1): Don't use fancy-splash-pending-command. (fancy-splash-screens-1): Goto point-min after inserting text. @@ -10633,7 +10633,7 @@ * progmodes/etags.el: Docstring fixes. Maintainer line updated. (initialize-new-tags-table): Use run-hook-with-args-until-success. (find-tag): Use pop-to-buffer if switch-to-buffer failed. - (tags-table-format-functions): Renamed from tags-table-format-hooks. + (tags-table-format-functions): Rename from tags-table-format-hooks. * vc.el (vc-version-diff): diff-switches can be a list. Use relative filenames for prettier output. @@ -10658,8 +10658,8 @@ (jit-lock-unregister): Don't bother handling complex hooks any more. (jit-lock-refontify): New function. (jit-lock-fontify-buffer): Use it. - (jit-lock-function-1): Replaced by jit-lock-fontify-now. - (jit-lock-fontify-now): Renamed from jit-lock-function-1. + (jit-lock-function-1): Replace by jit-lock-fontify-now. + (jit-lock-fontify-now): Rename from jit-lock-function-1. Add optional args START and END. Never call font-lock-fontify-region directly. (jit-lock-function, jit-lock-stealth-fontify): Use it. @@ -10681,9 +10681,9 @@ * play/spook.el (spook-phrases-file): Use expand-file-name, not concat. - * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Don't - insist on symbols starting with word syntax. - (lisp-mode-shared-map): Renamed from shared-lisp-mode-map. + * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): + Don't insist on symbols starting with word syntax. + (lisp-mode-shared-map): Rename from shared-lisp-mode-map. (eval-defun-1): Doc fix. (indent-sexp): Use nconc to build up indent-stack. @@ -10732,8 +10732,8 @@ 2000-10-08 Eli Zaretskii - * international/titdic-cnv.el (quail-cxterm-package-ext-info): Fix - typos in doc strings. + * international/titdic-cnv.el (quail-cxterm-package-ext-info): + Fix typos in doc strings. * font-lock.el (font-lock-mode, global-font-lock-mode): Mention in the doc strings how to customize Font Lock faces. @@ -10846,7 +10846,7 @@ * net/net-utils.el (nslookup-prompt-regexp, ftp-prompt-regexp) (smbclient-prompt-regexp): Add usage note to doc string. - (ftp-font-lock-keywords, smbclient-font-lock-keywords): Removed. + (ftp-font-lock-keywords, smbclient-font-lock-keywords): Remove. (ftp-mode, smbclient-mode): Don't set `font-lock-defaults'. Use add-hook for adding the comint filter function, and only do so if it's not already in the global hook list. @@ -11002,7 +11002,7 @@ (ftp-font-lock-keywords, smbclient-font-lock-keywords): Only set if window-system is non-nil. (net-utils-run-program): Returns buffer. - (network-connection-reconnect): Added this function. + (network-connection-reconnect): Add this function. * generic.el: Incorporates extensive cleanup and docfixes by @@ -11011,16 +11011,16 @@ (generic-mode-name, generic-comment-list) (generic-keywords-list, generic-font-lock-expressions) (generic-mode-function-list, generic-mode-syntax-table): - Removed variables. - (generic-mode-alist): Renamed to generic-mode-list. + Remove variables. + (generic-mode-alist): Rename to generic-mode-list. (generic-find-file-regexp): Default changed to "^#". (generic-read-type): Uses completing read on generic-mode-list. - (generic-mode-sanity-check): Removed this function. - (generic-add-to-auto-mode): Removed this function. + (generic-mode-sanity-check): Remove this function. + (generic-add-to-auto-mode): Remove this function. (generic-mode-internal): Bind mode-specific definitions into function instead of putting them in alist. - (generic-mode-set-comments): Reworked extensively. - (generic-mode-find-file-hook): Simplified regexp searching. + (generic-mode-set-comments): Rework extensively. + (generic-mode-find-file-hook): Simplify regexp searching. (generic-make-keywords-list): Omit extra pair of parens. * find-lisp.el (find-lisp-find-files-internal): @@ -11028,13 +11028,13 @@ * generic-x.el (apache-conf-generic-mode): Regexp now allows leading whitespace. - (rc-generic-mode): Added eval-when-compile + (rc-generic-mode): Add eval-when-compile around generic-make-keywords-list. Deleted duplicate regexp. - (rul-generic-mode): Added eval-when-compile + (rul-generic-mode): Add eval-when-compile around generic-make-keywords-list. (etc-fstab-generic-mode): New generic mode. - (rul-generic-mode): Removed one eval-when-compile + (rul-generic-mode): Remove one eval-when-compile which caused a max-specpdl-size exceeded error. 2000-10-04 Miles Bader @@ -11084,7 +11084,7 @@ * isearch.el (isearch-faces): New custom group. (isearch): New defface; was already tested for in the code. - (isearch-lazy-highlight-face): Changed to defface from defcustom. + (isearch-lazy-highlight-face): Change to defface from defcustom. (isearch-highlight): Always use face `isearch'. 2000-10-02 Dave Love @@ -11155,14 +11155,14 @@ is visited. (vc-start-entry): New argument initial-contents. Don't visit the file if it isn't already visited. Brought documentation up-to-date. - (vc-next-action, vc-register): Updated calls to vc-start-entry. + (vc-next-action, vc-register): Update calls to vc-start-entry. (vc-checkin): New optional arg initial-contents, which is passed to vc-start-entry. (vc-finish-logentry): Make sure to bury log buffer only if there really is one. Call `vc-resynch-buffer' on log-file, not buffer-file-name. (vc-default-comment-history, vc-default-wash-log): New functions. - (vc-index-of): Removed. + (vc-index-of): Remove. (vc-transfer-file): Make do without the above. (vc-default-receive-file): Call comment-history unconditionally. Pass the resulting string to vc-checkin, instead of inserting it into the @@ -11175,8 +11175,8 @@ 2000-10-01 Miles Bader - * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): Call - `recenter' with an arg to prevent redrawing the display. + * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation): + Call `recenter' with an arg to prevent redrawing the display. 2000-09-30 Stefan Monnier @@ -11191,7 +11191,7 @@ (latex-imenu-create-index): Use it. Move the regexp construction outside loops (and use push). (tex-font-lock-keywords-1, tex-font-lock-keywords-2) - (tex-font-lock-keywords): Moved from font-lock.el. + (tex-font-lock-keywords): Move from font-lock.el. (tex-comment-indent): Remove. (tex-common-initialization): Don't set comment-indent-function. (latex-block-default): New var. @@ -11267,7 +11267,7 @@ 2000-09-29 Miles Bader * image-file.el (image-file-name-extensions): New variable. - (image-file-name-regexps): Renamed from `image-file-regexps'. + (image-file-name-regexps): Rename from `image-file-regexps'. New default value is nil. Call `auto-image-file-mode'. (image-file-name-regexp): New function. (auto-image-file-mode): New minor mode. @@ -11547,9 +11547,9 @@ type. (cperl-mode): Set normal-auto-fill-function and don't zap auto-fill-function. - (cperl-imenu--function-name-regexp-perl): Renamed from + (cperl-imenu--function-name-regexp-perl): Rename from imenu-example--function-name-regexp-perl. - (cperl-imenu--create-perl-index): Renamed from + (cperl-imenu--create-perl-index): Rename from imenu-example--create-perl-index. (cperl-xsub-scan): Don't require cl. @@ -11618,8 +11618,8 @@ 2000-09-20 Dave Love * iswitchb.el: Some doc fixes. - (iswitchb-mode-map): Define completely initially. Inherit - minibuffer-local-map. + (iswitchb-mode-map): Define completely initially. + Inherit minibuffer-local-map. (iswitchb-completion-help) : Use fundamental-mode. (iswitchb-global-map): New variable. @@ -11704,7 +11704,7 @@ * toolbar/tool-bar.el: Renamed from toolbar.el. Change `toolbar' to `tool-bar' generally in symbols. Make some items invisible in `special' major modes. - (tool-bar-add-item-from-menu): Renamed from toolbar-like-menu-item. + (tool-bar-add-item-from-menu): Rename from toolbar-like-menu-item. Add arg PROPS. * startup.el (fancy-splash-screen) : Fix syntax. @@ -11862,8 +11862,8 @@ * strokes.el: Sync with maintainer's current version with changes for Emacs, but avoid runtime cl and levents. (toplevel): Change autoloads and compilation requires. - (strokes-version, strokes-bug-address, strokes-lift): Values - changed. + (strokes-version, strokes-bug-address, strokes-lift): + Values changed. (strokes-xpm-header, strokes-insinuated): New variable. (strokes): Add :link. (strokes-mode): Customized. @@ -11890,8 +11890,8 @@ (strokes-xpm-encode-length-as-string, strokes-xpm-decode-char) (strokes-xpm-to-compressed-string, strokes-decode-buffer) (strokes-encode-buffer, strokes-xpm-for-compressed-string) - (strokes-compose-complex-stroke, strokes-alphabetic-lessp): New - functions. + (strokes-compose-complex-stroke, strokes-alphabetic-lessp): + New functions. 2000-09-15 Gerd Moellmann @@ -11944,10 +11944,10 @@ 2000-09-14 Alex Schroeder * ansi-color.el (ansi-colors): Doc change. - (ansi-color-get-face): Simplified regexp. - (ansi-color-faces-vector): Added more faces, doc change. + (ansi-color-get-face): Simplify regexp. + (ansi-color-faces-vector): Add more faces, doc change. (ansi-color-names-vector): Doc change. - (ansi-color-regexp): Simplified regexp. + (ansi-color-regexp): Simplify regexp. (ansi-color-parameter-regexp): New regexp. (ansi-color-filter-apply): Doc change. (ansi-color-filter-region): Doc change. @@ -11955,11 +11955,11 @@ deal with zero length parameters. (ansi-color-apply-on-region): Doc change. (ansi-color-map): Doc change. - (ansi-color-map-update): Removed debugging message. - (ansi-color-get-face-1): Added condition-case to trap + (ansi-color-map-update): Remove debugging message. + (ansi-color-get-face-1): Add condition-case to trap args-out-of-range errors. (ansi-color-get-face): Doc change. - (ansi-color-make-face): Removed. + (ansi-color-make-face): Remove. (ansi-color-for-shell-mode): New option. 2000-09-13 Kenichi Handa @@ -12022,25 +12022,25 @@ 2000-09-12 Kenichi Handa - * international/quail.el (quail-define-package): Docstring - modified. + * international/quail.el (quail-define-package): + Docstring modified. 2000-09-12 Kenichi Handa - * international/titdic-cnv.el (quail-cxterm-package-ext-info): Add - extra docstrings for "chinese-ccdospy", "chinese-ecdict", + * international/titdic-cnv.el (quail-cxterm-package-ext-info): + Add extra docstrings for "chinese-ccdospy", "chinese-ecdict", "chinese-etzy", "chinese-sw", and "chinese-ziranma". Modify the docstring of "chinese-py". - * international/quail.el (quail-translation-docstring): New - variable. + * international/quail.el (quail-translation-docstring): + New variable. (quail-show-keyboard-layout): Docstring modified. (quail-select-current): Likewise. (quail-build-decode-map): Change arg MAP to MAP-LIST to avoid infinite recursive call. (quail-help): Check quail-translation-docstring. Format of the output changed. - (quail-help-insert-keymap-description): Adjusted for the above + (quail-help-insert-keymap-description): Adjust for the above change. 2000-09-11 Gerd Moellmann @@ -12151,7 +12151,7 @@ 2000-09-07 Kenichi Handa - * help.el (help-make-xrefs): Adjusted for the change of + * help.el (help-make-xrefs): Adjust for the change of help-xref-mule-regexp. (help-insert-xref-button): New function. @@ -12205,10 +12205,10 @@ (vc-merge): Use RET for first version to trigger merge-news, not prefix arg. (vc-annotate): Handle backends that do not support annotation. - (vc-default-merge-news): Removed. The existence of a merge-news + (vc-default-merge-news): Remove. The existence of a merge-news implementation is now checked on caller sites. - * vc-hooks.el (vc-default-mode-line-string): Removed CVS special + * vc-hooks.el (vc-default-mode-line-string): Remove CVS special case. * vc-cvs.el (vc-cvs-mode-line-string): New function, handles the @@ -12227,11 +12227,11 @@ (vc-after-save): Call `vc-dired-resynch-file' only if vc is loaded. * vc.el: Require dired-aux during compilation. - (vc-name-assoc-file): Moved to vc-sccs.el. + (vc-name-assoc-file): Move to vc-sccs.el. (with-vc-properties): New macro. (vc-checkin, vc-checkout, vc-revert, vc-cancel-version) (vc-finish-steal): Use it. - (vc-cancel-version): Moved RCS-specific code to vc-rcs.el. The call + (vc-cancel-version): Move RCS-specific code to vc-rcs.el. The call to the backend-specific function is now supposed to do the checkout, too. (vc-log-edit): Handle FILE being nil and added a FIXME for log-edit. @@ -12239,15 +12239,15 @@ * vc-cvs.el (vc-cvs-checkin, vc-cvs-checkout): Don't bother to set file properties; that gets done in the generic code now. - * vc-rcs.el (vc-rcs-uncheck): Renamed to `vc-rcs-cancel-version'. + * vc-rcs.el (vc-rcs-uncheck): Rename to `vc-rcs-cancel-version'. Changed parameter list, added code from vc.el that does the checkout, possibly with a double-take. - * vc-sccs.el (vc-sccs-name-assoc-file): Moved here from vc.el. - (vc-sccs-add-triple, vc-sccs-rename-file, vc-sccs-lookup-triple): Use - the above under the new name. - (vc-sccs-uncheck): Renamed to `vc-sccs-cancel-version'. Changed - parameter list, added checkout command. + * vc-sccs.el (vc-sccs-name-assoc-file): Move here from vc.el. + (vc-sccs-add-triple, vc-sccs-rename-file, vc-sccs-lookup-triple): + Use the above under the new name. + (vc-sccs-uncheck): Rename to `vc-sccs-cancel-version'. + Changed parameter list, added checkout command. (vc-sccs-checkin, vc-sccs-checkout): Don't bother to set file properties; that gets done in the generic code now. @@ -12288,8 +12288,8 @@ * sql.el (sql-mode-menu): Work around missing variable mark-active in XEmacs. - (sql-mode): Added call to easy-menu-add for XEmacs compatibility. - (sql-interactive-mode): Added call to easy-menu-add for XEmacs + (sql-mode): Add call to easy-menu-add for XEmacs compatibility. + (sql-interactive-mode): Add call to easy-menu-add for XEmacs compatibility. 2000-09-04 Gerd Moellmann @@ -12339,8 +12339,8 @@ (vc-default-could-register): New function. (vc-dired-buffers-for-dir, vc-dired-resynch-file): New functions. (vc-resynch-buffer): Call vc-dired-resynch-file. - (vc-start-entry, vc-finish-logentry, vc-revert-buffer): Use - vc-resynch-buffer instead of vc-resynch-window. + (vc-start-entry, vc-finish-logentry, vc-revert-buffer): + Use vc-resynch-buffer instead of vc-resynch-window. (vc-next-action-dired): Don't redisplay here, that gets done as a result of the individual file operations. (vc-retrieve-snapshot): Corrected prompt order. @@ -12349,8 +12349,8 @@ * vc-cvs.el (vc-cvs-stay-local): Allow it to be a hostname regexp as well. - (vc-cvs-remote-p): Renamed to vc-cvs-stay-local-p. Handle - hostname regexps. Updated all callers. + (vc-cvs-remote-p): Rename to vc-cvs-stay-local-p. + Handle hostname regexps. Updated all callers. (vc-cvs-responsible-p): Handle directories as well. (vc-cvs-could-register): New function. (vc-cvs-retrieve-snapshot): Parse "cvs update" output, keep file @@ -12387,7 +12387,7 @@ (vc-dired-mode-map): Inherit from dired-mode-map. (vc-dired-mode): Local value of dired-move-to-filename-regexp simplified. - (vc-dired-state-info): Removed, updated caller. + (vc-dired-state-info): Remove, updated caller. (vc-default-dired-state-info): Use parentheses instead of hyphens. (vc-dired-hook): Use vc-BACKEND-dir-state, if available. (vc-dired-listing-switches): New variable. @@ -12428,7 +12428,7 @@ * vc.el (vc-next-action-on-file): Corrected several messages. (vc-merge): Add prefix arg `merge-news'; handle it. - * vc-cvs.el (vc-cvs-workfile-version): Removed comment that this + * vc-cvs.el (vc-cvs-workfile-version): Remove comment that this is not reached. It is. (vc-cvs-merge): Set state to 'edited after merge. (vc-cvs-merge-news): Set workfile version to nil if not known. @@ -12456,9 +12456,9 @@ (vc-new-comment-index): New function. (vc-previous-comment): Use it. Make the minibuffer message slightly less terse. - (vc-comment-search-reverse): Make it work forward as well. Don't - set vc-comment-ring-index if no match is found. Use - vc-new-comment-index. + (vc-comment-search-reverse): Make it work forward as well. + Don't set vc-comment-ring-index if no match is found. + Use vc-new-comment-index. (vc-comment-search-forward): Use vc-comment-search-reverse. (vc-dired-mode-map): Don't inherit from dired-mode-map since define-derived-mode will do it for us. Bind `v' to a keymap that @@ -12482,7 +12482,7 @@ (vc-cvs-stay-local): Default to t. (vc-cvs-remote-p): New function and property. (vc-cvs-state): Stay local only if the above is t. - (vc-handle-cvs): Removed. + (vc-handle-cvs): Remove. (vc-cvs-registered): Don't check vc-handle-cvs -- it should all be done via vc-handled-backends now. (vc-cvs-header): Escape Id. @@ -12499,10 +12499,10 @@ * vc.el (vc-exec-after): Fix disassembly of previous sentinel. (vc-print-log): Search current revision from beginning of buffer. (vc-revert-buffer): Clear echo area after the diff is finished. - (vc-prefix-map): Removed definition of "t" for terse display in vc + (vc-prefix-map): Remove definition of "t" for terse display in vc dired. - (vc-dired-mode-map): Inherit from dired-mode-map. Added - definition of "vt" for terse display. + (vc-dired-mode-map): Inherit from dired-mode-map. + Added definition of "vt" for terse display. (vc-dired-mode): Fix dired-move-to-filename-regexp. 2000-09-04 Stefan Monnier @@ -12520,11 +12520,11 @@ (vc-print-log): Use vc-exec-after and use log-view-goto-rev if present. - * vc-sccs.el (vc-sccs-state-heuristic): Use - file-ownership-preserved-p. + * vc-sccs.el (vc-sccs-state-heuristic): + Use file-ownership-preserved-p. - * vc-rcs.el (vc-rcs-state-heuristic): Use - file-ownership-preserved-p. + * vc-rcs.el (vc-rcs-state-heuristic): + Use file-ownership-preserved-p. (vc-rcs-checkout): Remove the error-handling for missing-rcs. 2000-09-04 Andre Spiegel @@ -12553,11 +12553,11 @@ current buffer without any fuss'. (vc-version-diff): Change the `diff' backend operation to just put the diff in the current buffer without erasing it. Always use - *vc-diff* even for directory-diffs. Use vc-setup-buffer. Protect - shrink-window-if-larger-than-buffer. + *vc-diff* even for directory-diffs. Use vc-setup-buffer. + Protect shrink-window-if-larger-than-buffer. (vc-print-log): Change the `print-log' backend operation to just - put the log in the current buffer without erasing it. Protect - shrink-window-if-larger-than-buffer. + put the log in the current buffer without erasing it. + Protect shrink-window-if-larger-than-buffer. (vc-update-change-log): Fix setd typo. * vc-sccs.el (vc-sccs-workfile-unchanged-p): Fix parenthesis. @@ -12567,8 +12567,8 @@ (vc-rcs-diff): Insert in the current buffer and remove unused arg CMP. - * vc-cvs.el (vc-cvs-state, vc-cvs-fetch-status): Use - with-temp-file. Use the new BUFFER=t argument to vc-do-command. + * vc-cvs.el (vc-cvs-state, vc-cvs-fetch-status): + Use with-temp-file. Use the new BUFFER=t argument to vc-do-command. (vc-cvs-print-log, vc-cvs-diff): Insert in the current buffer. 2000-09-04 Andre Spiegel @@ -12578,13 +12578,13 @@ (vc-default-workfile-unchanged-p): New function. Delegates to a full vc-BACKEND-diff. - * vc-hooks.el (vc-simple-command): Removed. + * vc-hooks.el (vc-simple-command): Remove. * vc-rcs.el (vc-rcs-workfile-unchanged-p): Use vc-do-command instead of vc-simple-command. - (vc-rcs-fetch-master-state): Removed check for unlocked-changes to + (vc-rcs-fetch-master-state): Remove check for unlocked-changes to avoid doing a diff when opening a file. - (vc-rcs-state): Added check for unlocked-changes. + (vc-rcs-state): Add check for unlocked-changes. (vc-rcs-header): Escape Id. (vc-rcs-workfile-unchanged-p): Remove optional arg VERSION. (vc-rcs-state): Call vc-workfile-unchanged-p, not the RCS-specific @@ -12600,7 +12600,7 @@ 2000-09-04 Stefan Monnier - * vc.el (vc-editable-p): Renamed from vc-writable-p. + * vc.el (vc-editable-p): Rename from vc-writable-p. (with-vc-file, vc-merge): Use vc-editable-p. (vc-do-command): Remove unused var vc-file and fix the doubly-defined `status' var. Add a user message when starting an @@ -12674,8 +12674,8 @@ way the function itself works. (vc-file-owner): Remove. - * vc-cvs.el (vc-cvs-registered): Use with-temp-buffer. Reorder - extraction of fields and call to file-attributes because of a + * vc-cvs.el (vc-cvs-registered): Use with-temp-buffer. + Reorder extraction of fields and call to file-attributes because of a temporary bug in rcp.el. (vc-cvs-fetch-status): Use with-current-buffer. @@ -12726,8 +12726,8 @@ * vc-rcs.el (vc-rcs-exists): Remove. (vc-rcs-header): New var. - * vc-sccs.el (vc-sccs-responsible-p, vc-sccs-register): Use - `vc-sccs-search-project-dir' instead of `vc-sccs-project-dir'. + * vc-sccs.el (vc-sccs-responsible-p, vc-sccs-register): + Use `vc-sccs-search-project-dir' instead of `vc-sccs-project-dir'. (vc-sccs-header): New var. * vc.el (vc-do-command): Get rid of the `last' argument. @@ -12761,8 +12761,8 @@ (vc-cancel-version): prettify error message with \\[...]. (vc-rename-master): New function. (vc-rename-file): Use vc-BACKEND-rename-file (which might in turn - use vc-rename-master) instead of vc-BACKEND-record-rename. Make - the CVS special case generic. + use vc-rename-master) instead of vc-BACKEND-record-rename. + Make the CVS special case generic. (vc-default-record-rename): Remove. (vc-file-tree-walk-internal): Only call FUNC for files that are under control of some VC backend and replace `concat' with @@ -12771,7 +12771,7 @@ (vc-version-diff, vc-snapshot-precondition, vc-create-snapshot) (vc-retrieve-snapshot): Update call to vc-file-tree-walk. - * vc-sccs.el (vc-sccs-rename-file): Renamed from + * vc-sccs.el (vc-sccs-rename-file): Rename from vc-sccs-record-rename. Use `find-file-noselect' rather than `find-file' and call `vc-rename-master' to do the actual move. (vc-sccs-diff): Remove unused `backend' variable. @@ -12833,7 +12833,7 @@ 2000-09-04 Stefan Monnier - * vc.el (vc-locking-user): Moved from vc-hooks.el. + * vc.el (vc-locking-user): Move from vc-hooks.el. 2000-09-04 Stefan Monnier @@ -12859,9 +12859,9 @@ using the default function. (vc-call-backend): If calling the default function, pass it the backend as first argument. Update the docstring accordingly. - (vc-default-state-heuristic, vc-default-mode-line-string): Update - for the new backend argument. - (vc-make-backend-sym): Renamed from vc-make-backend-function. + (vc-default-state-heuristic, vc-default-mode-line-string): + Update for the new backend argument. + (vc-make-backend-sym): Rename from vc-make-backend-function. (vc-find-backend-function): Use the new name. (vc-default-registered): New function. @@ -12927,8 +12927,8 @@ 2000-09-04 Andre Spiegel - * vc.el (vc-file-clear-masterprops): Removed. - (vc-checkin, vc-revert-buffer): Removed calls to the above. + * vc.el (vc-file-clear-masterprops): Remove. + (vc-checkin, vc-revert-buffer): Remove calls to the above. (vc-version-diff): Use buffer-size without argument. (vc-register): Heed vc-initial-comment. @@ -12937,12 +12937,12 @@ * vc-rcs.el (vc-rcs-register): Parse command output to find master file name and workfile version. - (vc-rcs-checkout): Removed call to vc-file-clear-masterprops. + (vc-rcs-checkout): Remove call to vc-file-clear-masterprops. - * vc-cvs.el (vc-cvs-merge-news, vc-cvs-checkout): Removed call to + * vc-cvs.el (vc-cvs-merge-news, vc-cvs-checkout): Remove call to vc-file-clear-masterprops. - * vc-sccs.el (vc-sccs-checkout): Removed call to + * vc-sccs.el (vc-sccs-checkout): Remove call to vc-file-clear-masterprops. If writable, set vc-state to 'edited rather than user login name. @@ -12969,7 +12969,7 @@ 2000-09-04 Andre Spiegel * vc.el (with-vc-file, vc-next-action, vc-version-diff) - (vc-dired-mark-locked): Replaced usage of vc-locking-user with + (vc-dired-mark-locked): Replace usage of vc-locking-user with vc-state or vc-up-to-date-p. (vc-merge): Use vc-backend-defines to check whether merging is possible. Set state to 'edited after successful merge. @@ -13015,25 +13015,25 @@ * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff): Run cvs asynchronously. * vc.el (vc-do-command): kill-all-local-variables, to reset any - major-mode in which the buffer might have been put earlier. Use - `remove' and `when'. Allow `okstatus' to be `async' and use + major-mode in which the buffer might have been put earlier. + Use `remove' and `when'. Allow `okstatus' to be `async' and use `start-process' in this case. (vc-version-diff): Handle the case where the diff looks empty because of the use of an async process. 2000-09-04 Andre Spiegel - * vc.el (vc-next-action-on-file): Removed optional parameter + * vc.el (vc-next-action-on-file): Remove optional parameter `simple'. Recompute state unconditionally. - (vc-default-toggle-read-only): Removed. + (vc-default-toggle-read-only): Remove. - * vc-hooks.el (vc-backend-functions): Removed vc-toggle-read-only. + * vc-hooks.el (vc-backend-functions): Remove vc-toggle-read-only. (vc-toggle-read-only): Undid prev change. - * vc-cvs.el (vc-cvs-stay-local): Renamed from + * vc-cvs.el (vc-cvs-stay-local): Rename from vc-cvs-simple-toggle. Redocumented. (vc-cvs-state): If locality is wanted, use vc-cvs-state-heuristic. - (vc-cvs-toggle-read-only): Removed. + (vc-cvs-toggle-read-only): Remove. 2000-09-04 Stefan Monnier @@ -13051,7 +13051,7 @@ (vc-dired-mode-map): Properly defvar it. (vc-print-log): Call log-view-mode if available. (small-temporary-file-directory): defvar instead of use boundp. - (vc-merge-news): Moved to vc-cvs.el. + (vc-merge-news): Move to vc-cvs.el. (vc-default-merge-news): New function. * vc-sccs.el: Require 'vc and 'vc-sccs-hooks. @@ -13075,7 +13075,7 @@ call to vc-rcs-latest-on-branch-p. Hopefully that was the right one. * vc-rcs-hooks.el: Provide 'vc-rcs-hooks. - (vc-rcs-trunk-p, vc-rcs-branch-part): Moved from vc-rcs.el. + (vc-rcs-trunk-p, vc-rcs-branch-part): Move from vc-rcs.el. (vc-rcs-latest-on-branch-p): Use the `version' argument rather than the apparently unbound `workfile-version'. @@ -13116,8 +13116,8 @@ * vc-cvs.el (vc-cvs-checkout): Docstring fix. Added a `(if workfile' that got lost when the code was extracted from vc.el. And merged the tail with the rest of the code (not possible in the - old vc.el where the tail was shared among all backends). And - explicitly set the state to 'edited if `writable' is set. + old vc.el where the tail was shared among all backends). + And explicitly set the state to 'edited if `writable' is set. * vc-cvs-hooks.el (vc-cvs-registered): Use expand-file-name. (vc-cvs-state): Be careful to return the value from @@ -13128,16 +13128,16 @@ workfile was nil). * vc.el: Removed those pesky unnecessary `(function' quotes. - (vc-annotate-mode-map, vc-annotate-mode-syntax-table): Initialize - directly in the defvar. + (vc-annotate-mode-map, vc-annotate-mode-syntax-table): + Initialize directly in the defvar. (vc-do-command): Bind inhibit-read-only so as to properly handle the case where the destination buffer has been made read-only. (vc-diff): Delegate to vc-version-diff in all cases. (vc-version-diff): Setup the *vc-diff* buffer as was done in vc-diff. - (vc-annotate-mode-variables): Removed (code moved partly to + (vc-annotate-mode-variables): Remove (code moved partly to defvars and partly to vc-annotate-add-menu). (vc-annotate-mode): Turned into a derived-mode. - (vc-annotate-add-menu): Moved in code in + (vc-annotate-add-menu): Move in code in vc-annotate-mode-variables. (vc-update-change-log): Use make-temp-file if available. @@ -13148,51 +13148,51 @@ 2000-09-04 Andre Spiegel - * vc.el (vc-next-action-on-file): Added handling of state + * vc.el (vc-next-action-on-file): Add handling of state `unlocked-changes'. (vc-checkout-carefully): Is now practically obsolete, unless the above is too slow to be enabled unconditionally. - (vc-update-change-log): Fixed typo. + (vc-update-change-log): Fix typo. - * vc-sccs.el (vc-sccs-steal-lock): Renamed from `vc-sccs-steal'. + * vc-sccs.el (vc-sccs-steal-lock): Rename from `vc-sccs-steal'. * vc-sccs-hooks.el (vc-sccs-state): Somewhat rewritten. Now handles state `unlocked-changes'. (vc-sccs-workfile-unchanged-p): New function, to support the above. - * vc-rcs.el (vc-rcs-steal-lock): Renamed from `vc-rcs-steal'. + * vc-rcs.el (vc-rcs-steal-lock): Rename from `vc-rcs-steal'. - * vc-rcs-hooks.el (vc-rcs-state): Fixed typo. + * vc-rcs-hooks.el (vc-rcs-state): Fix typo. (vc-rcs-fetch-master-state): Bug fixes. Recognize state `unlocked-changes'. - (vc-rcs-workfile-unchanged-p): Renamed from + (vc-rcs-workfile-unchanged-p): Rename from `vc-rcs-workfile-unchanged'. This is not a real backend-specific function yet, but supposed to become one soon. - * vc-hooks.el (vc-backend-functions): Renamed `vc-steal' to + * vc-hooks.el (vc-backend-functions): Rename `vc-steal' to `vc-steal-lock'. - (vc-call-backend): Changed error message. - (vc-state): Added description of state `unlocked-changes'. + (vc-call-backend): Change error message. + (vc-state): Add description of state `unlocked-changes'. 2000-09-04 Andre Spiegel - * vc-cvs-hooks.el (vc-cvs-registered): Fixed bug that caused it to + * vc-cvs-hooks.el (vc-cvs-registered): Fix bug that caused it to always return t in CVS-controlled directories. * vc.el (vc-responsible-backend): New function. (vc-register): Largely rewritten. - (vc-admin): Removed (implementation moved into vc-register). + (vc-admin): Remove (implementation moved into vc-register). (vc-checkin): Redocumented. (vc-finish-logentry): If no backend defined yet (because we are in the process of registering), use the responsible backend. * vc-hooks.el (vc-backend-hook-functions, vc-backend-functions): - Updated function lists. - (vc-call-backend): Fixed typo. + Update function lists. + (vc-call-backend): Fix typo. * vc-sccs.el, vc-rcs.el, vc-cvs.el (vc-BACKEND-responsible-p): New functions. - (vc-BACKEND-register): Renamed from `vc-BACKEND-admin'. + (vc-BACKEND-register): Rename from `vc-BACKEND-admin'. Removed query option. Redocumented. 2000-09-04 Andre Spiegel @@ -13204,18 +13204,18 @@ 2000-09-04 Martin Lorentzson - * vc-rcs.el (vc-rcs-backend-release-p): function added. other - stuff updated to reference this function instead of the old + * vc-rcs.el (vc-rcs-backend-release-p): function added. + other stuff updated to reference this function instead of the old `vc-backend-release-p'. 2000-09-04 Andre Spiegel - * vc-sccs-hooks.el (vc-uses-locking): Renamed to + * vc-sccs-hooks.el (vc-uses-locking): Rename to vc-checkout-model. Return appropriate values. Updated callers. 2000-09-04 Martin Lorentzson - * vc.el (vc-backend-release, vc-backend-release-p): Moved to vc-rcs.el. + * vc.el (vc-backend-release, vc-backend-release-p): Move to vc-rcs.el. (vc-backend-revert): Function moved into `vc-revert'; `vc-next-action' must be updated to accommodate this change. (vc-backend-steal): Function moved into `vc-finish-steal'. @@ -13295,31 +13295,31 @@ 2000-09-04 Andre Spiegel * vc.el (vc-next-action-on-file): Rewritten for the new state model. - (vc-backend-merge-news): Renamed to `vc-merge-news'. (Specific parts + (vc-backend-merge-news): Rename to `vc-merge-news'. (Specific parts still need to be split, and implemented for RCS). 2000-09-04 Martin Lorentzson * vc-sccs-hooks.el (vc-sccs-state-heuristic): Bug found and fixed. - * vc-sccs.el (vc-sccs-admin): Added the query-only option as + * vc-sccs.el (vc-sccs-admin): Add the query-only option as required by the vc.el file. - * vc-rcs.el (vc-rcs-admin): Added the query-only option as + * vc-rcs.el (vc-rcs-admin): Add the query-only option as required by the vc.el file. (vc-rcs-exists): Function added. - * vc-cvs.el (vc-cvs-admin): Added the query-only option as + * vc-cvs.el (vc-cvs-admin): Add the query-only option as required by the vc.el file. - * vc.el (vc-admin): Updated to handle selection of appropriate + * vc.el (vc-admin): Update to handle selection of appropriate backend. Current implementation is crufty and need re-thinking. * vc-hooks.el (vc-parse-buffer): Bug found and fixed. 2000-09-04 Martin Lorentzson - * vc-cvs.el (vc-cvs-annotate-difference): Updated to handle + * vc-cvs.el (vc-cvs-annotate-difference): Update to handle beginning of annotate buffers correctly. * vc.el (vc-annotate-get-backend, vc-annotate-display-default) @@ -13338,11 +13338,11 @@ 2000-09-04 Martin Lorentzson - * vc-sccs-hooks.el (vc-sccs-registered): Updated. - - * vc-rcs-hooks.el (vc-rcs-registered): Updated. - - * vc-cvs-hooks.el (vc-cvs-registered): Updated. + * vc-sccs-hooks.el (vc-sccs-registered): Update. + + * vc-rcs-hooks.el (vc-rcs-registered): Update. + + * vc-cvs-hooks.el (vc-cvs-registered): Update. 2000-09-04 Martin Lorentzson @@ -13434,8 +13434,8 @@ * vc-hooks.el (vc-master-templates): Is really obsolete. Comment out the definition for now. What is the right procedure to get rid of it? - (vc-registered, vc-backend, vc-buffer-backend, vc-name): Largely - rewritten. + (vc-registered, vc-backend, vc-buffer-backend, vc-name): + Largely rewritten. (vc-default-registered): Remove. (vc-check-master-templates): New function; does mostly what the above did before. @@ -13482,12 +13482,12 @@ * vc.el (vc-backend-checkout): Function removed and replaced in the vc-backend.el files. - * vc-sccs.el (vc-sccs-checkout): Added function `vc-sccs-checkout'. + * vc-sccs.el (vc-sccs-checkout): Add function `vc-sccs-checkout'. - * vc.el (vc-backend-admin): Removed and replaced in the + * vc.el (vc-backend-admin): Remove and replaced in the vc-backend.el files. - * vc.el (Martin): Removed all the annotate functionality since it + * vc.el (Martin): Remove all the annotate functionality since it is CVS backend specific. 2000-09-04 Andre Spiegel @@ -13513,7 +13513,7 @@ (vc-logentry-check-hook): New option. (vc-steal-lock): Use compose-mail. (vc-dired-mode-map): Defvar when compiling. - (vc-add-triple, vc-record-rename, vc-lookup-triple): Moved to + (vc-add-triple, vc-record-rename, vc-lookup-triple): Move to vc-sccs.el and renamed. Callers changed. (vc-backend-checkout, vc-backend-logentry-check) (vc-backend-merge-news): Doc fix. @@ -13538,7 +13538,7 @@ (vc-rcs-checkin): New functions (code from vc.el). (vc-rcs-previous-version, vc-rcs-system-release, vc-rcs-checkout): Doc fix. - (vc-rcs-release): Deleted. (Duplicated vc-rcs-system-release). + (vc-rcs-release): Delete. (Duplicated vc-rcs-system-release). * vc-sccs.el: Require vc when compiling. (vc-sccs-print-log, vc-sccs-assign-name, vc-sccs-merge) @@ -13547,7 +13547,7 @@ (vc-sccs-checkin, vc-sccs-logentry-check): New functions (code from vc.el). (vc-sccs-add-triple, vc-sccs-record-rename) - (vc-sccs-lookup-triple): Moved from vc.el and renamed. + (vc-sccs-lookup-triple): Move from vc.el and renamed. (vc-sccs-admin): Doc fix. 2000-09-04 Martin Lorentzson @@ -13557,64 +13557,64 @@ (vc-rcs-release-p, vc-rcs-admin, vc-rcs-checkout): New functions from vc.el. - * vc-sccs.el (vc-admin-sccs): Added from vc.el + * vc-sccs.el (vc-admin-sccs): Add from vc.el * vc-cvs.el: Moved the annotate functionality from vc.el. - (vc-cvs-admin, vc-cvs-fetch-status): Added from vc.el. + (vc-cvs-admin, vc-cvs-fetch-status): Add from vc.el. 2000-09-04 Dave Love * vc.el (vc-backend-release): Call vc-system-release. * vc-sccs.el (vc-sccs-system-release): - Renamed from vc-sccs-backend-release. + Rename from vc-sccs-backend-release. * vc-rcs.el (vc-rcs-system-release): - Renamed from vc-rcs-backend-release. + Rename from vc-rcs-backend-release. * vc-cvs.el (vc-cvs-system-release): - Renamed from vc-cvs-backend-release. + Rename from vc-cvs-backend-release. 2000-09-04 Dave Love - * vc.el (vc-rcs-release, vc-cvs-release, vc-sccs-release): Moved to + * vc.el (vc-rcs-release, vc-cvs-release, vc-sccs-release): Move to backend files. (vc-backend-release): Dispatch to backend functions. (vc-backend-release-p): Don't mention CVS, RCS. [The SCCS case probably needs attention.] - * vc-sccs.el, vc-rcs.el (vc-sccs-release): Moved from vc.el. + * vc-sccs.el, vc-rcs.el (vc-sccs-release): Move from vc.el. (vc-sccs-backend-release): New function. - * vc-cvs.el (vc-cvs-release): Moved from vc.el. + * vc-cvs.el (vc-cvs-release): Move from vc.el. (vc-cvs-backend-release): New function. * vc.el (vc-dired-mode, vc-dired-reformat-line, vc-dired-purge): Doc fix. - (vc-fetch-cvs-status): Moved to vc-cvs.el and renamed. + (vc-fetch-cvs-status): Move to vc-cvs.el and renamed. (vc-default-dired-state-info): New function. (vc-dired-state-info): Dispatch to backends. (vc-dired-hook): Doc fix. Simplify, pending removal of CVS specifics. - * vc-cvs.el (vc-cvs-dired-state-info, vc-cvs-fetch-status): Moved - from vc.el and renamed. + * vc-cvs.el (vc-cvs-dired-state-info, vc-cvs-fetch-status): + Move from vc.el and renamed. 2000-09-04 Andre Spiegel * vc.el (vc-file-clear-masterprops, vc-latest-on-branch-p) - (vc-version-other-window, vc-backend-assign-name): Removed - references to vc-latest-version; sometimes changed into + (vc-version-other-window, vc-backend-assign-name): + Remove references to vc-latest-version; sometimes changed into vc-workfile-version. - * vc-rcs-hooks.el (vc-master-workfile-version): Renamed to + * vc-rcs-hooks.el (vc-master-workfile-version): Rename to vc-rcs-master-workfile-version. (vc-rcs-workfile-version): Use the above. Don't call vc-latest-version (that was unreachable code, anyway). (vc-rcs-fetch-master-properties): Doc fix. - * vc-hooks.el (vc-latest-version, vc-your-latest-version): Removed. - (vc-backend-hook-functions): Removed them from this list, too. - (vc-fetch-properties): Removed. + * vc-hooks.el (vc-latest-version, vc-your-latest-version): Remove. + (vc-backend-hook-functions): Remove them from this list, too. + (vc-fetch-properties): Remove. (vc-workfile-version): Doc fix. * vc-rcs-hooks.el (vc-rcs-consult-headers): New function. @@ -13622,7 +13622,7 @@ (vc-rcs-uses-locking): Use it. * vc-hooks.el (vc-consult-rcs-headers): - Moved into vc-rcs-hooks.el, under the name + Move into vc-rcs-hooks.el, under the name vc-rcs-consult-headers. * vc-cvs-hooks.el (vc-cvs-workfile-version): Don't consult RCS @@ -13638,7 +13638,7 @@ New functions. * vc-hooks.el (vc-master-locks, vc-master-locking-user): - Moved into both + Move into both vc-rcs-hooks.el and vc-sccs-hooks.el. These properties and access functions are implementation details of those two backends. @@ -13654,31 +13654,31 @@ * vc-cvs-hooks.el (vc-cvs-fetch-master-properties): CVS-specific code moved here from vc-hooks. - * vc-hooks.el (vc-parse-locks, vc-fetch-master-properties): Split - into back-end specific parts and removed. Callers not updated + * vc-hooks.el (vc-parse-locks, vc-fetch-master-properties): + Split into back-end specific parts and removed. Callers not updated yet; because I guess these callers will disappear into back-end specific files anyway. 2000-09-04 Andre Spiegel * vc.el (with-vc-file, vc-next-action-on-file, vc-merge) - (vc-backend-checkout): Changed calls to `vc-checkout-model' to + (vc-backend-checkout): Change calls to `vc-checkout-model' to `vc-uses-locking'. - * vc-hooks.el (vc-checkout-model): Renamed to vc-uses-locking. + * vc-hooks.el (vc-checkout-model): Rename to vc-uses-locking. Store yes/no in the property, and return t/nil. Updated all callers. - * vc-sccs-hooks.el (vc-sccs-checkout-model): Renamed to + * vc-sccs-hooks.el (vc-sccs-checkout-model): Rename to vc-sccs-uses-locking. Don't set property. (vc-sccs-locking-user): Don't set property. - * vc-cvs-hooks.el (vc-cvs-checkout-model): Renamed to + * vc-cvs-hooks.el (vc-cvs-checkout-model): Rename to vc-cvs-uses-locking. Don't set property here; leave that to vc-hooks. (vc-cvs-locking-user): Reflect above change. Streamlined. - * vc-rcs-hooks.el (vc-rcs-checkout-model): Renamed to + * vc-rcs-hooks.el (vc-rcs-checkout-model): Rename to vc-rcs-uses-locking. (vc-rcs-locking-user): Reflect above change. @@ -13709,36 +13709,36 @@ 2000-09-04 Dave Love * vc-hooks.el (vc-rcsdiff-knows-brief, vc-rcs-lock-from-diff) - (vc-master-workfile-version): Moved from vc-hooks. + (vc-master-workfile-version): Move from vc-hooks. * vc-rcs-hooks.el: Fix duplicate code in last change. * vc-rcs-hooks.el: Require vc-hooks when compiling. (vc-rcs-master-templates): Improve :type. (vc-rcsdiff-knows-brief, vc-rcs-lock-from-diff) - (vc-master-workfile-version): Moved from vc-hooks. + (vc-master-workfile-version): Move from vc-hooks. * vc-sccs-hooks.el: Require vc-hooks when compiling. (vc-sccs-master-templates): Improve :type. (vc-sccs-lock-file): Moved/renamed from vc-hooks.el vc-lock-file. - * vc-hooks.el (vc-lock-file): Moved to vc-sccs-hooks and renamed. + * vc-hooks.el (vc-lock-file): Move to vc-sccs-hooks and renamed. * vc-cvs-hooks.el: Require vc-hooks when compiling. - (vc-cvs-master-templates): Improve :type. Use - vc-cvs-find-cvs-master. - (vc-handle-cvs, vc-cvs-parse-status, vc-cvs-status): Moved here + (vc-cvs-master-templates): Improve :type. + Use vc-cvs-find-cvs-master. + (vc-handle-cvs, vc-cvs-parse-status, vc-cvs-status): Move here from vc-hooks. - (vc-vc-find-cvs-master): Renamed to vc-cvs-find-cvs-master. + (vc-vc-find-cvs-master): Rename to vc-cvs-find-cvs-master. * vc-hooks.el (vc-handle-cvs, vc-cvs-parse-status, vc-cvs-status): - Moved to vc-cvs-hooks. + Move to vc-cvs-hooks. * vc-hooks.el: Add doc strings in various places. Simplify the minor mode setup. (vc-handled-backends): New user variable. - (vc-parse-buffer, vc-insert-file, vc-default-registered): Minor - simplification. + (vc-parse-buffer, vc-insert-file, vc-default-registered): + Minor simplification. 2000-09-04 Dave Love @@ -13796,11 +13796,11 @@ 2000-09-04 Dave Love - * mouse.el (mouse-major-mode-menu, mouse-popup-menubar): Run - menu-bar-update-hook. + * mouse.el (mouse-major-mode-menu, mouse-popup-menubar): + Run menu-bar-update-hook. - * help.el (help-manyarg-func-alist): Add - find-operation-coding-system. + * help.el (help-manyarg-func-alist): + Add find-operation-coding-system. * wid-edit.el (widget-sexp-validate): Fix garbled code. @@ -13823,7 +13823,7 @@ 2000-09-01 John Wiegley - * pcomplete.el (pcomplete-dirs-or-entries): Added a missing + * pcomplete.el (pcomplete-dirs-or-entries): Add a missing predicate, which caused entries in the completion list to be doubled. @@ -13843,8 +13843,8 @@ 2000-08-28 John Wiegley - * eshell/esh-var.el (pcomplete/eshell-mode/unset): Added - completion function for Eshell's implementation of `unset'. + * eshell/esh-var.el (pcomplete/eshell-mode/unset): + Add completion function for Eshell's implementation of `unset'. 2000-09-02 Eli Zaretskii @@ -13863,8 +13863,8 @@ 2000-08-30 Andrew Innes * timer.el (run-with-idle-timer): Undo last change, so that timer - is not activated immediately if Emacs is already idle. Some - existing code relies on this behavior. + is not activated immediately if Emacs is already idle. + Some existing code relies on this behavior. 2000-08-30 Miles Bader @@ -13924,22 +13924,22 @@ * help.el (help-xref-mule-regexp): New variable. (help-make-xrefs): Handle help-xref-mule-regexp. - * international/mule-cmds.el (help-xref-mule-regexp-template): New - variable. + * international/mule-cmds.el (help-xref-mule-regexp-template): + New variable. (describe-input-method): Temporarily activate the specified input method to display the information. (describe-language-environment): Hyperlinks to mule related items. - * international/mule-diag.el (charset-multibyte-form-string): New - function. + * international/mule-diag.el (charset-multibyte-form-string): + New function. (list-character-sets-1): Use charset-multibyte-form-string. (describe-character-set): New function. (describe-coding-system): Hyperlinks to safe character sets. * international/quail.el (quail-help): New arg PACKAGE. Hyperlinks to mule related items. - (quail-help-insert-keymap-description): Use - substitute-command-keys instead of describe-bindings. + (quail-help-insert-keymap-description): + Use substitute-command-keys instead of describe-bindings. (quail-translation-help): Hyperlinks to mule related items. 2000-08-28 John Wiegley @@ -13948,7 +13948,7 @@ have a defsubst call itself. Made `eshell-flatten-list' back into a function again. - * eshell/em-smart.el (eshell-smart-redisplay): Added a safety + * eshell/em-smart.el (eshell-smart-redisplay): Add a safety catch, in case re-centering point at bottom messes up the display. This happens frequently in Emacs 21, due I believe to variable line heights. @@ -13978,11 +13978,11 @@ (eshell-copy-handles): Created a new macro for duplicating the current set of open handles. This is needed by the looping functions. - (eshell-do-eval): Fixed while and if, so that the eshell-test-body + (eshell-do-eval): Fix while and if, so that the eshell-test-body is not incorrectly stomped on. - * eshell/em-cmpl.el (eshell-cmpl-use-paring): Mirror - declaration for pcomplete-use-paring. + * eshell/em-cmpl.el (eshell-cmpl-use-paring): + Mirror declaration for pcomplete-use-paring. (eshell-cmpl-initialize): Set pcomplete-use-paring based on the value of eshell-cmpl-use-paring. * pcomplete.el (pcomplete-use-paring): New config variable, to @@ -13990,7 +13990,7 @@ (pcomplete-do-complete): If pcomplete-use-paring is t, pare out completion alternatives that have already been used. - * eshell/esh-mode.el (eshell-repeat-argument): Added function, + * eshell/esh-mode.el (eshell-repeat-argument): Add function, bound to C-c C-y, which will repeat the previous N arguments (based on prefix argument). (eshell-mode): Bind C-c C-y to eshell-repeat-argument. @@ -14001,8 +14001,8 @@ name to delete is. * eshell/esh-util.el (eshell-read-passwd-file): Only keep the - first entry that correlates to a passwd/group number. Later - entries (used for group/user name aliasing to multiple IDs) are + first entry that correlates to a passwd/group number. + Later entries (used for group/user name aliasing to multiple IDs) are ignored. * eshell/em-xtra.el (eshell/expr): @@ -14011,7 +14011,7 @@ * eshell/em-dirs.el (eshell-dirs-substitute-cd): Flatten the argument list, before passing it to the system command. - * eshell/esh-mode.el (eshell-find-tag): Added a special version of + * eshell/esh-mode.el (eshell-find-tag): Add a special version of `find-tag' for use at final position in Eshell buffers (which otherwise triggers an error on Emacs 21). (eshell-mode): Bind M-. to `eshell-find-tag' with the Eshell @@ -14030,10 +14030,10 @@ types RET after an open delimiter (like "), display a message indicating that Eshell is waiting for the closing delimiter. - * eshell/esh-var.el (eshell/unset): Added a command for unsetting + * eshell/esh-var.el (eshell/unset): Add a command for unsetting environment variables. - * eshell/em-unix.el (eshell/diff): Added logic to fail more + * eshell/em-unix.el (eshell/diff): Add logic to fail more gracefully if the user enters incorrect arguments. * eshell/esh-mode.el (eshell-mode): Disable auto-fill-function in @@ -14046,7 +14046,7 @@ * eshell/em-ls.el (eshell-ls-decorated-name): Use /= instead of (not (= ...)). - * eshell/em-unix.el (eshell-shuffle-files): Added use of `apply', + * eshell/em-unix.el (eshell-shuffle-files): Add use of `apply', to ensure the `preserve' flag gets propagated when doing recursive directory copies. @@ -14059,15 +14059,15 @@ 2000-08-28 Eli Zaretskii - * eshell/esh-util.el (eshell-processp): Added to relieve constant + * eshell/esh-util.el (eshell-processp): Add to relieve constant testing of `fboundp' on `processp'. * eshell/esh-proc.el (eshell/kill): Use eshell-processp. (eshell/jobs): Don't call process-list if it is not bound. (eshell-gather-process-output): Support systems where async subprocesses aren't supported. - (eshell-scratch-buffer, eshell-last-sync-output-start): New - variables. + (eshell-scratch-buffer, eshell-last-sync-output-start): + New variables. * eshell/esh-cmd.el (eshell-resume-eval): Handle the case when eshell-do-eval returns t. @@ -14082,8 +14082,8 @@ * eshell/esh-io.el (eshell-virtual-targets): Doc fix. (eshell-close-target, eshell-get-target): Use eshell-processp. - (eshell-print, eshell-error, eshell-errorn, eshell-printn): Doc - fix. + (eshell-print, eshell-error, eshell-errorn, eshell-printn): + Doc fix. (eshell-get-target, eshell-create-handles): Doc fix. 2000-08-28 Miles Bader @@ -14173,15 +14173,15 @@ 2000-08-25 Kenichi Handa - * terminal.el (terminal-emulator): Fix args to `concat'. Now - concat doesn't accept integer. + * terminal.el (terminal-emulator): Fix args to `concat'. + Now concat doesn't accept integer. - * international/kkc.el: Remove SKK from Keywords. Require - ja-dic-utl instead of skkdic-utl. + * international/kkc.el: Remove SKK from Keywords. + Require ja-dic-utl instead of skkdic-utl. * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el. Provide ja-dic-cnv instead of skkdic-cnv. - (ja-dic-filename): Renamed from skkdic-filename. Referrers changed. + (ja-dic-filename): Rename from skkdic-filename. Referrers changed. (iso-2022-7bit-short): Add safe-charsets property. (skkdic-convert-postfix): Search Japanese chou-on character in addition to Hiragana character. @@ -14208,8 +14208,8 @@ 2000-08-24 Kenichi Handa - * international/mule-cmds.el (reset-language-environment): Set - default-process-coding-system to '(undecided . iso-latin-1), which + * international/mule-cmds.el (reset-language-environment): + Set default-process-coding-system to '(undecided . iso-latin-1), which makes process I/O almost consistent with file I/O. Call this function when mule-cmds.el[c] is loaded. @@ -14318,8 +14318,8 @@ * comint.el (comint-output-filter): Save the point with a marker, not just a buffer position. - * international/mule.el (set-buffer-process-coding-system): Make - interactive prompt less confusing. + * international/mule.el (set-buffer-process-coding-system): + Make interactive prompt less confusing. 2000-08-19 Gerd Moellmann @@ -14358,8 +14358,8 @@ 2000-08-18 Gerd Moellmann - * textmodes/ispell.el (ispell-dictionary-alist-6): Add - `portugues'. + * textmodes/ispell.el (ispell-dictionary-alist-6): + Add `portugues'. * bindings.el (esc-map): Bind `C-delete' and `C-backspace' to backward-kill-sexp, analogous to kill-sexp. @@ -14372,18 +14372,18 @@ * ispell.el: Set to standard author/maintainer/keyword fields. Fine tuning to menu map appearance and operation, and added help. Remove `start' and `end' error messages when compiling. - (ispell-choices-win-default-height): Fixed comment string. - (ispell-dictionary-alist-1): Fixed regexp in castellano and + (ispell-choices-win-default-height): Fix comment string. + (ispell-dictionary-alist-1): Fix regexp in castellano and castellano8 dictionaries. - (ispell-dictionary-alist-3): Fixed regexp in francais dictionary. - (ispell-dictionary-alist-4): Fixed regexp in francais-tex + (ispell-dictionary-alist-3): Fix regexp in francais dictionary. + (ispell-dictionary-alist-4): Fix regexp in francais-tex dictionary, added italiano dictionary. - (ispell-skip-region-alist): Removed regexp thrashing when `-' is a + (ispell-skip-region-alist): Remove regexp thrashing when `-' is a word character. - (ispell-tex-skip-alists): Added psfig support. - (ispell-skip-html): Renamed from ispell-skip-sgml. + (ispell-tex-skip-alists): Add psfig support. + (ispell-skip-html): Rename from ispell-skip-sgml. (ispell-begin-skip-region-regexp, ispell-skip-region) - (ispell-minor-check): Improved html skipping support to skip across + (ispell-minor-check): Improve html skipping support to skip across code, and recognize `&' commands without proper `;' syntax. (ispell-process-line): Fix alignment error when manually correcting spelling. @@ -14397,8 +14397,8 @@ shell-command-on-region as in format-decode-run-method because shell-command-on-region can display a buffer with error output. (format-decode): Don't record undo information for the decoding. - (format-annotate-function): Add parameter FORMAT-COUNT. Make - that number part of the temporary buffer name so that more than + (format-annotate-function): Add parameter FORMAT-COUNT. + Make that number part of the temporary buffer name so that more than one decoding using a temporary buffer can happen safely. * enriched.el (enriched-annotation-regexp): Use `A-Z' instead @@ -14571,16 +14571,16 @@ 2000-08-15 Miles Bader * textmodes/ispell.el (ispell-graphic-p): New constant. - (ispell-choices-win-default-height, ispell-help): Use - `ispell-graphic-p' instead of `xemacsp'. + (ispell-choices-win-default-height, ispell-help): + Use `ispell-graphic-p' instead of `xemacsp'. 2000-08-15 Dave Love * simple.el: Autoload widget-convert when compiling. (mail-user-agent): Doc fix. - * help.el (function-called-at-point, variable-at-point): Use - with-syntax-table. + * help.el (function-called-at-point, variable-at-point): + Use with-syntax-table. (help-manyarg-func-alist): Add insert-and-inherit. * thingatpt.el (thing-at-point-url-regexp): Prepend `\<'. @@ -14589,7 +14589,7 @@ * find-file.el: Doc fixes. Move provide to end. (ff) : Add :link. - (ff-goto-click): Deleted. + (ff-goto-click): Delete. (ff-mouse-find-other-file, ff-mouse-find-other-file-other-window): Use mouse-set-point. @@ -14615,8 +14615,8 @@ Doze and Dog. (browse-url): Use dolist, not mapcar. (browse-url-at-point): Check for null url. - (browse-url-event-buffer, browse-url-event-point): Functions - deleted. + (browse-url-event-buffer, browse-url-event-point): + Functions deleted. (browse-url-at-mouse, browse-url-netscape): Simplify. * msb.el (msb--few-menus, msb--very-many-menus): Use current Gnus @@ -14724,7 +14724,7 @@ (comint-snapshot-last-prompt): New function. (comint-send-input): Snapshot the last prompt. Use comint-highlight-input-face. - (comint-highlight-input-face): Renamed from `comint-highlight-face'. + (comint-highlight-input-face): Rename from `comint-highlight-face'. Use defface instead of defcustom. (send-invisible, comint-send-eof): Snapshot the last prompt. (comint-delchar-or-maybe-eof): Use comint-send-eof. @@ -14785,8 +14785,8 @@ * emacs-lisp/lisp-mode.el (eval-last-sexp-1): Handle `#N=' labels. - * help.el (print-help-return-message): When - display-buffer-reuse-frames is set, let the help window been quit, + * help.el (print-help-return-message): + When display-buffer-reuse-frames is set, let the help window been quit, instead of deleting it, which might delete a reused frame. 2000-08-08 Eli Zaretskii @@ -14807,7 +14807,7 @@ * emacs-lisp/cl-indent.el (toplevel): Indent `defclass', `defconst', `define-condition', `with-slots'. - * font-lock.el (lisp-font-lock-keywords-2): Added `with-' and `do-'. + * font-lock.el (lisp-font-lock-keywords-2): Add `with-' and `do-'. 2000-08-03 Miles Bader @@ -14826,16 +14826,16 @@ properties if comint-use-prompt-regexp-instead-of-fields is nil. (comint-line-beginning-position): New function. (comint-bol): Use comint-line-beginning-position. Make ARG optional. - (comint-replace-by-expanded-history-before-point): Use - comint-line-beginning-position and line-end-position. + (comint-replace-by-expanded-history-before-point): + Use comint-line-beginning-position and line-end-position. (comint-last-output-overlay): New variable. (comint-mode): Make `comint-last-output-overlay' buffer-local. * shell.el (shell-prompt-pattern): Doc change. (shell-backward-command): Use line-beginning-position. - * gud.el (gud-gdb-complete-command): Use - comint-line-beginning-position. + * gud.el (gud-gdb-complete-command): + Use comint-line-beginning-position. * ielm.el (ielm-indent-line): Detect a "prompt" line by seeing if comint-bol doesn't actually go to the beginning of the line. @@ -14849,13 +14849,13 @@ (sql-copy-column): Use comint-line-beginning-position instead of explicitly matching comint-prompt-regexp. - * progmodes/octave-inf.el (inferior-octave-complete): Use - comint-line-beginning-position. + * progmodes/octave-inf.el (inferior-octave-complete): + Use comint-line-beginning-position. * progmodes/inf-lisp.el (inferior-lisp-prompt): Doc change. - * progmodes/idlw-shell.el (idlwave-shell-send-command): When - looking for a prompt, use `forward-line 0' instead of + * progmodes/idlw-shell.el (idlwave-shell-send-command): + When looking for a prompt, use `forward-line 0' instead of `beginning-of-line', to avoid getting caught by an input field. 2000-08-07 Gerd Moellmann @@ -14926,8 +14926,8 @@ 2000-08-03 Eli Zaretskii - * international/mule-cmds.el (select-safe-coding-system): Make - the message text about selecting a safe coding system more clear. + * international/mule-cmds.el (select-safe-coding-system): + Make the message text about selecting a safe coding system more clear. 2000-08-02 Gerd Moellmann @@ -14951,8 +14951,8 @@ 2000-08-02 Eli Zaretskii - * progmodes/ebrowse.el (ebrowse-tree-mode-map): Use - display-mouse-p instead of window-system. + * progmodes/ebrowse.el (ebrowse-tree-mode-map): + Use display-mouse-p instead of window-system. (ebrowse-member-mode-map): Ditto. 2000-08-01 Vinicius Jose Latorre @@ -14968,8 +14968,8 @@ font lock support on window-system. (ftp-font-lock-keywords, smbclient-font-lock-keywords): Likewise. - * textmodes/ispell.el (ispell-highlight-spelling-error): Use - display-color-p, if fboundp, instead of window-system. + * textmodes/ispell.el (ispell-highlight-spelling-error): + Use display-color-p, if fboundp, instead of window-system. 2000-07-31 Eli Zaretskii @@ -15060,8 +15060,8 @@ * subr.el (remove, remq): New functions. - * midnight.el (clean-buffer-list-kill-never-regexps): Correctly - escape `*' in regexps. + * midnight.el (clean-buffer-list-kill-never-regexps): + Correctly escape `*' in regexps. (midnight-find): Reverse order of arguments in the funcall of TEST. @@ -15072,12 +15072,12 @@ 2000-07-27 Alex Schroeder - * sql.el (sql-ms): Added autoload cookie. + * sql.el (sql-ms): Add autoload cookie. (sql-ingres, sql-solid, sql-mysql, sql-informix, sql-sybase) (sql-oracle): Ditto. (sql-help): Doc change. - (sql-mode-oracle-font-lock-keywords): Added PL/SQL keywords, data + (sql-mode-oracle-font-lock-keywords): Add PL/SQL keywords, data types and exceptions. 2000-07-27 Alex Schroeder @@ -15112,11 +15112,11 @@ (find-coding-systems-region-subset-p): This function deleted. (sort-coding-systems-predicate): New variable. (sort-coding-systems): New function. - (find-coding-systems-region): Use - find-coding-systems-region-internal. + (find-coding-systems-region): + Use find-coding-systems-region-internal. (find-coding-systems-string): Use find-coding-systems-region. - (find-coding-systems-for-charsets): Check - char-coding-system-table. + (find-coding-systems-for-charsets): + Check char-coding-system-table. (select-safe-coding-system-accept-default-p): New variable. (select-safe-coding-system): Mostly rewritten. New argument ACCEPT-DEFAULT-P. @@ -15148,29 +15148,29 @@ * net/ange-ftp.el (ange-ftp-file-newer-than-file-p): New function. (ange-ftp-real-file-newer-than-file-p): New function. (ange-ftp-verify-visited-file-modtime): Use `float-time'. - (ange-ftp-dot-to-slash): Removed (use `subst-char-in-string'). + (ange-ftp-dot-to-slash): Remove (use `subst-char-in-string'). - * tooltip.el (tooltip-float-time): Removed (use `float-time'). + * tooltip.el (tooltip-float-time): Remove (use `float-time'). * midnight.el (midnight-float-time): Ditto. 2000-07-26 Andreas Schwab - * files.el (normal-backup-enable-predicate): Correct - interpretation of the return value of compare-strings. + * files.el (normal-backup-enable-predicate): + Correct interpretation of the return value of compare-strings. 2000-07-26 Gerd Moellmann * isearch.el (isearch-resume): New function. (isearch-done): Add something to command-history to resume the search. - (isearch-yank-line, isearch-yank-word): Use - buffer-substring-no-properties instead of buffer-substring. + (isearch-yank-line, isearch-yank-word): + Use buffer-substring-no-properties instead of buffer-substring. * textmodes/flyspell.el (flyspell-mouse-map): Use `map' instead of flyspell-mouse-map. - * progmodes/make-mode.el (makefile-mode-abbrev-table): Remove - duplicate definition. + * progmodes/make-mode.el (makefile-mode-abbrev-table): + Remove duplicate definition. (makefile-mode): Remove duplicate setting of local-abbrev-table. * progmodes/m4-mode.el (m4-mode-abbrev-table): New variable. @@ -15186,8 +15186,8 @@ (ange-ftp-dot-to-slash): New function. (ange-ftp-fix-name-for-vms): Use it. - * midnight.el (midnight-buffer-display-time): Use - `with-current-buffer'. + * midnight.el (midnight-buffer-display-time): + Use `with-current-buffer'. 2000-07-25 Gerd Moellmann @@ -15251,17 +15251,17 @@ 2000-07-24 Francis Wright - * dired.el (dired-sort-R-check): Added to allow recursive listing + * dired.el (dired-sort-R-check): Add to allow recursive listing to be undone. (dired-sort-other): Use it. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * Release of cc-mode 5.27 -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-engine.el (c-looking-at-inexpr-block): Replaced a call to + * progmodes/cc-engine.el (c-looking-at-inexpr-block): Replace a call to c-beginning-of-statement-1 that caused a bad case of recursion which could consume a lot of CPU in large classes in languages that have in-expression classes (i.e. Java and Pike). @@ -15271,7 +15271,7 @@ before case 5 and is now case 4) to catch in-expression classes in top level expressions correctly. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-engine.el (c-guess-basic-syntax): Less naive handling of objc-method-intro. Case 4 removed and case 5I added. @@ -15285,40 +15285,40 @@ * progmodes/cc-mode.el (java-mode): Use c-append-paragraph-start to initialize paragraph-start for javadoc markup. - * progmodes/cc-vars.el (c-style-variables-are-local-p): Incompatible - change by defaulting this to t. It's motivated by the + * progmodes/cc-vars.el (c-style-variables-are-local-p): + Incompatible change by defaulting this to t. It's motivated by the confusing behavior that otherwise arise from the style system when editing both java and non-java files at the same time (see the comments about style setting in c-common-init). -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-cmds.el (c-indent-new-comment-line): Added a kludge + * progmodes/cc-cmds.el (c-indent-new-comment-line): Add a kludge similar to the one in c-fill-paragraph to check the fill prefix from the adaptive fill function for sanity. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-defs.el (c-end-of-defun-1): Fixed forward scanning into + * progmodes/cc-defs.el (c-end-of-defun-1): Fix forward scanning into defun block. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-align.el (c-lineup-multi-inher): Handle lines with leading comma nicely. Extended to handle member initializers too. * progmodes/cc-engine.el (c-beginning-of-inheritance-list) - (c-guess-basic-syntax): Fixed recognition of inheritance lists + (c-guess-basic-syntax): Fix recognition of inheritance lists when the lines begins with a comma. - * progmodes/cc-vars.el (c-offsets-alist): Changed default for + * progmodes/cc-vars.el (c-offsets-alist): Change default for member-init-cont to c-lineup-multi-inher since it now handles member initializers and indents better for leading commas. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-cmds.el (c-electric-brace): Fixed some bugs in the state + * progmodes/cc-cmds.el (c-electric-brace): Fix some bugs in the state handling that caused class open lines to be recognized as statement-conts in some cases. @@ -15326,10 +15326,10 @@ guessed by the adaptive fill function unless point is on the first line of a block comment. - * progmodes/cc-engine.el (c-forward-syntactic-ws): Fixed an infloop bug + * progmodes/cc-engine.el (c-forward-syntactic-ws): Fix an infloop bug when the buffer ends with a macro continuation char. - * progmodes/cc-engine.el (c-guess-basic-syntax): Added support for + * progmodes/cc-engine.el (c-guess-basic-syntax): Add support for function definitions as statements in Pike. The first statement in a lambda block is now labeled defun-block-intro instead of statement-block-intro. @@ -15338,61 +15338,61 @@ so that the class surrounding point is selected, not the one innermost in the state. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug in + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug in recognition of switch labels having hanging multiline statements. * progmodes/cc-engine.el (c-beginning-of-member-init-list): Broke out some code in c-guess-basic-syntax to a separate function. - * progmodes/cc-engine.el (c-just-after-func-arglist-p): Fixed - recognition of member inits with multiple line arglists. + * progmodes/cc-engine.el (c-just-after-func-arglist-p): + Fix recognition of member inits with multiple line arglists. * progmodes/cc-engine.el (c-guess-basic-syntax): New case 5B.3 to detect member-init-cont when the commas are in funny places. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-defs.el (c-auto-newline): Removed this macro since it's + * progmodes/cc-defs.el (c-auto-newline): Remove this macro since it's not used anymore. * progmodes/cc-engine.el (c-looking-at-bos): New helper function. * progmodes/cc-engine.el (c-looking-at-inexpr-block): More tests to tell inexpr and toplevel classes apart in Pike. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bogus recognition + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bogus recognition of case 9A. * progmodes/cc-langs.el, progmodes/cc-mode.el (c-Pike-inexpr-class-key): New constant, since "class" can introduce an in-expression class in Pike nowadays. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-align.el (c-gnu-impose-minimum): Don't impose minimum indentation on cpp-macro lines. * progmodes/cc-engine.el (c-guess-basic-syntax): Made the cpp-macro a syntax modifier like comment-intro, to make it possible to - get syntactic indentation for preprocessor directives. It's - incompatible wrt to lineup functions on cpp-macro, but it has + get syntactic indentation for preprocessor directives. + It's incompatible wrt to lineup functions on cpp-macro, but it has no observable effect in the 99.9% common case where cpp-macro is set to -1000. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug with missed + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug with missed member-init-cont when the preceding arglist is several lines. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-styles.el (c-style-alist): The basic offset for the BSD style corrected to 8. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-styles.el (c-style-alist): Adjusted the indentation of + * progmodes/cc-styles.el (c-style-alist): Adjust the indentation of brace list openers in the gnu style. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-command): Obey c-syntactic-indentation. @@ -15401,53 +15401,53 @@ (c-electric-lt-gt, c-electric-paren): Don't reindent old lines when c-syntactic-indentation is nil. - * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed bug where + * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix bug where we were left at comments preceding the first statement when reaching the beginning of the buffer. * progmodes/cc-vars.el (c-syntactic-indentation): New variable to turn off all syntactic indentation. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-cmds.el (c-fill-paragraph): Keep one or two spaces between the text and the block comment ender when it hangs, depending on how many there are before the fill. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-engine.el (c-beginning-of-closest-statement): New helper function to go back to the closest preceding statement start, which could be inside a conditional statement. - * progmodes/cc-engine.el (c-guess-basic-syntax): Use - c-beginning-of-closest-statement in cases 10B.2, 17B and 17C. + * progmodes/cc-engine.el (c-guess-basic-syntax): + Use c-beginning-of-closest-statement in cases 10B.2, 17B and 17C. * progmodes/cc-engine.el (c-guess-basic-syntax): Better handling of arglist-intro, arglist-cont-nonempty and arglist-close when the arglist is nested inside parens. Cases 7A, 7C and 7F changed. - * progmodes/cc-langs.el (c-Java-javadoc-paragraph-start): Brought - up-to-date with javadoc 1.2. - -2000-07-24 Martin Stjernholm - - * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed handling of + * progmodes/cc-langs.el (c-Java-javadoc-paragraph-start): + Brought up-to-date with javadoc 1.2. + +2000-07-24 Martin Stjernholm + + * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix handling of multiline Pike type decls. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-cmds.el (c-indent-new-comment-line): Always break multiline comments in multiline mode, regardless of comment-multi-line. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug with + * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug with fully::qualified::names in C++ member init lists. Preamble in case 5D changed. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm * progmodes/cc-langs.el (c-common-init): Handling of obsolete variables moved to c-initialize-cc-mode. More compatible style override @@ -15471,16 +15471,16 @@ that duplicate entries in styles have the same effect regardless of DONT-OVERRIDE. - * progmodes/cc-styles.el (c-set-style-2): Fixed bug where the + * progmodes/cc-styles.el (c-set-style-2): Fix bug where the initialization of inheriting styles failed when the dont-override flag is set. * progmodes/cc-vars.el (c-special-indent-hook): Don't use set-from-style on this. -2000-07-24 Martin Stjernholm +2000-07-24 Martin Stjernholm - * progmodes/cc-defs.el (c-forward-comment): Removed the workaround + * progmodes/cc-defs.el (c-forward-comment): Remove the workaround introduced in 5.38 since it had worse side-effects. If a line contains the string "//\"", it regarded the // as a comment start since the \ temporarily doesn't have escape syntax. @@ -15520,9 +15520,9 @@ paragraphs on the first or last line of a file. (ada-format-paramlist): Fix handling of default parameter values. (ada-get-body-name): New function. - (ada-get-current-indent): Optimized by searching directly for an - existing generic part or a statement outside of it. Handle - ada-indent-align-comments when indenting comments Replaced some + (ada-get-current-indent): Optimize by searching directly for an + existing generic part or a statement outside of it. + Handle ada-indent-align-comments when indenting comments Replaced some regexps by testing directly the next character. This results in a huge speedup on some files. New indentation scheme for renames statements. Stop looking for the 'while' or 'for' associated with @@ -15582,7 +15582,7 @@ (ada-add-ada-menu): Remove the map and name parameters. Add the Ada Reference Manual to the menu. (ada-check-current): Rewritten as a call to ada-compile-current. - (ada-compile): Removed. + (ada-compile): Remove. (ada-compile-application, ada-compile-current, ada-check-current): Set the compilation-search-path so that compile.el automatically finds the sources in src_dir. Automatic scrolling of the @@ -15596,7 +15596,7 @@ (ada-find-file-in-dir): New function. (ada-find-references): Set the environment variables for gnatfind. (ada-find-src-file-in-dir): New function. - (ada-first-non-nil): Removed. + (ada-first-non-nil): Remove. (ada-gdb-application): Add support for jdb, the java debugger. (ada-get-ada-file-name): Load the original-file first if not done yet. @@ -15614,20 +15614,20 @@ compilation-search-path,... Add the standard runtime library to the search path for find-file. (ada-prj-default-debugger): Was missing an opening '{'. - (ada-prj-default-bind-opt, ada-prj-default-link-opt): New - variables. + (ada-prj-default-bind-opt, ada-prj-default-link-opt): + New variables. (ada-prj-default-gnatmake-opt): New variable. (ada-prj-find-prj-file): Handles non-file buffers For non-Ada buffers, the project file is the default one Save the windows configuration before displaying the menu. - (ada-prj-src-dir, ada-prj-obj-dir, ada-prj-comp-opt,...): Removed. + (ada-prj-src-dir, ada-prj-obj-dir, ada-prj-comp-opt,...): Remove. (ada-read-identifier): Fix xrefs on operators (for "mod", "and", ...) regexp-quote identifiers names to support operators +, -,... in regexps. (ada-remote): New function. (ada-run-application): Erase the output buffer before starting the - run Support remote execution of the application. Use - call-process, or the arguments are incorrectly parsed. + run Support remote execution of the application. + Use call-process, or the arguments are incorrectly parsed. (ada-set-default-project-file): Reread the content of the active project file, not the one from the current buffer When a project file is set as the default project, all directories are @@ -15807,7 +15807,7 @@ * net/goto-addr.el: Change maintainer to FSF. - * info.el (Info-title-face-alist): Removed. + * info.el (Info-title-face-alist): Remove. 2000-07-18 David Ponce @@ -15876,13 +15876,13 @@ * align.el (align-newline-and-indent): Adding new function, for auto-aligning blocks of code on RET. - (align-region): Fixed badly formatted minibuffer message. + (align-region): Fix badly formatted minibuffer message. 2000-07-17 Kenichi Handa * international/kkc.el (kkc-show-conversion-list-count): Customize it. - (kkc-region): Update kkc-next-count and kkc-prev-count here. Show - the conversion list at first if appropriate. + (kkc-region): Update kkc-next-count and kkc-prev-count here. + Show the conversion list at first if appropriate. (kkc-next): Don't update kkc-next-count here. (kkc-prev): Don't update kkc-prev-count here. (kkc-show-conversion-list-update): Fix setting up of conversion @@ -15897,8 +15897,8 @@ * cus-edit.el (custom-buffer-create-internal): Use a help-echo function to be more specific. - * wid-edit.el (widget-specify-field, widget-specify-button): Allow - non-string help-echo. + * wid-edit.el (widget-specify-field, widget-specify-button): + Allow non-string help-echo. (widget-types-convert-widget): Defsubst it. (widget-echo-help): Try to cope with a help-echo function of two possible sorts. @@ -15973,7 +15973,7 @@ Use fortran-comment-indent, not fortran-comment-indent-function. (fortran-comment-region, fortran-electric-line-number): Simplify. (fortran-auto-fill): New function. - (fortran-do-auto-fill): Deleted. + (fortran-do-auto-fill): Delete. (fortran-find-comment-start-skip): Check for non-null comment-start-skip. (fortran-auto-fill-mode, fortran-fill-statement): @@ -15985,8 +15985,8 @@ 2000-07-11 Eli Zaretskii - * eshell/esh-module.el (toplevel): Reference - byte-compile-current-file only if it is bound. + * eshell/esh-module.el (toplevel): + Reference byte-compile-current-file only if it is bound. 2000-07-10 Gerd Moellmann @@ -16000,7 +16000,7 @@ 2000-07-10 Kenichi Handa - * international/mule-diag.el (describe-font): Adjusted for the + * international/mule-diag.el (describe-font): Adjust for the change of fontset-info. (print-fontset): Likewise. @@ -16039,7 +16039,7 @@ 2000-07-01 Francesco Potortì - * rmail.el (mail-unsent-separator): Changed "the" to "\\w+", as + * rmail.el (mail-unsent-separator): Change "the" to "\\w+", as exim can use "your message" instead of "the message". 2000-07-06 Stefan Monnier @@ -16054,8 +16054,8 @@ 2000-07-05 Michael Kifer * ediff-diff.el (ediff-wordify): Use syntax table. - * ediff-init.el (ediff-has-face-support-p): Use - ediff-color-display-p. + * ediff-init.el (ediff-has-face-support-p): + Use ediff-color-display-p. (ediff-color-display-p): Use display-color-p, changed to defun from defsubst. Got rid of special cases for NeXT and OS/2. @@ -16076,7 +16076,7 @@ * Makefile.in (DONTCOMPILE): Add comment that the name may not be changed without changing the make-dist script. - * emacs-lisp/cl-extra.el (cl-old-mapc): Removed; don't defalias mapc. + * emacs-lisp/cl-extra.el (cl-old-mapc): Remove; don't defalias mapc. (cl-mapc): Use mapc instead of cl-old-mapc. 2000-07-05 Andrew Innes @@ -16191,8 +16191,8 @@ * mouse.el (mouse-show-mark, mouse-save-then-kill): Don't use window-system. - * man.el (Man-notify-when-ready): Don't use window-system. If - Man-notify-method is newframe, and the display is not + * man.el (Man-notify-when-ready): Don't use window-system. + If Man-notify-method is newframe, and the display is not multi-frame, select the frame created for the man page. (Man-init-defvars): Doc fix. @@ -16268,7 +16268,7 @@ (sql-find-sqli-buffer): Make sure the default-value of sql-buffer is used. - (sql-informix): Added command line parameter "-" to force + (sql-informix): Add command line parameter "-" to force sql-informix-program to use stdout. 2000-06-25 Eli Zaretskii @@ -16282,8 +16282,8 @@ 2000-06-23 Dave Love * font-lock.el (font-lock-support-mode) : Add :version. - (font-lock-fontify-anchored-keywords): Use - line-beginning-position. + (font-lock-fontify-anchored-keywords): + Use line-beginning-position. (global-font-lock-mode): Use mapc. 2000-06-23 Stefan Monnier @@ -16341,14 +16341,14 @@ 2000-06-22 Vinicius Jose Latorre * ps-print.el: Fix bug: if ^L is the very first buffer character, - ps-print crashes. New feature: page selection for printing. Create - raw-text-unix coding system for XEmacs. Doc fix. + ps-print crashes. New feature: page selection for printing. + Create raw-text-unix coding system for XEmacs. Doc fix. (ps-print-version): New version number (5.2.3). (ps-plot-region): Bug fix. (ps-setup, ps-init-output-queue, ps-output, ps-begin-job, ps-end-file) (ps-header-sheet, ps-generate, ps-end-job): Code fix. - (ps-restore-selected-pages, ps-selected-pages, ps-print-page-p): New - funs. + (ps-restore-selected-pages, ps-selected-pages, ps-print-page-p): + New funs. (ps-selected-pages, ps-last-selected-pages, ps-first-page) (ps-last-page): New vars. @@ -16363,8 +16363,8 @@ 2000-06-21 Kenichi Handa - * international/mule-cmds.el (set-language-info-alist): Docstring - fixed. + * international/mule-cmds.el (set-language-info-alist): + Docstring fixed. 2000-06-20 Gerd Moellmann @@ -16378,7 +16378,7 @@ 2000-06-20 Stefan Monnier * jit-lock.el (with-buffer-prepared-for-jit-lock): - Renamed from with-buffer-prepared-for-font-lock and use + Rename from with-buffer-prepared-for-font-lock and use inhibit-modification-hooks rather than setting *-change-functions. Update all functions to use the new name. (jit-lock-first-unfontify-pos): New semantics (and doc). @@ -16395,20 +16395,20 @@ 2000-06-20 Sam Steingold - * emacs-lisp/cl-indent.el (toplevel): Indent - `print-unreadable-object' properly. Untabify. + * emacs-lisp/cl-indent.el (toplevel): + Indent `print-unreadable-object' properly. Untabify. 2000-06-14 Carsten Dominik * textmodes/reftex.el (reftex-find-citation-regexp-format): Support for bibentry. - (reftex-compile-variables): Fixed problem with end of section-re. + (reftex-compile-variables): Fix problem with end of section-re. * textmodes/reftex-dcr.el (reftex-view-crossref) (reftex-view-crossref-from-bibtex): Deal with changed `reftex-find-citation-regexp-format'. (reftex-view-regexp-match, reftex-view-crossref-from-bibtex): - Replaced `remprop' with `put'. + Replace `remprop' with `put'. (reftex-view-crossref, reftex-view-crossref-when-idle): Support for bibentry. @@ -16490,8 +16490,8 @@ (isearch-minibuffer-input-method-function): These variables deleted. (isearch-with-input-method): Don't use the above variables. - (isearch-process-search-multibyte-characters): Likewise. Call - read-string with the arg INHERIT-INPUT-METHOD t. + (isearch-process-search-multibyte-characters): Likewise. + Call read-string with the arg INHERIT-INPUT-METHOD t. 2000-06-17 Stefan Monnier @@ -16546,8 +16546,8 @@ 2000-06-15 Gerd Moellmann * info.el (Info-find-in-tag-table-1, Info-find-in-tag-table) - (Info-find-node-in-buffer-1, Info-find-node-in-buffer): New - functions. + (Info-find-node-in-buffer-1, Info-find-node-in-buffer): + New functions. (Info-find-node-2): Try a case-sensitive search first, then do a case-insensitive search. @@ -16575,8 +16575,8 @@ 2000-06-15 Kenichi Handa - * international/mule.el (set-buffer-file-coding-system): Almost - rewritten to handle `undecided' as no-op. + * international/mule.el (set-buffer-file-coding-system): + Almost rewritten to handle `undecided' as no-op. 2000-06-14 Gerd Moellmann @@ -16599,8 +16599,8 @@ (tar-subfile-save-buffer): Likewise. * international/mule.el - (after-insert-file-set-buffer-file-coding-system): Call - set-buffer-file-coding-system with the arg FORCE t. + (after-insert-file-set-buffer-file-coding-system): + Call set-buffer-file-coding-system with the arg FORCE t. 2000-06-13 Gerd Moellmann @@ -16620,15 +16620,15 @@ 2000-06-13 Eli Zaretskii - * frame.el (display-multi-frame-p, display-multi-font-p): New - defaliases for display-graphic-p. + * frame.el (display-multi-frame-p, display-multi-font-p): + New defaliases for display-graphic-p. * hl-line.el: Fixed a typo in commentary. 2000-06-13 Kenichi Handa - * language/tibet-util.el (tibetan-tibetan-to-transcription): Typo - fixed. + * language/tibet-util.el (tibetan-tibetan-to-transcription): + Typo fixed. 2000-06-12 Dave Love @@ -16709,8 +16709,8 @@ 2000-06-12 Kenichi Handa - * international/mule.el (set-buffer-file-coding-system): If - CODING-SYSTEM is nil, set buffer-file-coding-system to nil + * international/mule.el (set-buffer-file-coding-system): + If CODING-SYSTEM is nil, set buffer-file-coding-system to nil unconditionally. 2000-06-12 Dave Love @@ -16769,8 +16769,8 @@ * progmodes/executable.el: Byte compile dynamic. (executable-insert): Change custom type. (executable-find): Add autoload cookie. - (executable-make-buffer-file-executable-if-script-p): New - function. After Noah Friedman. + (executable-make-buffer-file-executable-if-script-p): + New function. After Noah Friedman. * files.el (after-save-hook): Customize, with executable-make-buffer-file-executable-if-script-p as an option. @@ -16792,8 +16792,8 @@ 2000-06-08 Dave Love - * international/mule-cmds.el (select-safe-coding-system): If - DEFAULT-CODING-SYSTEM is not specified, also check the most + * international/mule-cmds.el (select-safe-coding-system): + If DEFAULT-CODING-SYSTEM is not specified, also check the most preferred coding-system if buffer-file-coding-system is `undecided'. From Handa. @@ -16917,8 +16917,8 @@ (ccl-encode-alternativnyj, ccl-encode-alternativnyj-font): Likewise. - * international/mule-diag.el (non-iso-charset-alist): Specify - translation table symbol instead of translation table itself. + * international/mule-diag.el (non-iso-charset-alist): + Specify translation table symbol instead of translation table itself. (list-block-of-chars): CHARSET may be a translation table symbol. * international/mule.el (make-coding-system): If CODING-SYSTEM @@ -16927,9 +16927,9 @@ * international/fontset.el: Use family `proportional' for Tibetan fonts. - * international/ccl.el (ccl-compile-translate-character): Don't - check if Rrr has property translation-table. - (ccl-compile-map-multiple): Modified to avoid compiler warning. + * international/ccl.el (ccl-compile-translate-character): + Don't check if Rrr has property translation-table. + (ccl-compile-map-multiple): Modify to avoid compiler warning. 2000-06-05 Gerd Moellmann @@ -16958,7 +16958,7 @@ (sh-help-string-for-variable, sh-guess-basic-offset): Don't quote lambdas. (sh-electric-rparen, sh-electric-hash, sh-search-word): Docstring typo. - (sh-regexp-for-done, sh-kw-alist, sh-kw): Moved to before their use. + (sh-regexp-for-done, sh-kw-alist, sh-kw): Move to before their use. * mail/mh-comp.el (mh-send-sub): Check mh-etc is bound before using it. (mh-letter-mode): Derive from text-mode. @@ -17017,18 +17017,18 @@ 2000-06-02 Dave Love * wid-edit.el: byte-compile-dynamic since we typically don't use - all the widgets. Don't require cl or widget. Remove - eval-and-compile. Don't autoload finder-commentary. Doc fixes. - (widget-read-event): Removed. Callers changed to use read-event. - (widget-button-release-event-p): Renamed from + all the widgets. Don't require cl or widget. + Remove eval-and-compile. Don't autoload finder-commentary. Doc fixes. + (widget-read-event): Remove. Callers changed to use read-event. + (widget-button-release-event-p): Rename from button-release-event-p. (widget-field-add-space, widget-field-use-before-change): Uncustomize. (widget-specify-field): Use keymap property, not local-map. (widget-specify-button): Obey :suppress-face. (widget-specify-insert): Use modern backquote syntax. - (widget-image-directory): Renamed from widget-glyph-directory. - (widget-image-enable): Renamed from widget-glyph-enable. + (widget-image-directory): Rename from widget-glyph-directory. + (widget-image-enable): Rename from widget-glyph-enable. (widget-image-find): Replaces widget-glyph-find. (widget-button-pressed-face): Move defvar. (widget-image-insert): Replaces widget-glyph-insert. @@ -17044,8 +17044,8 @@ (widget-sexp-prompt-value, widget-echo-help): Simplify. (widget-default-create): Use widget-image-insert; some rewriting. (widget-visibility-value-create) - (widget-push-button-value-create, widget-toggle-value-create): Use - widget-image-insert. + (widget-push-button-value-create, widget-toggle-value-create): + Use widget-image-insert. (checkbox): Create on and off images dynamically. (documentation-link): Change :help-echo. (widget-documentation-link-echo-help): Remove. @@ -17114,8 +17114,8 @@ (tibetan-composition-function): Fix args to tibetan-compose-string. - * language/tibetan.el (tibetan-composable-pattern): More - characters included. + * language/tibetan.el (tibetan-composable-pattern): + More characters included. (tibetan-consonant-transcription-alist): Rule for "R" added. (tibetan-subjoined-transcription-alist): Rules for "+W", "+Y", and "+R" added. @@ -17154,8 +17154,8 @@ 2000-05-31 Dave Love - * loadhist.el (loadhist-hook-functions): Remove - before-change-function, after-change-function. + * loadhist.el (loadhist-hook-functions): + Remove before-change-function, after-change-function. (unload-feature): Deal with symbols which are both bound and fbound. @@ -17228,8 +17228,8 @@ * progmodes/antlr-mode.el: New commands: hide/unhide actions, upcase/downcase literals. (antlr-tiny-action-length): New user option. - (antlr-hide-actions): New command. Suggested by - Bjoern Mielenhausen . + (antlr-hide-actions): New command. + Suggested by Bjoern Mielenhausen . (antlr-mode-map): New binding [C-c C-v]. (antlr-mode-menu): New entries. (antlr-downcase-literals): New command. @@ -17242,8 +17242,8 @@ * progmodes/antlr-mode.el: XEmacs bug workaround, XEmacs hint. (antlr-font-lock-additional-keywords): Workaround for intentional bug in XEmacs version of font-lock. - (antlr-mode): Set symbol property `mode-name' to "Antlr". Could - be used by a smarter version of `buffers-menu-grouping-function'. + (antlr-mode): Set symbol property `mode-name' to "Antlr". + Could be used by a smarter version of `buffers-menu-grouping-function'. 2000-05-29 Gerd Moellmann @@ -17265,8 +17265,8 @@ 2000-05-28 Eli Zaretskii - * international/codepage.el (cp-coding-system-for-codepage-1): Add - eight-bit-graphic and eight-bit-control to safe charsets for cpNNN + * international/codepage.el (cp-coding-system-for-codepage-1): + Add eight-bit-graphic and eight-bit-control to safe charsets for cpNNN coding systems. 2000-05-26 Dave Love @@ -17275,10 +17275,10 @@ internal-find-face. * mail/reporter.el: Maintainer change. Doc fixes. - (reporter-version): Deleted. + (reporter-version): Delete. * emacs-lisp/elp.el: Maintainer change. - (elp-help-address, elp-submit-bug-report, elp-version): Deleted. + (elp-help-address, elp-submit-bug-report, elp-version): Delete. 2000-05-26 Stefan Monnier @@ -17290,8 +17290,8 @@ * loadhist.el (unload-feature): Fix interactive spec [from lijnzaad@ebi.ac.uk]. - * emacs-lisp/bytecomp.el (byte-compile-callargs-warn): Use - subr-arity to check primitives. + * emacs-lisp/bytecomp.el (byte-compile-callargs-warn): + Use subr-arity to check primitives. (byte-compile-flush-pending, byte-compile-file-form-progn) (byte-compile-normal-call, byte-compile-list, byte-compile-concat) (byte-compile-insert, byte-compile-funcall): Use mapc instead of @@ -17354,8 +17354,8 @@ window-system. (ffap-highlight): Always default to t. - * emacs-lisp/edebug.el (edebug-emacs-19-specific): Call - display-popup-menus-p instead of looking at window-system. + * emacs-lisp/edebug.el (edebug-emacs-19-specific): + Call display-popup-menus-p instead of looking at window-system. * disp-table.el (standard-display-g1, standard-display-graphic): Only refuse to use string glyphs on X and MS-Windows. @@ -17374,8 +17374,8 @@ 2000-05-25 Eli Zaretskii - * international/mule-diag.el (describe-char-after): Use - display-graphic-p instead of window-system, so that this function + * international/mule-diag.el (describe-char-after): + Use display-graphic-p instead of window-system, so that this function works on MS-DOS. 2000-05-25 Eli Zaretskii @@ -17402,7 +17402,7 @@ 2000-05-24 Eric M. Ludlam - * rmailout.el (rmail-output-to-rmail-file): Added optional param + * rmailout.el (rmail-output-to-rmail-file): Add optional param STAY. * rmail.el (rmail-automatic-folder-directives): New user variable. @@ -17421,8 +17421,8 @@ * ediff-init.el (ediff-merge-filename-prefix): New customizable variable. - * ediff-mult.el (ediff-filegroup-action): Use - ediff-merge-filename-prefix. + * ediff-mult.el (ediff-filegroup-action): + Use ediff-merge-filename-prefix. 2000-05-24 Michael Kifer @@ -17460,14 +17460,14 @@ * speedbar.el (speedbar-easymenu-definition-base): Image toggle fix. (speedbar-insert-button): Invisible text property fix. - (speedbar-directory-plus): Renamed from speedbar-directory-+. - (speedbar-directory-minus): Renamed from speedbar-directory--. - (speedbar-page-plus): Renamed from speedbar-file-+. - (speedbar-page-minus): Renamed from speedbar-file--. - (speedbar-page): Renamed from speedbar-file-. - (speedbar-tag): Renamed from speedbar-tag-. - (speedbar-tag-plus): Renamed from speedbar-tag-+. - (speedbar-tag-minus): Renamed from speedbar-tag--. + (speedbar-directory-plus): Rename from speedbar-directory-+. + (speedbar-directory-minus): Rename from speedbar-directory--. + (speedbar-page-plus): Rename from speedbar-file-+. + (speedbar-page-minus): Rename from speedbar-file--. + (speedbar-page): Rename from speedbar-file-. + (speedbar-tag): Rename from speedbar-tag-. + (speedbar-tag-plus): Rename from speedbar-tag-+. + (speedbar-tag-minus): Rename from speedbar-tag--. (speedbar-expand-image-button-alist): Use above renames. * sb-dir-plus.xpm: Renamed from sb-dir+.xpm @@ -17480,8 +17480,8 @@ 2000-05-24 Kenichi Handa - * international/quail.el (quail-show-guidance-buf): Set - current-input-method of the guidance buffer to the name of the + * international/quail.el (quail-show-guidance-buf): + Set current-input-method of the guidance buffer to the name of the current input method. 2000-05-23 Stefan Monnier @@ -17520,8 +17520,8 @@ 2000-05-22 Dave Love - * loadhist.el (feature-symbols, file-provides, file-requires): Use - mapc. + * loadhist.el (feature-symbols, file-provides, file-requires): + Use mapc. (feature-file): Avoid calling symbol-name. Doc fix. (file-set-intersect, file-dependents): Use dolist, not mapcar. (loadhist-hook-functions): Add mouse-position-function. @@ -17537,7 +17537,7 @@ 2000-05-22 Sam Steingold - * info.el (Info-fontify-node): Fixed the call to + * info.el (Info-fontify-node): Fix the call to `add-text-properties' (bug introduced on 2000-05-18). 2000-05-22 Dave Love @@ -17547,11 +17547,11 @@ * progmodes/etags.el: Add to debug-ignored-errors. (visit-tags-table-buffer): Clear out buffers holding old tables when making a new list. - (etags-recognize-tags-table, tags-recognize-empty-tags-table): Use - mapc. + (etags-recognize-tags-table, tags-recognize-empty-tags-table): + Use mapc. - * completion.el: Doc fixes. Add to debug-ignored-errors. Don't - quote keywords. + * completion.el: Doc fixes. Add to debug-ignored-errors. + Don't quote keywords. (cmpl-string-case-type): Use character classes. * comint.el: @@ -17582,8 +17582,8 @@ 2000-05-22 Kenichi Handa - * international/quail.el (quail-simple-translation-keymap): Map - 128..255 to quail-self-insert-command. + * international/quail.el (quail-simple-translation-keymap): + Map 128..255 to quail-self-insert-command. (quail-keyboard-layout-alist): Add definition for "pc102-de". 2000-05-22 Stefan Monnier @@ -17603,8 +17603,8 @@ * edmacro.el (edmacro-parse-keys): Return vector if any elements are invalid characters. - * international/mule-util.el (detect-coding-with-priority): Use - mapc. Remove redundant lambda. + * international/mule-util.el (detect-coding-with-priority): + Use mapc. Remove redundant lambda. * international/mule-diag.el (list-non-iso-charset-chars) (describe-fontset): Remove redundant lambda. @@ -17665,14 +17665,14 @@ * mail/rmail.el (rmail-decode-quoted-printable): Use delete-region and insert, not subst-char-in-region. - * international/mule-diag.el (list-character-sets-1): Handle - charsets eight-bit-control and eight-bit-graphic. + * international/mule-diag.el (list-character-sets-1): + Handle charsets eight-bit-control and eight-bit-graphic. (list-iso-charset-chars): Likewise. (list-block-of-chars): If CHARSET is not char-table, insert 8-bit characters as is. Use indent-to to align characters. - * international/mule-cmds.el (find-multibyte-characters): Never - exclude charsets eight-bit-control and eight-bit-graphic. + * international/mule-cmds.el (find-multibyte-characters): + Never exclude charsets eight-bit-control and eight-bit-graphic. 2000-05-19 Stefan Monnier @@ -17707,18 +17707,18 @@ * ps-print.el: Compatibility, customization and doc fix. (ps-printer-name-option): Replace defconst by defvar. (ps-postscript-code-directory): XEmacs compatibility. - (ps-header-sheet, ps-setup, ps-begin-file, ps-begin-job): Code - fix. + (ps-header-sheet, ps-setup, ps-begin-file, ps-begin-job): + Code fix. (ps-user-defined-prologue, ps-print-prologue-header) - (ps-xemacs-face-kind-p, ps-face-bold-p, ps-face-italic-p): XEmacs - compatibility and code fix. + (ps-xemacs-face-kind-p, ps-face-bold-p, ps-face-italic-p): + XEmacs compatibility and code fix. (ps-print-background-image, ps-print-background-text): Customization fix. (ps-line-number-start, ps-n-up-on): New vars. 2000-05-18 Espen Skoglund - * pascal.el (pascal-indent-alist, pascal-indent-comment): Changed + * pascal.el (pascal-indent-alist, pascal-indent-comment): Change the indent-comment function to just return the appropriate indent. 2000-05-18 Eric M. Ludlam @@ -17737,8 +17737,8 @@ 2000-05-18 Kenichi Handa - * international/mule-diag.el (describe-char-after): Call - internal-char-font, not char-font. If internal-char-font returns + * international/mule-diag.el (describe-char-after): + Call internal-char-font, not char-font. If internal-char-font returns nil, display "-- none --". 2000-05-17 Eli Zaretskii @@ -17784,8 +17784,8 @@ * help.el (view-emacs-FAQ): Change `emacs-faq' to `efaq'. - * progmodes/compile.el (compilation-parse-errors): Collect - `nomessage' regexps last. + * progmodes/compile.el (compilation-parse-errors): + Collect `nomessage' regexps last. * dired.el (dired-mode-map): Use dired-do-query-replace-regexp. @@ -17829,8 +17829,8 @@ (help-xref-following): New variable. (help-make-xrefs): Use it. (help-xref-go-back): Use position information from stack element. - (help-follow): Make position in stack element a pair. Use - help-xref-following. + (help-follow): Make position in stack element a pair. + Use help-xref-following. * autoarg.el: New file. @@ -17853,16 +17853,16 @@ (speedbar-easymenu-definition-special): Add flush cache & expand. (speedbar-visiting-tag-hook): Set new defaults. Added options. (speedbar-reconfigure-keymaps-hook): New variable. - (speedbar-frame-parameters): Updated documentation. - (speedbar-use-imenu-flag): Updated custom tag. + (speedbar-frame-parameters): Update documentation. + (speedbar-use-imenu-flag): Update custom tag. (speedbar-dynamic-tags-function-list): New variable. - (speedbar-tag-hierarchy-method): Updated doc & custom. + (speedbar-tag-hierarchy-method): Update doc & custom. (speedbar-indentation-width, speedbar-indentation-width) New variables. (speedbar-hide-button-brackets-flag): Customizable. (speedbar-vc-indicator): Doc update. - (speedbar-ignored-path-expressions): Updated default value. - (speedbar-supported-extension-expressions): Updated default value. + (speedbar-ignored-path-expressions): Update default value. + (speedbar-supported-extension-expressions): Update default value. (speedbar-syntax-table): Remove {} paren status. (speedbar-file-key-map, speedbar-buffers-key-map): Add "=" to act as "+". Added overlay aliases. @@ -17874,24 +17874,24 @@ (speedbar-reconfigure-keymaps): Run configure keymap hooks. (speedbar-item-info-tag-helper): Revamped to handle a wider range of arbitrary text, and new helper functions. - (speedbar-item-copy, speedbar-item-rename): Fixed trailing \ in + (speedbar-item-copy, speedbar-item-rename): Fix trailing \ in filename finder. (speedbar-make-button): Call `speedbar-insert-image-button-maybe'. (speedbar-directory-buttons): Update path search/expansion. (speedbar-make-tag-line): Pay attention to `speedbar-indentation-width'. Use more care w/ invisible properties. - (speedbar-change-expand-button-char): Call - `speedbar-insert-image-button-maybe'. - (speedbar-apply-one-tag-hierarchy-method): Deleted (and replaced). + (speedbar-change-expand-button-char): + Call `speedbar-insert-image-button-maybe'. + (speedbar-apply-one-tag-hierarchy-method): Delete (and replaced). (speedbar-sort-tag-hierarchy, speedbar-prefix-group-tag-hierarchy) (speedbar-trim-words-tag-hierarchy) (speedbar-simple-group-tag-hierarchy): New functions. (speedbar-create-tag-hierarchy): Update doc, use new tag hooks. - (speedbar-insert-imenu-list, speedbar-insert-etags-list): New - functions. + (speedbar-insert-imenu-list, speedbar-insert-etags-list): + New functions. (speedbar-mouse-set-point): New function. - (speedbar-power-click): Updated documentation. + (speedbar-power-click): Update documentation. (speedbar-line-token, speedbar-goto-this-file): Handle more types of tag prefix text. (speedbar-expand-line, speedbar-contract-line): Make more robust @@ -17902,10 +17902,10 @@ (speedbar-tag-file): Use new `speedbar-fetch-dynamic-tags' fn. Use new generator insertion method. (speedbar-fetch-dynamic-tags): New function. - (speedbar-fetch-dynamic-imenu): Removed code now handled in + (speedbar-fetch-dynamic-imenu): Remove code now handled in `speedbar-fetch-dynamic-imenu'. (speedbar-fetch-dynamic-etags): Fix current buffer problem. - (speedbar-buffer-easymenu-definition): Added "Kill Buffer", and + (speedbar-buffer-easymenu-definition): Add "Kill Buffer", and "Revert Buffer" menu items. (speedbar-buffer-buttons-engine): Be smarter when creating a filename tag (for expansion purposes.). @@ -17930,17 +17930,17 @@ of character sets. * international/mule-diag.el (describe-char-after): New function. - (describe-font-internal): Adjusted for the change of font-info. + (describe-font-internal): Adjust for the change of font-info. (describe-font): Likewise. (print-fontset): Rewritten for the new fontset implementation. (describe-fontset): Include fontset alias names in completion. - (list-fontsets): Adjusted for the change of print-fontset. + (list-fontsets): Adjust for the change of print-fontset. * simple.el (what-cursor-position): If DETAIL is non-nil, call describe-char-after instead of displaying the detail in the echo area. (syntax-code-table): Format changed. - (string-to-syntax): Adjusted for the above change. + (string-to-syntax): Adjust for the above change. 2000-05-12 Stefan Monnier @@ -18030,8 +18030,8 @@ (help-xref-symbol-regexp): Add `face'. (help-make-xrefs): Check for quoted face names and adapt regexp submatch numbers to cope. - (help-xref-interned): Maybe insert face doc too. Separate - sections with a line of hyphens. + (help-xref-interned): Maybe insert face doc too. + Separate sections with a line of hyphens. * faces.el: Some doc fixes. Declare some functions obsolete. (describe-face): Add customize button. Return the help @@ -18052,8 +18052,8 @@ simulations for greek-iso8859-7, add latin-iso8859-14 and latin-iso8859-15. - * international/mule-cmds.el (set-language-info-alist): Call - define-prefix-command with 3 arguments, to make the map suitable + * international/mule-cmds.el (set-language-info-alist): + Call define-prefix-command with 3 arguments, to make the map suitable for a menu. 2000-05-07 Dave Love @@ -18081,8 +18081,8 @@ 2000-05-04 Milan Zamazal - * progmodes/glasses.el (glasses-convert-to-unreadable): Use - `glasses-separator' instead of the hard-wired "_". + * progmodes/glasses.el (glasses-convert-to-unreadable): + Use `glasses-separator' instead of the hard-wired "_". (glasses-mode): Call `glasses-make-unreadable' only in a single place. @@ -18112,7 +18112,7 @@ * subr.el (add-minor-mode): Handle AFTER for keymaps. Don't set TOGGLE's value. - * mailabbrev.el (mail-abbrev-insert-alias): Renamed from + * mailabbrev.el (mail-abbrev-insert-alias): Rename from mail-interactive-insert-alias. (mail-abbrev-complete-alias): New command. (mail-mode-map): Bind it to `M-TAB'. @@ -18146,8 +18146,8 @@ 2000-05-02 Eli Zaretskii - * international/mule-cmds.el (set-language-environment): Don't - concat an integer (dos-codepage), use format instead. + * international/mule-cmds.el (set-language-environment): + Don't concat an integer (dos-codepage), use format instead. 2000-05-02 Dave Love @@ -18188,8 +18188,8 @@ 2000-04-28 Kenichi Handa - * mail/sendmail.el (sendmail-send-it): Set - buffer-file-coding-system to the selected coding system for MIME + * mail/sendmail.el (sendmail-send-it): + Set buffer-file-coding-system to the selected coding system for MIME header. 2000-04-27 Gerd Moellmann @@ -18235,8 +18235,8 @@ * image.el (find-image): New function. (defimage): Rewritten to find image at load time. - * startup.el (normal-top-level-add-to-load-path): Handle - case that the default directory is not in load-path. + * startup.el (normal-top-level-add-to-load-path): + Handle case that the default directory is not in load-path. * help.el: Old patch from Stefan Monnier. (help-xref-on-pp): New function. @@ -18259,13 +18259,13 @@ 2000-04-25 Gerd Moellmann - * replace.el (perform-replace): Add parameters START and END. Use - them instead of the check for a region in Transient Mark mode. + * replace.el (perform-replace): Add parameters START and END. + Use them instead of the check for a region in Transient Mark mode. (query-replace-read-args): Return two more list elements for the start and end of the region in Transient Mark mode. (query-replace, query-replace-regexp, query-replace-regexp-eval) - (map-query-replace-regexp, replace-string, replace-regexp): Add - optional last arguments START and END and pass them to + (map-query-replace-regexp, replace-string, replace-regexp): + Add optional last arguments START and END and pass them to perform-replace. * progmodes/ebrowse.el (ebrowse-tags-query-replace): Construct a @@ -18330,7 +18330,7 @@ * progmodes/inf-lisp.el (inferior-lisp-mode): Don't set non-existing variable comint-input-sentinel. - (inferior-lisp-args-to-list): Removed. + (inferior-lisp-args-to-list): Remove. (inferior-lisp): Use split-string instead of inferior-lisp-args-to-list. @@ -18482,8 +18482,8 @@ accept-process-output with ispell-accept-output. (ispell-init-process): Call ispell-process-status instead of process-status with. - (ispell-init-process): Call ispell-start-process. Call - ispell-accept-output and ispell-send-string. Don't call + (ispell-init-process): Call ispell-start-process. + Call ispell-accept-output and ispell-send-string. Don't call process-kill-without-query and kill-process if they are unbound. (ispell-async-processp): New function. @@ -18495,22 +18495,22 @@ * menu-bar.el (menu-bar-options-menu): Make `mule' always visible. Modify `truncate-lines'. Make `describe-language-environment' - always visible and add help. Modify `describe-key' help. Invoke - Info-directory from `info'. New entry `emacs-manual'. + always visible and add help. Modify `describe-key' help. + Invoke Info-directory from `info'. New entry `emacs-manual'. 2000-04-10 Gerd Moellmann * progmodes/ebrowse.el (ebrowse-tree-mode): Use propertized-buffer-identification. (ebrowse-update-member-buffer-mode-line): Likewise. - (ebrowse--mode-strings): Removed. - (ebrowse--mode-line-props): Removed. + (ebrowse--mode-strings): Remove. + (ebrowse--mode-line-props): Remove. * files.el (auto-mode-alist): Add `EBROWSE'. * progmodes/ebrowse.el (ebrowse-read): Skip forward over white space before testing for end of buffer. - (ebrowse-load): Removed. + (ebrowse-load): Remove. (ebrowse-revert-tree-buffer-from-file): Rewritten. (ebrowse-create-tree-buffer): Rewritten. (ebrowse-tree-mode): Read tree from buffer. @@ -18541,7 +18541,7 @@ * progmodes/ebrowse-ffh.el: New file. * progmodes/ebrowse.el (ebrowse-find-file-hook-fn): - Moved to ebrowse-ffh.el. + Move to ebrowse-ffh.el. (ebrowse-load): Add autoload. * finder.el (finder-commentary): Add autoload cookie. @@ -18746,7 +18746,7 @@ (network-connection-mode-setup): New function, saves host and service information in local variables. - * locate.el (locate-word-at-point): Added this function. + * locate.el (locate-word-at-point): Add this function. (locate): Default to using locate-word-at-point as input Run dired-mode-hook @@ -18884,9 +18884,9 @@ text of the URL was passed. Now the whole URL structure is passed and the function is responsible for extracting the parts it requires. Changed the default of `quickurl-format-function' accordingly. - (quickurl-insert): Changed the `funcall' of + (quickurl-insert): Change the `funcall' of `quickurl-format-function' to match the above change. - (quickurl-list-insert): Changed the `url' case so that it makes + (quickurl-list-insert): Change the `url' case so that it makes use of `quickurl-format-function', previous to this the format was hard wired. @@ -19016,7 +19016,7 @@ * international/mule-diag.el (describe-font): Don't refer to global-fontset-alist, instead call font-list. (describe-fontset, list-fontsets, mule-diag): Likewise. - (print-fontset): Adjusted for the change of fontset implementation. + (print-fontset): Adjust for the change of fontset implementation. * international/fontset.el (x-charset-registries): Variable removed, instead the corresponding data is stored in the default fontset. @@ -19134,7 +19134,7 @@ 2000-03-14 Dave Love - * subr.el (replace-regexp-in-string): Renamed from + * subr.el (replace-regexp-in-string): Rename from replace-regexps-in-string. Doc fix. 2000-03-12 Dave Love @@ -19248,8 +19248,8 @@ builtin operators, use `font-lock-builtin-face' for Emacs and `font-lock-preprocessor-face' otherwise. - * font-lock.el (lisp-font-lock-keywords-1): Highlight - `(defun (setf foo)' differently. + * font-lock.el (lisp-font-lock-keywords-1): + Highlight `(defun (setf foo)' differently. 2000-03-08 Stefan Monnier @@ -19265,7 +19265,7 @@ both cases close together. Also apply a more generic algorithm for suffixes (the mirror image of the algorithm used for prefixes). Use shy-groups. Use nreverse rather than reverse. - (regexp-opt-try-suffix): Removed. + (regexp-opt-try-suffix): Remove. * cmuscheme.el (inferior-scheme-mode-map): Define it independently from comint-mode-map, so we can just inherit from it. Also, move @@ -19397,20 +19397,20 @@ 2000-03-01 David Ponce - * recentf.el (recentf): Added version tag to the defgroup of recentf. + * recentf.el (recentf): Add version tag to the defgroup of recentf. 2000-03-01 David Ponce - * recentf.el (recentf-cleanup): Changed to remove excluded file too. + * recentf.el (recentf-cleanup): Change to remove excluded file too. (recentf-edit-list-action): `recentf-edit-list' checkbox widget action to select/unselect a file. (recentf-edit-list): Code cleanup and improvement. (recentf-open-more-files-action): `recentf-open-more-files' button widget action to open a file. (recentf-open-more-files): No more use standard completion but widgets. - (recentf-more-collection): Deleted. - (recentf-more-history): Deleted. - (recentf-setup-more-completion): Deleted. + (recentf-more-collection): Delete. + (recentf-more-history): Delete. + (recentf-setup-more-completion): Delete. 2000-03-01 David Ponce @@ -19424,7 +19424,7 @@ (recentf-edit-selected-items): New global variable, used by `recentf-edit-list' to hold the list of files to be removed from the recent list. - (recentf-make-menu-items): Updated to display a "Edit list..." + (recentf-make-menu-items): Update to display a "Edit list..." menu item. Minor code cleanup. 2000-03-01 David Ponce @@ -19437,7 +19437,7 @@ used by `recentf-open-more-files' completion. (recentf-setup-more-completion): New function to setup completion for `recentf-open-more-files'. - (recentf-make-menu-items): Updated to display a "More..." menu item. + (recentf-make-menu-items): Update to display a "More..." menu item. 2000-03-01 David Ponce @@ -19450,8 +19450,8 @@ (recentf-make-menu-items): New menu filter handling. (recentf-make-menu-item): New helper function. (recentf-menu-elements): New menu handling function. - (recentf-sort-ascending): Updated to new menu filter handling. - (recentf-sort-descending): Updated to new menu filter handling. + (recentf-sort-ascending): Update to new menu filter handling. + (recentf-sort-descending): Update to new menu filter handling. (recentf-sort-basenames-ascending): New menu filter function. (recentf-sort-basenames-descending): New menu filter function. (recentf-show-basenames): New menu filter function. @@ -19490,20 +19490,20 @@ instead of assoc-delete-all. (frame-notice-user-settings): Ditto. - * subr.el (assq-delete-all): Renamed from assoc-delete-all. + * subr.el (assq-delete-all): Rename from assoc-delete-all. Don't copy alist. 2000-02-28 Eli Barzilay * calculator.el (calculator-use-menu): New option. - (calculator-initial-bindings): Changed some bindings to work as macros. - (calculator-forced-input): Removed. + (calculator-initial-bindings): Change some bindings to work as macros. + (calculator-forced-input): Remove. (calculator-restart-other-mode): New variable. (calculator-mode-map): Set up menu. 2000-02-28 Jari Aalto - * font-lock.el (java-keywords): Added missing java 1.2.2 Javadoc tags. + * font-lock.el (java-keywords): Add missing java 1.2.2 Javadoc tags. 2000-02-28 Michael Kifer @@ -19582,7 +19582,7 @@ (footnote-latin-regexp): New variable. (Footnote-latin): New function. (footnote-style-alist): Add element for latin style. - (footnote-style): Moved. + (footnote-style): Move. (Footnote-goto-footnote): Use eq to test arg. * mouse.el (mouse-drag-mode-line-1): Remove `growth =' message. @@ -19752,7 +19752,7 @@ 2000-02-15 Dirk Herrmann - * textmodes/bibtex.el (bibtex-mode): Replaced manual splitting of path + * textmodes/bibtex.el (bibtex-mode): Replace manual splitting of path at ':' characters by call to split-string. 2000-02-15 Dirk Herrmann @@ -19764,21 +19764,21 @@ * textmodes/bibtex.el: Some temporary comments removed. (bibtex-field-name, bibtex-entry-type): Made the relationship explicit. (bibtex-field-const): Allow capital letters. - (bibtex-start-of-string): Deleted because unused. + (bibtex-start-of-string): Delete because unused. * textmodes/bibtex.el: Unified some nomenclature. We no longer use the term 'reference' to describe a bibtex entry as a whole. Further, reference keys are no longer called 'labels'. - (bibtex-keys): Renamed to bibtex-reference-keys. - (bibtex-reformat-previous-labels): Renamed to + (bibtex-keys): Rename to bibtex-reference-keys. + (bibtex-reformat-previous-labels): Rename to bibtex-reformat-previous-reference-keys. - (bibtex-reference-type): Renamed to bibtex-entry-type. - (bibtex-reference-head): Renamed to bibtex-entry-head. - (bibtex-reference-maybe-empty-head): Renamed to + (bibtex-reference-type): Rename to bibtex-entry-type. + (bibtex-reference-head): Rename to bibtex-entry-head. + (bibtex-reference-maybe-empty-head): Rename to bibtex-entry-maybe-empty-head. - (bibtex-key-in-reference): Renamed to bibtex-key-in-entry. - (bibtex-search-reference): Renamed to bibtex-search-entry. - (bibtex-enclosing-reference-maybe-empty-head): Renamed to + (bibtex-key-in-reference): Rename to bibtex-key-in-entry. + (bibtex-search-reference): Rename to bibtex-search-entry. + (bibtex-enclosing-reference-maybe-empty-head): Rename to bibtex-enclosing-entry-maybe-empty-head. (bibtex-entry-field-alist, bibtex-entry-head) (bibtex-font-lock-keywords, bibtex-skip-to-valid-entry) @@ -19793,7 +19793,7 @@ 2000-02-15 Dirk Herrmann - * textmodes/bibtex.el (bibtex-strings, bibtex-keys): Removed redundant + * textmodes/bibtex.el (bibtex-strings, bibtex-keys): Remove redundant comment. (bibtex-format-field-delimiters): New function, functionality extracted from bibtex-format-entry. @@ -19813,7 +19813,7 @@ (bibtex-field-string-or-const, bibtex-field-text, bibtex-field) (bibtex-name-in-field, bibtex-text-in-field, bibtex-reference-infix) (bibtex-string, bibtex-key-in-string, bibtex-text-in-string): - Deleted as parsing is now performed by the following functions. + Delete as parsing is now performed by the following functions. (bibtex-parse-nested-braces, bibtex-parse-field-string-braced) (bibtex-parse-quoted-string, bibtex-parse-field-string-quoted) (bibtex-parse-field-string, bibtex-search-forward-field-string) @@ -19832,7 +19832,7 @@ entries. Instead of reporting the results of the parsing by match-beginning or match-end, these functions return data structures that hold the corresponding positions. - (bibtex-enclosing-field): Changed to also report field boundaries by + (bibtex-enclosing-field): Change to also report field boundaries by return values rather than by match-beginning or match-end. The following functions have been adapted to use the new parsing functions. @@ -19878,11 +19878,11 @@ * bibtex.el: Hiding of entry bodies is not longer provided by bibtex.el directly. Instead the hideshow package can be used. Added a special bibtex entry to hs-special-modes-alist. - (bibtex-hs-forward-sexp): Added for hideshow.el. + (bibtex-hs-forward-sexp): Add for hideshow.el. 2000-02-15 Dirk Herrmann - * bibtex.el (bibtex-entry-field-alist): Added booktitle field to + * bibtex.el (bibtex-entry-field-alist): Add booktitle field to proceedings entry type (for cross referencing). Thanks to Wagner Toledo Correa for the suggestion. @@ -19895,11 +19895,11 @@ 2000-02-12 Gerd Moellmann * uniquify.el (toplevel): Require CL at compile time. - (uniquify-push): Removed. - - * shadowfile.el (shadow-when): Removed. - - * tempo.el (tempo-dolist, tempo-mapc): Removed. + (uniquify-push): Remove. + + * shadowfile.el (shadow-when): Remove. + + * tempo.el (tempo-dolist, tempo-mapc): Remove. (tempo-process-and-insert-string): Use dolist instead of tempo-dolist. * textmodes/sgml-mode.el (sgml-mode-common): Remove `$' from @@ -19912,7 +19912,7 @@ * wid-edit.el (widgets) [defgroup]: Remove url link. (widget-color-choice-list, widget-color-history, widget-mouse-help): - Deleted. + Delete. (widget-specify-field, widget-specify-button): Don't use widget-mouse-help as help-echo property. (default): Use #'ignore for :validate and :mouse-down-action. @@ -19922,8 +19922,8 @@ (widget-color-complete): Use facemenu-color-alist. (widget-color-action): Use facemenu-read-color. - * emacs-lisp/cl-macs.el: Don't bother testing for defalias. Don't - set up `caar' &c that we now have. + * emacs-lisp/cl-macs.el: Don't bother testing for defalias. + Don't set up `caar' &c that we now have. 2000-02-09 Ray Blaak @@ -19935,9 +19935,9 @@ * bindings.el (mode-line-input-method-map): New variable. (mode-line-mule-info): Use it; fix last change. (mode-line-mode-menu): Move definition. - (mode-line-mouse-sensitive-p): Deleted. + (mode-line-mouse-sensitive-p): Delete. (mode-line-mode-name): Don't use mode-line-mouse-sensitive-p. - (make-mode-line-mouse-sensitive): Deleted. Body moved to top level. + (make-mode-line-mouse-sensitive): Delete. Body moved to top level. * startup.el (command-line-1): Don't call make-mode-line-mouse-sensitive. @@ -19960,7 +19960,7 @@ (font-lock-add-keywords): Make it work even if font-lock-mode is nil, so that it can be used more easily in -mode-hook. Also make sure to avoid duplicate entries. - (font-lock-update-removed-keyword-alist): Renamed `major-mode'->`mode'. + (font-lock-update-removed-keyword-alist): Rename `major-mode'->`mode'. (font-lock-remove-keywords): Just as was done for `add', allow it to work even if font-lock-mode is nil. Also make sure we don't modify any pre-existing list by forcing a copy-sequence. Finally rename @@ -20005,12 +20005,12 @@ (idlwave-if, idlwave-procedure, idlwave-function, idlwave-repeat) (idlwave-while): Respect `idlwave-reserved-word-upcase'. (idlwave-rw-case): New function. - (idlwave-statement-match): Fixed problem with assignment regexp. - (idlwave-font-lock-keywords): Improved regexp for keyword parameters. + (idlwave-statement-match): Fix problem with assignment regexp. + (idlwave-font-lock-keywords): Improve regexp for keyword parameters. (idlwave-surround): New argument LENGTH to support padding of operators longer than 1 char. - * progmodes/idlw-shell.el (idlwave-shell-print): Fixed bug with + * progmodes/idlw-shell.el (idlwave-shell-print): Fix bug with idlwave-shell-expression-overlay. Implemented printing of expressions on higher levels of the calling stack. (idlwave-shell-display-level-in-calling-stack): Restore stack level. @@ -20023,7 +20023,7 @@ negative level numbers. (idlwave-shell-mode): Set `modeline-format'. (idlwave-shell-display-line): Set `idlwave-shell-mode-line-info'. - (idlwave-shell-make-new-bp-overlay): Fixed glyph display for Emacs 21. + (idlwave-shell-make-new-bp-overlay): Fix glyph display for Emacs 21. (idlwave-shell-print-expression-function): New option. * progmodes/idlw-toolbar.el (idlwave-toolbar-add-everywhere) @@ -20104,7 +20104,7 @@ end position. (jit-lock-stealth-chunk-start): Rewritten. - * info.el (Info-title-face-alist): Removed. + * info.el (Info-title-face-alist): Remove. (Info-title-1-face, Info-title-2-face, Info-title-3-face): New faces. (Info-fontify-node): Use these faces. @@ -20175,8 +20175,8 @@ 2000-01-28 Gerd Moellmann - * emacs-lisp/cl-macs.el (cl-parse-loop-clause): Recognize - `collecting' as synonym for `collect'. + * emacs-lisp/cl-macs.el (cl-parse-loop-clause): + Recognize `collecting' as synonym for `collect'. * ange-ftp.el (ange-ftp-copy-file-internal): Quote new name for the case it contains spaces. @@ -20252,7 +20252,7 @@ Do not call make-variable-buffer-local. (end-of-defun): Use new variable name; doc fix. - * subr.el (dolist, dotimes): Copied from cl-macs.el + * subr.el (dolist, dotimes): Copy from cl-macs.el and made to work. * mail/undigest.el (rmail-digest-end-regexps): @@ -20281,7 +20281,7 @@ 2000-01-14 Gerd Moellmann - * emacs-lisp/copyright.el (copyright-update): Removed the + * emacs-lisp/copyright.el (copyright-update): Remove the requirement for a trailing space from `copyright-regexp', to support copyrights with owner specified on a separate line.. @@ -20330,7 +20330,7 @@ * net: New directory. - * emacs-lisp/lisp-mode.el (eval-last-sexp-1): Renamed from + * emacs-lisp/lisp-mode.el (eval-last-sexp-1): Rename from eval-last-sexp. Don't bind debug-on-error here. (eval-last-sexp): New function. Bind debug-on-error if eval-expression-debug-on-error is non-nil. @@ -20349,9 +20349,9 @@ * emacs-lisp/lisp-mode.el (with-syntax-table): Set up lisp-indent-function property. - * subr.el (with-syntax-table): Moved from simple.el. + * subr.el (with-syntax-table): Move from simple.el. - * simple.el (with-syntax-table): Moved to subr.el. + * simple.el (with-syntax-table): Move to subr.el. 2000-01-11 Gerd Moellmann @@ -20381,7 +20381,7 @@ 2000-01-10 John Wiegley - * allout.el (isearch-done/outline-provisions): Added `edit' + * allout.el (isearch-done/outline-provisions): Add `edit' argument to correspond with the current definition of `isearch-done'. 2000-01-10 Dave Love @@ -20403,17 +20403,17 @@ (version20p): New variable. (xemacsp): New variable. (ispell-choices-win-default-height): Fix for XEmacs visibility. - (ispell-dictionary-alist1): Added Brasileiro dictionary. + (ispell-dictionary-alist1): Add Brasileiro dictionary. (ispell-dictionary-alist6): Russian command lines no longer accept run-together words. (ispell-local-dictionary-alist): Add koi8-r to customize definition. (ispell-dictionary-alist): Add koi8-r to customize definition. - (check-ispell-version): Added documentation string. Return library + (check-ispell-version): Add documentation string. Return library path when called non-interactively. (ispell-menu-map-needed): Uses new variables. (ispell-library-path): New variable. (ispell-decode-string): XEmacs fix for bogus variable bindings. - (ispell-word): Improved documentation string. Test for valid + (ispell-word): Improve documentation string. Test for valid character mappings. Correctly check typed in word changes that can result in single words split into multiple words. Return replacement word. @@ -20477,7 +20477,7 @@ 2000-01-07 Dave Love - * add-log.el (add-log-debugging): Deleted. + * add-log.el (add-log-debugging): Delete. (add-change-log-entry): Treat a backup FILE-NAME as its parent file. Remove debugging code. (change-log-get-method-definition, change-log-name): Add doc. @@ -20518,7 +20518,7 @@ M-C-e, M-C-h, C-j, C-xnd, TAB. (fortran-mode): Set beginning-of-defun, end-of-defun. (fortran-column-ruler): Simplify. - (fortran-mark-subprogram, fortran-narrow-to-subprogram): Deleted. + (fortran-mark-subprogram, fortran-narrow-to-subprogram): Delete. (fortran-with-subprogram-narrowing): Likewise. (fortran-indent-subprogram): Call mark-defun. (fortran-check-for-matching-do): Change narrowing. @@ -20631,7 +20631,7 @@ * faces.el (face-read-integer, read-face-attribute) (color-defined-p, color-values): Unspecified-{f,b}g are now strings. -2000-01-03 Martin Stjernholm +2000-01-03 Martin Stjernholm * progmodes/cc-cmds.el (c-fill-paragraph): Count number of spaces at comment end, and re-insert them after filling. @@ -20661,7 +20661,7 @@ (display-color-p, frame-set-background-mode): Pass the frame to tty-display-color-p. - * term/tty-colors.el (tty-defined-color-alist): Renamed from + * term/tty-colors.el (tty-defined-color-alist): Rename from tty-color-alist. (tty-color-alist, tty-modify-color-alist): New functions. (tty-color-define, tty-color-clear, tty-color-approximate) === modified file 'lisp/gnus/ChangeLog.2' --- lisp/gnus/ChangeLog.2 2014-01-17 01:54:23 +0000 +++ lisp/gnus/ChangeLog.2 2014-08-28 22:18:39 +0000 @@ -41,20 +41,20 @@ * message.el (message-header-synonyms): Defcustom. (message-get-reply-headers): Catch `Original-To'. - (message-carefully-insert-headers): Added comment. + (message-carefully-insert-headers): Add comment. - * gnus-sum.el (gnus-summary-make-menu-bar): Improved "Washing" menu. + * gnus-sum.el (gnus-summary-make-menu-bar): Improve "Washing" menu. 2004-01-03 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-select-newsgroup): Use cat. - * gnus-agent.el (gnus-agent-cat-enable-undownloaded-faces): New - cat. - - * gnus.el (gnus-user-agent): Moved here. - - * gnus-msg.el (gnus-user-agent): Moved from here. + * gnus-agent.el (gnus-agent-cat-enable-undownloaded-faces): + New cat. + + * gnus.el (gnus-user-agent): Move here. + + * gnus-msg.el (gnus-user-agent): Move from here. * gnus.el (gnus-version-number): Bump. @@ -104,20 +104,19 @@ topic lines. (gnus-group-set-current-level): Fix fix. -2003-12-31 Jeremy Maitin-Shepard +2003-12-31 Jeremy Maitin-Shepard (tiny change) - * mml.el (mml-generate-mime-1): Use mml-compute-boundary (tiny - change). + * mml.el (mml-generate-mime-1): Use mml-compute-boundary. 2003-12-30 Reiner Steib - * gnus-group.el: Removed `(when t ...)' around `gnus-define-keys'. - (gnus-group-group-map): Added `gnus-group-read-ephemeral-group' + * gnus-group.el: Remove `(when t ...)' around `gnus-define-keys'. + (gnus-group-group-map): Add `gnus-group-read-ephemeral-group' (already in previous commit inadvertently). - (gnus-group-make-menu-bar): Added `gnus-group-read-ephemeral-group'. + (gnus-group-make-menu-bar): Add `gnus-group-read-ephemeral-group'. (gnus-group-read-ephemeral-group): Made interactive. - * gnus-score.el (gnus-score-find-trace): Added comment on sync + * gnus-score.el (gnus-score-find-trace): Add comment on sync with `gnus-score-edit-file-at-point'. * gnus-logic.el (gnus-score-advanced): Ditto. @@ -127,8 +126,8 @@ 2003-12-30 Simon Josefsson - * gnus-score.el (gnus-score-edit-file-at-point): Use - gnus-point-at-*, for portability. + * gnus-score.el (gnus-score-edit-file-at-point): + Use gnus-point-at-*, for portability. 2003-12-30 Reiner Steib @@ -136,8 +135,8 @@ custom type. (gnus-button-mid-or-mail-regexp): Don't be too restrictive. Suggested by Felix Wiemann . - (gnus-button-alist): Added "M-x ... RET" and "mid:" buttons. - Added comments about relevant RFCs. + (gnus-button-alist): Add "M-x ... RET" and "mid:" buttons. + Add comments about relevant RFCs. * gnus-sum.el (gnus-summary-mode): Untabify doc-string. (gnus-summary-goto-article): Allow `%40'. @@ -150,15 +149,15 @@ 2003-12-30 Reiner Steib - (gnus-score-find-trace): Use gnus-score-edit-file-at-point. Added - `f' and `t' commands, added quick help. With some suggestions + (gnus-score-find-trace): Use gnus-score-edit-file-at-point. + Add `f' and `t' commands, added quick help. With some suggestions from Karl Pflästerer . - * gnus-util.el (gnus-emacs-version): Added doc-string. + * gnus-util.el (gnus-emacs-version): Add doc-string. * mml.el (mml-minibuffer-read-disposition): New function. (mml-attach-file): Use it. - (mml-preview): Added MIME preview to gnus-buffers. + (mml-preview): Add MIME preview to gnus-buffers. 2003-12-30 Karl Pflästerer @@ -190,7 +189,7 @@ (gnus-agent-auto-agentize-methods): Customize. 2003-12-29 Kevin Greiner - * gnus.el (gnus-server-to-method): Fixed bug in 2003-12-22 + * gnus.el (gnus-server-to-method): Fix bug in 2003-12-22 check-in. 2003-12-28 Adrian Lanz @@ -202,8 +201,8 @@ 2003-12-28 Jesper Harder - * mm-view.el (mm-text-html-washer-alist): Use - mm-inline-wash-with-stdin for w3m-standalone. + * mm-view.el (mm-text-html-washer-alist): + Use mm-inline-wash-with-stdin for w3m-standalone. * mm-decode.el (mm-text-html-renderer): Add w3m-standalone. @@ -226,16 +225,16 @@ 2003-12-22 Kevin Greiner - * gnus-int.el (gnus-open-server): Fixed the server status such + * gnus-int.el (gnus-open-server): Fix the server status such that an agentized server, when opened offline, has a status of offline. Also fixes bug whereby the agent's backend was called twice to open each server. - * gnus-start.el (gnus-get-unread-articles-in-group): Autoload - gnus-agent-possibly-alter-active rather than inline to resolve + * gnus-start.el (gnus-get-unread-articles-in-group): + Autoload gnus-agent-possibly-alter-active rather than inline to resolve compiler warnings. - * gnus.el (gnus-server-to-method): Added fallback of iterating + * gnus.el (gnus-server-to-method): Add fallback of iterating over gnus-newsrc-alist to resolve names of foreign servers. Should fix recent agent bug. @@ -247,8 +246,8 @@ 2003-12-21 Jesper Harder - * gnus-agent.el (gnus-agent-read-agentview): Use - car-less-than-car. + * gnus-agent.el (gnus-agent-read-agentview): + Use car-less-than-car. 2003-12-20 Artem Chuprina (tiny change) @@ -267,17 +266,17 @@ 2003-12-18 Reiner Steib * mm-url.el (mm-url-insert-file-contents-external) - (mm-url-insert-file-contents): Added doc-strings. Autoload. + (mm-url-insert-file-contents): Add doc-strings. Autoload. 2003-12-18 Jesper Harder - * gnus-cus.el (defvar): Defvar - gnus-agent-cat-disable-undownloaded-faces. + * gnus-cus.el (defvar): + Defvar gnus-agent-cat-disable-undownloaded-faces. 2003-12-17 Katsumi Yamaoka - * message.el (message-forward-subject-name-subject): Use - gnus-extract-address-components instead of + * message.el (message-forward-subject-name-subject): + Use gnus-extract-address-components instead of mail-header-parse-address because it may be called with non-ascii text. @@ -320,7 +319,7 @@ 2003-12-13 Teodor Zlatanov - * spam.el: Added some gnus-registry autoloads. + * spam.el: Add some gnus-registry autoloads. (spam-split-symbolic-return): Makes spam-split return 'spam instead of the value of spam-split-group when spam is detected. (spam-split-symbolic-return-positive): Makes spam-split return @@ -345,8 +344,8 @@ (spam-unload-hook): Remove spam-find-spam from gnus-summary-prepare-hook. - * gnus.el (spam-autodetect, spam-autodetect-methods): New - configuration items for spam autodetection. + * gnus.el (spam-autodetect, spam-autodetect-methods): + New configuration items for spam autodetection. 2003-12-12 Reiner Steib @@ -367,16 +366,16 @@ (gnus-agent-regenerate-group): When necessary, alter the group's active range to include articles newly recognized as being downloaded. - (gnus-agent-regenerate): Removed code that updated the agent's + (gnus-agent-regenerate): Remove code that updated the agent's active file as the new gnus-agent-possibly-alter-active function obsolesced it. - * gnus-cus.el (gnus-agent-customize-category): Added missing + * gnus-cus.el (gnus-agent-customize-category): Add missing agent-disable-undownloaded-faces parameter. * gnus-start.el (gnus-activate-group): Backed out my 2003-11-29 patch as it was too late at adjusting the active range. - (gnus-get-unread-articles-in-group): Added call to new + (gnus-get-unread-articles-in-group): Add call to new gnus-agent-possibly-alter-active to adjust the active range. 2003-12-10 Jesper Harder @@ -385,10 +384,10 @@ 2003-12-10 Lőrentey Károly - * spam.el (spam-disable-spam-split-during-ham-respool): New - variable. - (spam-ham-copy-or-move-routine): Respect - spam-disable-spam-split-during-ham-respool. + * spam.el (spam-disable-spam-split-during-ham-respool): + New variable. + (spam-ham-copy-or-move-routine): + Respect spam-disable-spam-split-during-ham-respool. (spam-split-disabled): New variable. (spam-split): Respect spam-split-disabled. @@ -412,8 +411,8 @@ 2003-12-09 Xavier Maillard - * spam.el (spam-bogofilter-database-directory): Correct - customization group. + * spam.el (spam-bogofilter-database-directory): + Correct customization group. 2003-12-09 Per Abrahamsen @@ -459,8 +458,8 @@ 2003-12-07 Jesper Harder - * spam.el (spam-check-spamoracle, spam-spamoracle-learn): Don't - use = or zerop to test the return value of call-process, because + * spam.el (spam-check-spamoracle, spam-spamoracle-learn): + Don't use = or zerop to test the return value of call-process, because it can be a string. * mail-source.el (mail-source-fetch-with-program): Do. @@ -505,10 +504,10 @@ 2003-12-01 Kevin Greiner - * gnus-agent.el (gnus-agent-consider-all-articles): Updated - docstring. + * gnus-agent.el (gnus-agent-consider-all-articles): + Update docstring. (gnus-predicate-implies-unread, gnus-predicate-implies-unread-1): - Fixed implementation such that the predicate `true' no longer + Fix implementation such that the predicate `true' no longer evaluates to t. 2003-12-01 Adrian Lanz (tiny change) @@ -558,14 +557,14 @@ 2003-11-29 Jesper Harder - * gnus-group.el (gnus-group-make-menu-bar): Add - gnus-group-make-rss-group. + * gnus-group.el (gnus-group-make-menu-bar): + Add gnus-group-make-rss-group. 2003-11-28 Reiner Steib - * message.el: Added custom-manual links to all variables that have + * message.el: Add custom-manual links to all variables that have an index entry in the message manual. - (message-generate-headers-first): Fixed doc-string. + (message-generate-headers-first): Fix doc-string. 2003-11-27 Katsumi Yamaoka @@ -611,15 +610,15 @@ (spam-classification-valid-p, spam-process-type-valid-p) (spam-registration-check-valid-p) (spam-unregistration-check-valid-p): Convenience functions. - (spam-registration-function, spam-unregistration-function): Look - up the registration/unregistration function based on a + (spam-registration-function, spam-unregistration-function): + Look up the registration/unregistration function based on a classification and the check (spam-use-* symbol). (spam-list-articles): Generate list of spam/ham articles from a given list of articles. (spam-register-routine): Do the heavy work of registering and unregistering articles, using all the articles in the group or specific ones as needed. - (spam-generic-register-routine): Removed, no longer used. + (spam-generic-register-routine): Remove, no longer used. (spam-log-unregistration-needed-p, spam-log-undo-registration): Handle article registration/unregistration with a given spam/ham processor and group. @@ -642,7 +641,7 @@ parameter is specified. (spam-stat-load): Clear spam-stat-dirty. - * gnus.el (gnus-install-group-spam-parameters): Marked the + * gnus.el (gnus-install-group-spam-parameters): Mark the old-style exit processors as obsolete in the docs, added the new-style exit processors while the old ones are still allowed. @@ -666,23 +665,23 @@ 2003-11-20 Kevin Greiner - * gnus.el (gnus-agent-covered-methods): Documented use of + * gnus.el (gnus-agent-covered-methods): Document use of named servers, not methods, to identity agentized groups. Users may now change their server configurations without having the server become "unagentized". - (gnus-agent-covered-methods): Removed from gnus-variable-list to + (gnus-agent-covered-methods): Remove from gnus-variable-list to avoid storing two copies of gnus-agent-covered-methods, one in .newsrc.eld and the other in agent/lib/servers. (gnus-server-to-method): Do not cache server for the nil method. (gnus-method-to-server): New function. Associate named server with all, even foreign, methods. - (gnus-agent-method-p, gnus-agent-method-p-cache): Incorporated + (gnus-agent-method-p, gnus-agent-method-p-cache): Incorporate simple last-response cache to offset performance lose of having to always convert methods to named servers. - * gnus-agent.el (gnus-agent-expire-days): Removed obsolete + * gnus-agent.el (gnus-agent-expire-days): Remove obsolete documentation. (gnus-agentize, gnus-agent-add-server, gnus-agent-remove-server): - Modified to support new definition of gnus-agent-covered-method. + Modify to support new definition of gnus-agent-covered-method. (gnus-agent-read-servers): Rewritten to convert old method data into server names. (gnus-agent-read-servers-validate) @@ -701,17 +700,17 @@ (gnus-agent-expire-done-message): New function. (gnus-agent-unread-articles): Bug fix. No longer drops last unread article onto read list. - (gnus-agent-regenerate-group): Changed prompt to use typical + (gnus-agent-regenerate-group): Change prompt to use typical style. (gnus-agent-group-covered-p): Rewrote to internally use gnus-agent-method-p. * gnus-int.el (gnus-start-news-server): Partially convert old gnus-agent-covered-methods to new format so that gnus-open-server functions correctly. - * gnus-srvr.el (gnus-server-insert-server-line): Replaced - gnus-agent-covered-methods with gnus-agent-method-p. - * gnus-start.el (gnus-clear-system): Added - gnus-agent-covered-methods to compensate for removing it from + * gnus-srvr.el (gnus-server-insert-server-line): + Replace gnus-agent-covered-methods with gnus-agent-method-p. + * gnus-start.el (gnus-clear-system): + Add gnus-agent-covered-methods to compensate for removing it from gnus-variable-list. (gnus-setup-news): Complete conversion of old gnus-agent-covered-methods to new format so that secondary and @@ -831,9 +830,9 @@ 2003-11-10 Reiner Steib - * message.el (message-mode-field-menu): Moved some entries, added + * message.el (message-mode-field-menu): Move some entries, added `message-insert-wide-reply'. - (message-change-subject): Fixed comment. + (message-change-subject): Fix comment. 2003-11-10 Sam Steingold @@ -876,15 +875,15 @@ requested. (gnus-registry-split-fancy-with-parent): When long names are in use, strip the name if we're in the native server, or else return nothing. - (gnus-registry-spool-action, gnus-registry-action): Use - gnus-group-guess-full-name-from-command-method instead of + (gnus-registry-spool-action, gnus-registry-action): + Use gnus-group-guess-full-name-from-command-method instead of gnus-group-guess-full-name. * spam.el (spam-mark-spam-as-expired-and-move-routine) (spam-ham-copy-or-move-routine): Prevent article deletions or moves unless the backend allows it. - * gnus.el (gnus-install-group-spam-parameters): Fixed parameters + * gnus.el (gnus-install-group-spam-parameters): Fix parameters to list spamoracle as well, suggested by Jean-Marc Lasgouttes . @@ -899,7 +898,7 @@ 2003-10-31 Teodor Zlatanov * spam.el - (spam-log-processing-to-registry): Improved message and comments. + (spam-log-processing-to-registry): Improve message and comments. (spam-log-unregistration-needed-p): New function. (spam-ifile-register-spam-routine) (spam-ifile-register-ham-routine, spam-stat-register-spam-routine) @@ -908,8 +907,8 @@ (spam-whitelist-register-routine) (spam-bogofilter-register-spam-routine) (spam-bogofilter-register-ham-routine) - (spam-spamoracle-learn-ham, spam-spamoracle-learn-spam): Change - spam-log-processing-to-registry invocations appropriately. + (spam-spamoracle-learn-ham, spam-spamoracle-learn-spam): + Change spam-log-processing-to-registry invocations appropriately. 2003-10-31 Derek Atkins (tiny change) @@ -936,8 +935,8 @@ (spam-whitelist-register-routine) (spam-bogofilter-register-spam-routine) (spam-bogofilter-register-ham-routine) - (spam-spamoracle-learn-ham, spam-spamoracle-learn-spam): Add - spam-log-processing-to-registry invocations. + (spam-spamoracle-learn-ham, spam-spamoracle-learn-spam): + Add spam-log-processing-to-registry invocations. * gnus-registry.el: Fixed docs in the preface to mention gnus-registry-initialize. @@ -1002,7 +1001,7 @@ * spam.el (spam-mark-spam-as-expired-and-move-routine) (spam-ham-copy-or-move-routine): Don't ask when deleting copied articles, and use move instead of copy when possible. - (spam-split): Added the option of specifying a string as a + (spam-split): Add the option of specifying a string as a spam-split parameter; such a string will override spam-split-group temporarily. @@ -1017,8 +1016,8 @@ * gnus-art.el (gnus-button-alist): Allow & in mailto URLs. (gnus-header-button-alist): Likewise. (gnus-url-mailto): Handle ?to parameters. Replace \r\n with \n. - Reverse parameter list to use same order as in the URL. Reported - by f95-msv@f.kth.se (Mårten Svantesson). + Reverse parameter list to use same order as in the URL. + Reported by f95-msv@f.kth.se (Mårten Svantesson). 2003-10-25 Teodor Zlatanov @@ -1036,8 +1035,8 @@ 2003-10-24 Katsumi Yamaoka - * nndoc.el (nndoc-guess-type): Reverse the sort order. Suggested - by ARISAWA Akihiro . + * nndoc.el (nndoc-guess-type): Reverse the sort order. + Suggested by ARISAWA Akihiro . (nndoc-dissect-buffer): Don't miss even-numbered articles. 2003-10-23 Katsumi Yamaoka @@ -1054,7 +1053,7 @@ requirement, now just "IP address" is enough for detection for blackhole checking. (spam-check-blackholes): Oops, the dots were not escaped. - (spam-mark-spam-as-expired-and-move-routine): Added multiple group + (spam-mark-spam-as-expired-and-move-routine): Add multiple group support (multiple copies, then delete). (spam-ham-copy-routine): New function. (spam-ham-move-routine): New function. @@ -1086,8 +1085,8 @@ * gnus-art.el (gnus-narrow-to-page): Clear as well as set the value for gnus-page-broken. - * gnus-sum.el (gnus-summary-beginning-of-article): Use - gnus-break-pages instead of gnus-page-broken. + * gnus-sum.el (gnus-summary-beginning-of-article): + Use gnus-break-pages instead of gnus-page-broken. (gnus-summary-end-of-article): Use gnus-break-pages instead of gnus-page-broken; narrow to the end of a page beforehand. (gnus-summary-toggle-header): Use gnus-break-pages instead of @@ -1113,15 +1112,15 @@ * gnus-msg.el (gnus-extended-version): Use it. - * gnus-util.el (gnus-emacs-version): Separated out into own + * gnus-util.el (gnus-emacs-version): Separate out into own function. 2003-10-19 Reiner Steib - * message.el (message-mode-field-menu): Added - message-generate-unsubscribed-mail-followup-to. + * message.el (message-mode-field-menu): + Add message-generate-unsubscribed-mail-followup-to. (message-forward-subject-fwd): Avoid double "Fwd: ". - (message-change-subject): Added comment. + (message-change-subject): Add comment. 2003-10-19 Lars Magne Ingebrigtsen @@ -1131,8 +1130,8 @@ 2003-10-19 Katsumi Yamaoka - * gnus-sum.el (gnus-remove-odd-characters): Use - mm-subst-char-in-string instead of subst-char-in-string. + * gnus-sum.el (gnus-remove-odd-characters): + Use mm-subst-char-in-string instead of subst-char-in-string. (gnus-summary-refer-article): Use gnus-replace-in-string instead of replace-regexp-in-string. @@ -1143,22 +1142,19 @@ 2003-10-18 Jesper Harder - * gnus-sum.el (gnus-summary-save-parts-last-directory): Default - to mm-default-directory. + * gnus-sum.el (gnus-summary-save-parts-last-directory): + Default to mm-default-directory. (gnus-summary-save-parts-1): Use mm-file-name-rewrite-functions. 2003-10-18 Lars Magne Ingebrigtsen - * pop3.el (pop3-read-response): Check whether the process is - alive. + * pop3.el (pop3-read-response): Check whether the process is alive. * gnus-sum.el (gnus-summary-refer-article): Strip spaces. - * rfc2047.el (rfc2047-encode-region): Do error out on invalid - strings. + * rfc2047.el (rfc2047-encode-region): Do error out on invalid strings. - * nntp.el (nntp-retrieve-headers-with-xover): Get error messages - right. + * nntp.el (nntp-retrieve-headers-with-xover): Get error messages right. * gnus-agent.el (gnus-agent-read-servers): Remove sit-for. @@ -1244,8 +1240,8 @@ name for gcc-self. (gnus-inews-insert-archive-gcc): Paren mistake. - * gnus-sum.el (gnus-summary-enter-digest-group): Add - parent-group. + * gnus-sum.el (gnus-summary-enter-digest-group): + Add parent-group. * gnus-art.el (gnus-ignored-headers): Add more headers. @@ -1329,8 +1325,8 @@ 2003-10-06 Jesper Harder - * gnus.el (gnus-group-faq-directory): Update .tw entry. From - Albert Chun-Chieh Huang + * gnus.el (gnus-group-faq-directory): Update .tw entry. + From Albert Chun-Chieh Huang 2003-10-03 Teodor Zlatanov @@ -1355,7 +1351,7 @@ 2003-10-02 Reiner Steib - * spam.el (spam-install-hooks-function): Added Autoload cookie. + * spam.el (spam-install-hooks-function): Add Autoload cookie. 2003-10-02 Michael Shields @@ -1369,8 +1365,7 @@ 2003-10-01 Jesper Harder - * message.el (message-send): Fix reversed logic of supersedes - check. + * message.el (message-send): Fix reversed logic of supersedes check. 2003-09-30 Reiner Steib @@ -1464,8 +1459,8 @@ 2003-09-05 Teodor Zlatanov - * gnus-registry.el (gnus-registry-split-fancy-with-parent): Yet - another error. *sigh* + * gnus-registry.el (gnus-registry-split-fancy-with-parent): + Yet another error. *sigh* * gnus-registry.el (gnus-registry-fetch-extra-entry): Don't use puthash unless gnus-registry-entry-caching is on. @@ -1495,10 +1490,10 @@ (gnus-registry-register-message-ids): Pass subject to gnus-registry-add-group. (gnus-registry-simplify-subject) - (gnus-registry-fetch-simplified-message-subject-fast): New - functions. - (gnus-registry-fetch-extra, gnus-registry-fetch-extra-entry): Add - extra data entry caching. + (gnus-registry-fetch-simplified-message-subject-fast): + New functions. + (gnus-registry-fetch-extra, gnus-registry-fetch-extra-entry): + Add extra data entry caching. (gnus-registry-add-group): Handle the extra subject parameter. (gnus-registry-install-hooks, gnus-registry-unload-hook): Fix the gnus-register-* function names. @@ -1506,27 +1501,27 @@ * nnmail.el (nnmail-cache-insert): Add subject parameter, pass it on to the nnmail-spool-hook. - * nnbabyl.el (nnbabyl-request-accept-article): Added subject to - nnmail-cache-insert call. - - * nndiary.el (nndiary-request-accept-article): Added subject to - nnmail-cache-insert call. - - * nnfolder.el (nnfolder-request-accept-article): Added subject to - nnmail-cache-insert call. - - * nnimap.el (nnimap-split-articles): Added subject to - nnmail-cache-insert call. - (nnimap-request-accept-article): Added subject to - nnmail-cache-insert call. - - * nnmbox.el (nnmbox-request-accept-article): Added subject to - nnmail-cache-insert call. - - * nnmh.el (nnmh-request-accept-article): Added subject to - nnmail-cache-insert call. - - * nnml.el (nnml-request-accept-article): Added subject to + * nnbabyl.el (nnbabyl-request-accept-article): Add subject to + nnmail-cache-insert call. + + * nndiary.el (nndiary-request-accept-article): Add subject to + nnmail-cache-insert call. + + * nnfolder.el (nnfolder-request-accept-article): Add subject to + nnmail-cache-insert call. + + * nnimap.el (nnimap-split-articles): Add subject to + nnmail-cache-insert call. + (nnimap-request-accept-article): Add subject to + nnmail-cache-insert call. + + * nnmbox.el (nnmbox-request-accept-article): Add subject to + nnmail-cache-insert call. + + * nnmh.el (nnmh-request-accept-article): Add subject to + nnmail-cache-insert call. + + * nnml.el (nnml-request-accept-article): Add subject to nnmail-cache-insert call. 2003-09-04 Jesper Harder @@ -1557,8 +1552,8 @@ 2003-08-29 Simon Josefsson - * gnus-group.el (gnus-group-delete-group): Doc fix. Suggested by - Jochen Küpper . + * gnus-group.el (gnus-group-delete-group): Doc fix. + Suggested by Jochen Küpper . 2003-08-29 Katsumi Yamaoka @@ -1592,13 +1587,13 @@ 2003-08-24 Jesper Harder - * gnus-art.el (gnus-header-button-alist, gnus-button-alist): Fix - type. + * gnus-art.el (gnus-header-button-alist, gnus-button-alist): + Fix type. 2003-08-22 Jesper Harder - * message.el (message-make-forward-subject-function): Fix - customize mismatch. + * message.el (message-make-forward-subject-function): + Fix customize mismatch. * gnus.el (gnus-message-archive-method): Do. @@ -1608,7 +1603,7 @@ char is `/' and add more information for the user. * gnus-art.el (gnus-button-alist): Add `+' (gnus-button-handle-man). - (gnus-header-button-alist): Added `In-Reply-To'. + (gnus-header-button-alist): Add `In-Reply-To'. * nnimap.el (nnimap-open-connection): Allow different user names on the same server (and in the same authinfo file). @@ -1617,15 +1612,15 @@ * gnus-sieve.el (gnus-sieve-crosspost): Fix type. - * message.el (message-make-forward-subject-function): Add - message-forward-subject-name-subject to choices. + * message.el (message-make-forward-subject-function): + Add message-forward-subject-name-subject to choices. * gnus-art.el (gnus-article-edit-done, gnus-article-edit-exit): Redisplay article after editing. 2003-08-20 Jari Aalto - * gnus.el (gnus-read-group): Added check to ask confirmation if + * gnus.el (gnus-read-group): Add check to ask confirmation if Group name contains invalid character. You can use '/' in IMAP, but not in filenames. G m cannot know what the user is creating, so let user decide. See thread m2oeysiev3.fsf@naima.lensflare.org. @@ -1645,8 +1640,8 @@ 2003-08-07 Jesper Harder - * pgg-gpg.el (pgg-gpg-process-region): Bind - default-enable-multibyte-characters to nil. + * pgg-gpg.el (pgg-gpg-process-region): + Bind default-enable-multibyte-characters to nil. 2003-08-07 Katsumi Yamaoka @@ -1729,11 +1724,11 @@ * spam.el (spam-use-regex-body, spam-regex-body-spam) (spam-regex-body-ham): New variables, default to nil/empty/empty. - (spam-install-hooks): Added spam-use-regex-body to list or + (spam-install-hooks): Add spam-use-regex-body to list or pre-install conditions. - (spam-list-of-checks): Added spam-use-regex-body and + (spam-list-of-checks): Add spam-use-regex-body and spam-check-regex-body to list of checks. - (spam-list-of-statistical-checks): Added spam-use-regex-body to + (spam-list-of-statistical-checks): Add spam-use-regex-body to list of statistical checks. (spam-check-regex-body): Invokes spam-check-regex-headers with appropriate variable masking. @@ -1754,8 +1749,8 @@ (gnus-registry-clean-empty): New variable to enable cleaning the registry when saving it by calling gnus-registry-clean-empty-function. - * spam.el (spam-summary-prepare-exit): Use - spam-process-ham-in-spam-groups. + * spam.el (spam-summary-prepare-exit): + Use spam-process-ham-in-spam-groups. (spam-process-ham-in-spam-groups): New variable. 2003-07-24 Jesper Harder @@ -1763,8 +1758,8 @@ * pgg-gpg.el (pgg-gpg-process-region): Add "--yes" to options. * pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el, pgg.el: Reapply changes - from 2003-04-03 to fix security problem. See - http://www.debian.org/security/2003/dsa-339. + from 2003-04-03 to fix security problem. + See http://www.debian.org/security/2003/dsa-339. 2003-07-23 Teodor Zlatanov @@ -1806,8 +1801,7 @@ 2003-07-10 Kai Großjohann - * imap.el (imap-arrival-filter): Fix test for missing process - buffer. + * imap.el (imap-arrival-filter): Fix test for missing process buffer. 2003-07-09 Gaute B Strokkenes (tiny change) @@ -1881,8 +1875,8 @@ 2003-07-06 Jesper Harder - * message.el (message-send-mail-with-sendmail): Handle - non-numeric return values. + * message.el (message-send-mail-with-sendmail): + Handle non-numeric return values. * gnus-start.el (gnus-clear-system): Revert change from 2003-06-19. @@ -1928,8 +1922,8 @@ 2003-06-23 Teodor Zlatanov - * spam.el (spam-from-listed-p, spam-parse-list): Use - ietf-drums-parse-addresses to extract the address portion of the + * spam.el (spam-from-listed-p, spam-parse-list): + Use ietf-drums-parse-addresses to extract the address portion of the whitelist/blacklist file if it looks like an address can be found. 2003-06-23 Didier Verna @@ -1942,8 +1936,8 @@ (gnus-xmas-remove-image): Ditto, with extents. * gnus-art.el (gnus-delete-images): Pass CATEGORY argument to gnus-[xmas-]remove-image. - (article-display-face): Don't always act as a toggle. Call - `gnus-put-image' with CATEGORY argument. + (article-display-face): Don't always act as a toggle. + Call `gnus-put-image' with CATEGORY argument. (article-display-x-face): Call `gnus-put-image' with CATEGORY argument. * smiley.el (smiley-region): Ditto. @@ -1959,11 +1953,11 @@ 2003-06-20 Jesper Harder - * mm-util.el (mm-append-to-file): Say "Appended to". Suggested by - Dan Jacobson . + * mm-util.el (mm-append-to-file): Say "Appended to". + Suggested by Dan Jacobson . - * mm-view.el (mm-inline-message): Bind - gnus-original-article-buffer to the buffer in the mml handle + * mm-view.el (mm-inline-message): + Bind gnus-original-article-buffer to the buffer in the mml handle holding the message. 2003-06-20 Katsumi Yamaoka @@ -1994,8 +1988,8 @@ 2003-06-19 Jesper Harder - * nnheader.el (nnheader-init-server-buffer): Add - nntp-server-buffer to gnus-buffers. + * nnheader.el (nnheader-init-server-buffer): + Add nntp-server-buffer to gnus-buffers. * gnus-start.el (gnus-clear-system): Now we don't need to kill nntp-server-buffer separately. @@ -2016,8 +2010,8 @@ 2003-06-17 Reiner Steib - * gnus-util.el (gnus-extract-address-components): Added - doc-string. + * gnus-util.el (gnus-extract-address-components): + Add doc-string. 2003-06-16 Michael Albinus @@ -2026,8 +2020,8 @@ 2003-06-16 Katsumi Yamaoka - * gnus-sum.el (gnus-summary-refer-parent-article): Extract - Message-ID from In-Reply-To header. + * gnus-sum.el (gnus-summary-refer-parent-article): + Extract Message-ID from In-Reply-To header. 2003-06-16 Katsumi Yamaoka @@ -2037,14 +2031,14 @@ 2003-06-15 Reiner Steib - * gnus-sum.el (gnus-summary-force-verify-and-decrypt): Bind - `gnus-article-emulate-mime'. + * gnus-sum.el (gnus-summary-force-verify-and-decrypt): + Bind `gnus-article-emulate-mime'. 2003-06-15 Tommi Vainikainen - * message.el (message-is-yours-p): New function. Separated common - code from message-cancel-news and message-supersede. Added - matching code which uses message-alternative-emails regexp as last + * message.el (message-is-yours-p): New function. Separate common + code from message-cancel-news and message-supersede. + Add matching code which uses message-alternative-emails regexp as last resort. (message-cancel-news, message-supersede): Use message-is-yours-p. @@ -2055,11 +2049,11 @@ 2003-06-12 Dave Love - * nnheader.el (nnheader-functionp): Deleted. + * nnheader.el (nnheader-functionp): Delete. * nnmail.el (nnmail-split-fancy-syntax-table): Define all in defvar. - (nnmail-version): Deleted. + (nnmail-version): Delete. (nnmail-check-duplication, nnmail-expiry-target-group): Don't use nnheader-functionp. @@ -2077,15 +2071,15 @@ (spam-spamoracle, spam-spamoracle): New variables. (spam-group-spam-processor-spamoracle-p) (spam-group-ham-processor-spamoracle-p): New functions. - (spam-summary-prepare-exit): Added spamoracle ham/spam exit processing. - (spam-list-of-checks, spam-list-of-statistical-checks): Add - spam-use-spamoracle. + (spam-summary-prepare-exit): Add spamoracle ham/spam exit processing. + (spam-list-of-checks, spam-list-of-statistical-checks): + Add spam-use-spamoracle. (spam-check-spamoracle, spam-spamoracle-learn) (spam-spamoracle-learn-ham, spam-spamoracle-learn-spam): New functions. * gnus.el (gnus-group-spam-exit-processor-spamoracle) (gnus-group-ham-exit-processor-spamoracle): New variables for SpamOracle. - (spam-process, ham-process): Added spamoracle spam/ham processors. + (spam-process, ham-process): Add spamoracle spam/ham processors. 2003-06-08 Jesper Harder @@ -2094,7 +2088,7 @@ 2003-06-07 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-summary-make-menu-bar): Removed ["Add buttons" + * gnus-sum.el (gnus-summary-make-menu-bar): Remove ["Add buttons" gnus-summary-display-buttonized t]. 2003-06-07 Kai Großjohann @@ -2150,9 +2144,9 @@ (gnus-other-frame): Quote lambda used as hook. * message.el: Doc fixes. - (message-functionp): Deleted. Callers changed. - (message-fix-before-sending): Highlight with overlays. Clarify - `illegible text' messages. + (message-functionp): Delete. Callers changed. + (message-fix-before-sending): Highlight with overlays. + Clarify `illegible text' messages. (rmail-enable-mime-composing, gnus-message-group-art): Defvar when compiling. (gnus-find-method-for-group, nnvirtual-find-group-art): Autoload. @@ -2168,8 +2162,8 @@ 2003-06-03 Eric Eide - * gnus-xmas.el (gnus-xmas-create-image): Use - insert-file-contents-literally. + * gnus-xmas.el (gnus-xmas-create-image): + Use insert-file-contents-literally. 2003-06-02 Teodor Zlatanov @@ -2195,8 +2189,8 @@ (gnus-registry-delete-group): Use it. (gnus-registry-unload-hook): Uninstall all the hooks. - * spam.el (spam-install-hooks-function, spam-unload-hook): New - functions so users that load spam.el for customization don't get + * spam.el (spam-install-hooks-function, spam-unload-hook): + New functions so users that load spam.el for customization don't get all the hooks installed. (spam-install-hooks): New variable, set to t by default if user has one of the spam-use-* variables set. @@ -2210,8 +2204,8 @@ * rfc2047.el (rfc2047-decode): Don't use mm-with-unibyte-current-buffer. - * qp.el (quoted-printable-decode-string): Use - mm-with-unibyte-buffer. + * qp.el (quoted-printable-decode-string): + Use mm-with-unibyte-buffer. 2003-05-29 Teodor Zlatanov @@ -2250,7 +2244,7 @@ 2003-05-20 Dave Love - * rfc2047.el (rfc2047-q-encoding-alist): Deleted. + * rfc2047.el (rfc2047-q-encoding-alist): Delete. (rfc2047-q-encode-region): Don't use it. (rfc2047-encode-message-header) <(eq method 'mime)>: Bind rfc2047-encoding-type to `mime'. @@ -2268,11 +2262,11 @@ 2003-05-14 Kevin Greiner - * gnus-agent.el (gnus-agentize): Updated documentation to match + * gnus-agent.el (gnus-agentize): Update documentation to match usage. (gnus-agent-expire-group-1): Do not skip over a group when the force argument is set. - * gnus.el (gnus-agent): Updated documentation to reflect that + * gnus.el (gnus-agent): Update documentation to reflect that gnus-agent now defaults to t. 2003-05-14 Lars Magne Ingebrigtsen @@ -2285,24 +2279,24 @@ 2003-05-14 Lars Magne Ingebrigtsen - * mail-source.el (mail-source-delete-incoming): Changed to t. + * mail-source.el (mail-source-delete-incoming): Change to t. * rfc2047.el (rfc2047-syntax-table): Funcall. * rfc2047.el (rfc2047-encodable-p): Use the header charset. - * gnus-sum.el (gnus-summary-reselect-current-group): Supply - leave-hidden. + * gnus-sum.el (gnus-summary-reselect-current-group): + Supply leave-hidden. 2003-05-14 Jonathan I. Kamens - * gnus-sum.el (gnus-summary-exit): Added `leave-hidden'. (Tiny + * gnus-sum.el (gnus-summary-exit): Add `leave-hidden'. (Tiny patch.) 2003-05-13 Lars Magne Ingebrigtsen - * gnus-registry.el (gnus-registry-store-extra-entry): Use - gnus-assq-delete-all. + * gnus-registry.el (gnus-registry-store-extra-entry): + Use gnus-assq-delete-all. * gnus-xmas.el (gnus-xmas-assq-delete-all): New function. @@ -2341,10 +2335,10 @@ (gnus-agent-cat-disable-undownloaded-faces): New function. Accessor for new agent property 'agent-disable-undownloaded-faces'. - gnus-cus.el (gnus-agent-parameters): Added - agent-disable-undownloaded-faces and corrected documentation. + gnus-cus.el (gnus-agent-parameters): + Add agent-disable-undownloaded-faces and corrected documentation. (gnus-agent-cat-prepare-category-field, - gnus-agent-customize-category): Changed to avoid creating free + gnus-agent-customize-category): Change to avoid creating free references to each field's symbol. gnus-sum.el (gnus-summary-use-undownloaded-faces): New local variable. (gnus-select-newgroup): Initialize it. @@ -2352,15 +2346,15 @@ 2003-05-12 Dave Love - * mm-util.el (mm-read-charset): Deleted. + * mm-util.el (mm-read-charset): Delete. (mm-coding-system-mime-charset): New. (mm-read-coding-system, mm-mule-charset-to-mime-charset) (mm-charset-to-coding-system, mm-mime-charset) (mm-find-mime-charset-region): Use it. (mm-default-multibyte-p): Fix non-mule case. - * rfc2047.el (rfc2047-point-at-bol, rfc2047-point-at-bol): Eval - and compile. + * rfc2047.el (rfc2047-point-at-bol, rfc2047-point-at-bol): + Eval and compile. (rfc2047-syntax-table): Fix building table to work in Emacs 22. (rfc2047-unfold-region): Delete unused var `leading'. @@ -2371,8 +2365,8 @@ 2003-05-11 Lars Magne Ingebrigtsen - * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Added - space. + * gnus-agent.el (gnus-agent-expire-unagentized-dirs): + Add space. 2003-05-11 Jesper Harder @@ -2390,7 +2384,7 @@ 2003-05-10 Lars Magne Ingebrigtsen - * gnus.el (gnus-logo-color-alist): Added no colors. + * gnus.el (gnus-logo-color-alist): Add no colors. 2003-05-09 Dave Love @@ -2415,12 +2409,12 @@ * gnus-registry.el (gnus-registry-unregistered-group-regex): removed in favor of the group/topic/global variables. - (gnus-registry-register-message-ids): Fixed test to omit + (gnus-registry-register-message-ids): Fix test to omit gnus-registry-unregistered-group-regex. - * gnus.el (gnus-variable-list): Removed gnus-registry-alist and + * gnus.el (gnus-variable-list): Remove gnus-registry-alist and gnus-registry-headers-alist from the list. - (gnus-registry-headers-alist): Removed. + (gnus-registry-headers-alist): Remove. (registry-ignore): New parameter, with accompanying gnus-registry-ignored-groups global variable. @@ -2430,12 +2424,12 @@ used by gnus-registry.el. * gnus-registry.el (gnus-registry-cache-file): New file variable. - (gnus-registry-cache-read, gnus-registry-cache-save): New - functions. + (gnus-registry-cache-read, gnus-registry-cache-save): + New functions. (gnus-registry-save, gnus-registry-read): Use the new gnus-registry-cache-{read|save} functions, and change the name from gnus-registry-translate-{from|to}-alist. - (gnus-registry-clear): Fixed so it doesn't refer to old function name. + (gnus-registry-clear): Fix so it doesn't refer to old function name. 2003-05-09 Dan Christensen @@ -2448,7 +2442,7 @@ 2003-05-08 Teodor Zlatanov - * gnus-start.el (gnus-clear-system): Added gnus-registry-alist to + * gnus-start.el (gnus-clear-system): Add gnus-registry-alist to the list of cleared variables. * gnus-registry.el (gnus-registry-split-fancy-with-parent): @@ -2461,8 +2455,8 @@ 2003-05-08 Kai Großjohann - * gnus-sum.el (gnus-summary-next-page): Mention - `gnus-article-skip-boring' in docstring. + * gnus-sum.el (gnus-summary-next-page): + Mention `gnus-article-skip-boring' in docstring. 2003-05-08 Jesper Harder @@ -2546,13 +2540,13 @@ * rfc2047.el (rfc2047-point-at-bol, rfc2047-point-at-eol): New. Callers of gnus- versions changed to use them. - (rfc2047-header-encoding-alist): Add `address-mime' part. Doc - fixes. + (rfc2047-header-encoding-alist): Add `address-mime' part. + Doc fixes. (rfc2047-encoding-type): New. (rfc2047-encode-message-header): Use mm-charset-to-coding-system. Don't include header name field in encoding. Add `address-mime' case and bind rfc2047-encoding-type for `mime' case. - (rfc2047-encodable-p): Deleted. + (rfc2047-encodable-p): Delete. (rfc2047-syntax-table): New. (rfc2047-encode-region, rfc2047-encode): Rewritten to take account of rfc2047 rules with respect to rfc2822 tokens and to do encoding @@ -2566,8 +2560,8 @@ 2003-05-02 Dave Love - * rfc2047.el (rfc2047-q-encode-region, rfc2047-decode): Use - mm-with-unibyte-current-buffer. + * rfc2047.el (rfc2047-q-encode-region, rfc2047-decode): + Use mm-with-unibyte-current-buffer. (ietf-drums, gnus-util): Don't require. * sieve.el (sieve-manage-mode-menu): Define before use. @@ -2577,9 +2571,9 @@ * mm-util.el (mm-coding-system-p): Don't override nil from coding-system-p. (mm-mule4-p, mm-disable-multibyte-mule4) - (mm-with-unibyte-current-buffer-mule4): Deleted. + (mm-with-unibyte-current-buffer-mule4): Delete. (mm-multibyte-p): Use defun, not defalias. - (mm-make-temp-file): Moved to group at top of file. + (mm-make-temp-file): Move to group at top of file. (mm-point-at-eol, mm-point-at-bol): New. * gnus-cite.el (gnus-art): Require. @@ -2599,29 +2593,29 @@ (gnus-output-to-rmail): Require mm-util. * mail-source.el (mail-source-callback): Use mm-make-temp-file. - (mail-source-make-complex-temp-name): Deleted. + (mail-source-make-complex-temp-name): Delete. * message.el (message-use-idna): Use mm-coding-system-p. (message-tokenize-header, message-make-organization) (message-make-from): Use with-temp-buffer. - (message-set-work-buffer): Deleted. + (message-set-work-buffer): Delete. (message-fill-paragraph): Use `if' not `and' for compiler warning. (message-check-news-header-syntax): Remove useless lambda. (message-forward-make-body): Use mm-disable-multibyte, mm-with-unibyte-current-buffer, mm-enable-multibyte. - (message-replace-chars-in-string): Deleted. + (message-replace-chars-in-string): Delete. * mm-extern.el (mm-extern-local-file): Use mm-disable-multibyte. (mm-extern-url): Use mm-with-unibyte-current-buffer, mm-disable-multibyte. (mm-extern-anon-ftp): Use mm-disable-multibyte. - * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt): Use - mm-with-unibyte-current-buffer. + * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt): + Use mm-with-unibyte-current-buffer. * mml2015.el (mml): Require. - (mml2015-mailcrypt-encrypt, mml2015-gpg-encrypt): Use - mm-with-unibyte-current-buffer. + (mml2015-mailcrypt-encrypt, mml2015-gpg-encrypt): + Use mm-with-unibyte-current-buffer. * nnheader.el (gnus-util): Require. @@ -2656,7 +2650,7 @@ * gnus-registry.el (gnus-registry-fetch-extra) (gnus-registry-store-extra, gnus-registry-group-count): New functions. (gnus-registry-fetch-group, gnus-registry-delete-group) - (gnus-registry-add-group): Changed to work with extra data element + (gnus-registry-add-group): Change to work with extra data element if present. 2003-05-01 Lars Magne Ingebrigtsen @@ -2693,8 +2687,8 @@ 2003-05-01 Lars Magne Ingebrigtsen - * message.el (message-forward-subject-name-subject): Decode - string when forwarding. + * message.el (message-forward-subject-name-subject): + Decode string when forwarding. 2003-05-01 Lars Magne Ingebrigtsen @@ -2756,7 +2750,7 @@ 2003-04-30 Reiner Steib - * gnus-art.el (gnus-button-prefer-mid-or-mail): Fixed typo in + * gnus-art.el (gnus-button-prefer-mid-or-mail): Fix typo in doc-string. 2003-05-01 Steve Youngs @@ -2778,20 +2772,20 @@ 2003-04-30 Teodor Zlatanov - * gnus-registry.el (gnus-registry-split-fancy-with-parent): Added - diagnostic message. + * gnus-registry.el (gnus-registry-split-fancy-with-parent): + Add diagnostic message. (gnus-registry-grep-in-list): Don't run when word is nil. (gnus-registry-fetch-message-id-fast): New function. (gnus-registry-delete-group, gnus-registry-add-group): Make sure the id and group are not nil. (gnus-registry-register-message-ids): New function. - (gnus-register-action): Optimized logical flow. - (gnus-summary-prepare-hook): Added gnus-registry-register-message-ids. + (gnus-register-action): Optimize logical flow. + (gnus-summary-prepare-hook): Add gnus-registry-register-message-ids. 2003-04-30 Kai Großjohann - * gnus-delay.el (gnus-delay-article): Call - `gnus-agent-queue-setup' to create the delay group. + * gnus-delay.el (gnus-delay-article): + Call `gnus-agent-queue-setup' to create the delay group. * gnus-agent.el (gnus-agent-queue-setup): Support optional arg for the (queue) group name. @@ -2804,17 +2798,17 @@ 2003-04-30 Kevin Greiner * gnus-agent.el (gnus-agent-cat-defaccessor, gnus-agent-cat-name): - Wrapped in eval-when-compile. + Wrap in eval-when-compile. (gnus-agent-mode): Bind gnus-agent-go-online to nil as you shouldn't be asked twice to go online with each server. (gnus-agent-get-undownloaded-list, gnus-agent-fetch-articles, gnus-agent-crosspost, gnus-agent-flush-cache, gnus-agent-fetch-session, gnus-agent-unread-articles, gnus-agent-uncached-articles, gnus-agent-regenerate-group, - gnus-agent-group-covered-p): Expanded pop macros used for + gnus-agent-group-covered-p): Expand pop macros used for effect. Avoids compilation warning in emacs 21.3. - * gnus-int.el (gnus-open-server): Restructured to only open + * gnus-int.el (gnus-open-server): Restructure to only open nnagent when gnus-plugged is nil. 2003-04-29 Teodor Zlatanov @@ -2830,7 +2824,7 @@ 2003-04-29 Reiner Steib - * gnus-art.el (gnus-button-alist): Fixed CTAN regexp. + * gnus-art.el (gnus-button-alist): Fix CTAN regexp. 2003-04-29 Teodor Zlatanov @@ -2892,7 +2886,7 @@ * gnus-art.el (gnus-mime-display-multipart-as-mixed) (gnus-mime-display-multipart-alternative-as-mixed) - (gnus-mime-display-multipart-related-as-mixed): Added doc-strings, + (gnus-mime-display-multipart-related-as-mixed): Add doc-strings, allow customization. 2003-04-27 Lars Magne Ingebrigtsen @@ -2909,7 +2903,7 @@ 2003-04-27 Kevin Greiner - * gnus-registry.el (gnus-register-spool-action): Replaced literal + * gnus-registry.el (gnus-register-spool-action): Replace literal carriage-return character with its escape sequence. 2003-04-27 Lars Magne Ingebrigtsen @@ -2921,7 +2915,7 @@ * gnus.el: Remove gnus-functionp throughout. - * gnus-util.el (gnus-functionp): Removed. + * gnus-util.el (gnus-functionp): Remove. * gnus-msg.el (gnus-summary-wide-reply-with-original): Doc fix. @@ -2985,8 +2979,8 @@ * gnus-start.el (message-make-date): Autoload rather than requiring message. - * gnus-group.el (gnus-group-name-charset-group-alist): Use - mm-coding-system-p. + * gnus-group.el (gnus-group-name-charset-group-alist): + Use mm-coding-system-p. (gnus-cache-active-altered): Defvar when compiling. (gnus-group-delete-group): Re-write to help avoid warnings. @@ -3032,12 +3026,12 @@ 2003-04-22 Paul Jarc - * gnus-util.el (gnus-merge): Added "type" argument to match CL + * gnus-util.el (gnus-merge): Add "type" argument to match CL merge and gnus-sum.el's expectations. 2003-04-21 Reiner Steib - * gnus-art.el (gnus-button-url-regexp): Added nntp. + * gnus-art.el (gnus-button-url-regexp): Add nntp. * message.el (message-generate-headers-first): Default to '(references). @@ -3089,8 +3083,8 @@ * spam.el (spam-split): Allow a particular check as a parameter, e.g. (: spam-split 'spam-use-bogofilter). (spam-mark-only-unseen-as-spam): New parameter, see doc. - (spam-mark-junk-as-spam-routine): Use - spam-mark-only-unseen-as-spam, simplify routine to take advantage + (spam-mark-junk-as-spam-routine): + Use spam-mark-only-unseen-as-spam, simplify routine to take advantage of gnus-newsgroup-unread as well as gnus-newsgroup-unseen. 2003-04-17 Teodor Zlatanov @@ -3103,7 +3097,7 @@ * gnus-registry.el (gnus-registry-clear) (gnus-registry-fetch-group, gnus-registry-grep-in-list) (gnus-registry-split-fancy-with-parent): New functions. - (gnus-register-spool-action, gnus-register-action): Simplified the + (gnus-register-spool-action, gnus-register-action): Simplify the format. (gnus-registry): New customization group. (gnus-registry-unfollowed-groups): New variable. @@ -3154,9 +3148,9 @@ * spam-report.el (Module): New module for spam reporting. - * gnus.el (spam-process): Added - gnus-group-spam-exit-processor-report-gmane to the list of choices. - (gnus-install-group-spam-parameters): Defined new spam exit processor. + * gnus.el (spam-process): + Add gnus-group-spam-exit-processor-report-gmane to the list of choices. + (gnus-install-group-spam-parameters): Define new spam exit processor. * spam.el (autoload): Autoload spam-report-gmane when needed. (spam-report-gmane-register-routine): Glue for spam-report.el. @@ -3200,7 +3194,7 @@ 2003-04-16 Kevin Greiner - * gnus-agent.el (gnus-agent-make-cat): Added optional parameter to + * gnus-agent.el (gnus-agent-make-cat): Add optional parameter to specify a predicate other than false. (gnus-category-read): Use the new feature to create a 'default' category with a 'short' predicate. @@ -3214,7 +3208,7 @@ 2003-04-15 Teodor Zlatanov - * spam.el (spam-split): Added save-restriction to save-excursion. + * spam.el (spam-split): Add save-restriction to save-excursion. 2003-04-15 Julien Avarre @@ -3276,8 +3270,8 @@ 2003-04-13 Kevin Greiner - * gnus-agent.el (gnus-agent-group-pathname): Bind - gnus-command-method so that gnus-agent-directory will always + * gnus-agent.el (gnus-agent-group-pathname): + Bind gnus-command-method so that gnus-agent-directory will always return a valid directory. * gnus-cache.el (gnus-cache-enter-article): Remove article from gnus-newsgroup-undownloaded so that the summary will display the @@ -3300,13 +3294,13 @@ 2003-04-12 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-article-next-page): Use - gnus-article-over-scroll. + * gnus-art.el (gnus-article-next-page): + Use gnus-article-over-scroll. (gnus-article-over-scroll): New variable. * message.el (message-newline-and-reformat): Place a boundary before filling. - (message-make-forward-subject-function): Changed default to + (message-make-forward-subject-function): Change default to message-forward-subject-name-subject. (message-forward-subject-name-subject): New function. @@ -3314,16 +3308,15 @@ * gnus-sum.el (gnus-summary-line-message-size): Ditto. - * gnus-cus.el (gnus-group-parameters): Removed "which see". + * gnus-cus.el (gnus-group-parameters): Remove "which see". - * mml.el (mml-minibuffer-read-file): Bind - completion-ignored-extensions to nil. + * mml.el (mml-minibuffer-read-file): + Bind completion-ignored-extensions to nil. * message.el (message-fix-before-sending): Comment fix. (message-fix-before-sending): Make hidden headers visible. (message-hide-headers): Bind after-change-functions to nil. - (message-forbidden-properties): Put invisible and intangible - back. + (message-forbidden-properties): Put invisible and intangible back. (message-strip-forbidden-properties): Ignore message-hidden text. * gnus-msg.el: Hide headers. @@ -3332,8 +3325,7 @@ (message-hide-headers): New function. (message-hide-header-p): New function. (message-hide-header-p): Change logic. - (message-forbidden-properties): Remove intangible nil invisible - nil. + (message-forbidden-properties): Remove intangible nil invisible nil. (message-hide-headers): Narrow to headers. 2003-04-12 Jesper Harder @@ -3348,7 +3340,7 @@ * gnus-agent.el (gnus-agent-get-undownloaded-list): Articles in the CACHE are now detected and handled the same as an article downloaded into the agent. - (gnus-agent-group-path): Modified to match nnmail-group-pathname + (gnus-agent-group-path): Modify to match nnmail-group-pathname so that the agent front-end and back-end (nnagent) always use the same directory. (gnus-agent-group-pathname): New function. Wrapper for @@ -3371,7 +3363,7 @@ 2003-04-09 Kevin Greiner - * gnus-agent.el (gnus-agent-write-active): Added option of + * gnus-agent.el (gnus-agent-write-active): Add option of replacing, rather than updating, the agent's active file. Do NOT use the fully qualified group name as gnus-active-to-gnus-format blindly prefixes group names with server names. @@ -3384,9 +3376,9 @@ (gnus-agent-expire-unagentized-dirs): Avoid asking to delete the same ancestor multiple times. - * gnus-async.el (gnus-asynchronous): Moved defcustom of - gnus-asynchronous away from defgroup of gnus-asynchronous. This - seems to fix an intermittant error in which loading gnus-async + * gnus-async.el (gnus-asynchronous): Move defcustom of + gnus-asynchronous away from defgroup of gnus-asynchronous. + This seems to fix an intermittant error in which loading gnus-async fails to define gnus-asynchronous (the variable). * gnus-sum.el: Concur with Steve Young, 5th argument to 'load' is @@ -3395,7 +3387,7 @@ group's active range to include fetched articles that are no longer in the server's active range. - * gnus-util.el (gnus-with-output-to-file): Removed all of the + * gnus-util.el (gnus-with-output-to-file): Remove all of the print-* bindings as they should be handled by the function doing the printing. @@ -3443,8 +3435,8 @@ 2003-04-06 Jesper Harder - * mm-uu.el (mm-uu-copy-to-buffer): Copy - `buffer-file-coding-system' to the new buffer. + * mm-uu.el (mm-uu-copy-to-buffer): + Copy `buffer-file-coding-system' to the new buffer. (mm-uu-pgp-signed-extract-1): Don't copy `buffer-file-coding-system' here. @@ -3452,8 +3444,8 @@ exist in XEmacs. (mm-decode-body): Add missing quote. - * mm-uu.el (mm-uu-pgp-signed-extract-1): Set - buffer-file-coding-system. + * mm-uu.el (mm-uu-pgp-signed-extract-1): + Set buffer-file-coding-system. * mm-bodies.el (mm-decode-body): Set buffer-file-coding-system to last-coding-system-used. @@ -3484,8 +3476,8 @@ 2003-04-05 Kevin Greiner - * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound - print-escape-nonascii to fix more characters in compiled format + * gnus-start.el (gnus-gnus-to-quick-newsrc-format): + Bound print-escape-nonascii to fix more characters in compiled format specs. 2003-04-05 Jesper Harder @@ -3495,8 +3487,8 @@ 2003-04-04 Kevin Greiner - * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound - print-quoted, print-readably, print-escape-multibyte, and + * gnus-start.el (gnus-gnus-to-quick-newsrc-format): + Bound print-quoted, print-readably, print-escape-multibyte, and print-level to match original behavior of gnus-prin1. This should repair the format of .newsrc.eld when using compiled format specs. @@ -3514,7 +3506,7 @@ 2003-04-03 Reiner Steib - * gnus-art.el (gnus-button-ctan-directory-regexp): Changed meaning + * gnus-art.el (gnus-button-ctan-directory-regexp): Change meaning and value. (gnus-button-alist): Use it. @@ -3534,9 +3526,9 @@ 2003-04-02 Reiner Steib - * gnus-util.el (gnus-message): Added doc-string. + * gnus-util.el (gnus-message): Add doc-string. - * gnus-score.el (gnus-score-find-trace): Changed behavior of `q'. + * gnus-score.el (gnus-score-find-trace): Change behavior of `q'. (gnus-score-edit-file-at-point): Goto first match when using `e'. 2003-04-01 Reiner Steib @@ -3551,22 +3543,22 @@ 2003-03-31 Kevin Greiner - * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bound - print-escape-newlines to print escape sequences rather than + * gnus-start.el (gnus-gnus-to-quick-newsrc-format): + Bound print-escape-newlines to print escape sequences rather than literal newline characters. 2003-03-31 Reiner Steib - * gnus-art.el (gnus-button-valid-fqdn-regexp): Use - `message-valid-fqdn-regexp' for initialization. - (gnus-button-handle-info-url): Renamed and extended version of + * gnus-art.el (gnus-button-valid-fqdn-regexp): + Use `message-valid-fqdn-regexp' for initialization. + (gnus-button-handle-info-url): Rename and extended version of `gnus-button-handle-info'. - (gnus-button-message-level): Renamed from `gnus-button-mail-level'. + (gnus-button-message-level): Rename from `gnus-button-mail-level'. (gnus-button-handle-symbol, gnus-button-handle-library) (gnus-button-handle-info-keystrokes): New functions. (gnus-button-browse-level): New variable. (gnus-button-alist): Use them. Added levels. - (gnus-header-button-alist): Added levels. + (gnus-header-button-alist): Add levels. 2003-03-31 Lars Magne Ingebrigtsen @@ -3578,10 +3570,10 @@ 2003-03-31 Lars Magne Ingebrigtsen - * gnus-start.el (gnus-unload): Removed. + * gnus-start.el (gnus-unload): Remove. - * pop3.el (pop3-read-response): Use - nnheader-accept-process-output. + * pop3.el (pop3-read-response): + Use nnheader-accept-process-output. (pop3-retr): Ditto. * mm-view.el (mm-text-html-renderer-alist): Add -nolist to Lynx. @@ -3601,7 +3593,7 @@ * nnheader.el (nnheader-read-timeout): New variable. (nnheader-accept-process-output): New function. - * nntp.el (nntp-read-timeout): Removed. + * nntp.el (nntp-read-timeout): Remove. * gnus-sum.el (gnus-summary-prepare-threads): Add comment. @@ -3622,8 +3614,8 @@ 2003-03-28 Vasily Korytov - * message.el (message-make-in-reply-to): Use - mail-extract-address-components to determine sender's + * message.el (message-make-in-reply-to): + Use mail-extract-address-components to determine sender's name/address. 2003-03-30 Lars Magne Ingebrigtsen @@ -3634,8 +3626,8 @@ valid lambda. (gnus-registry-translate-from-alist): Ditto. - * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind - print-length to nil. + * gnus-start.el (gnus-gnus-to-quick-newsrc-format): + Bind print-length to nil. * gnus-sum.el (gnus-summary-highlight-line-0): Indent. @@ -3658,14 +3650,14 @@ (gnus-registry-translate-from-alist): New functions. (gnus-register-spool-action): Add a spool item to the registry. - * gnus.el (gnus-variable-list): Added gnus-registry-alist to the + * gnus.el (gnus-variable-list): Add gnus-registry-alist to the list of saved variables. (gnus-registry-alist): New variable. 2003-03-28 Andreas Fuchs - * gnus-registry.el (alist-to-hashtable, hashtable-to-alist): New - functions. + * gnus-registry.el (alist-to-hashtable, hashtable-to-alist): + New functions. 2003-03-27 Simon Josefsson @@ -3683,7 +3675,7 @@ 2003-03-26 Kevin Ryde - * gnus-sum.el (gnus-summary-find-for-reselect): Renamed from + * gnus-sum.el (gnus-summary-find-for-reselect): Rename from gnus-summary-find-uncancelled, skip temporary articles inserted by "refer" functions. @@ -3693,7 +3685,7 @@ 2003-03-26 Kevin Greiner - * gnus-agent.el (gnus-agent-fetch-selected-article): Replaced + * gnus-agent.el (gnus-agent-fetch-selected-article): Replace gnus-summary-update-line (which updated the article's face) with gnus-summary-update-download-mark (which updates the article's face by calling gnus-summary-update-line AND updates the download @@ -3717,8 +3709,8 @@ * rfc2047.el (rfc2047-header-encoding-alist): Make Followup-To same as Newsgroups. - * nntp.el (nntp-open-connection-function): Mention - nntp-open-tls-stream. + * nntp.el (nntp-open-connection-function): + Mention nntp-open-tls-stream. (nntp-open-tls-stream): New function. * tls.el: New file. @@ -3769,10 +3761,10 @@ * gnus-int.el (gnus-open-server): Catch errors in backend's open-server method. Returns nil rather than crashing startup. - * gnus-sum.el (eval-when-compile): Modified to resolve + * gnus-sum.el (eval-when-compile): Modify to resolve compile-time warnings. - * gnus-uu.el (gnus-uu-mark-series): Added informative msg. + * gnus-uu.el (gnus-uu-mark-series): Add informative msg. Reports length of series so that the user can compare N with a subject that should, if the entire series is present, contain '(.../N)'. @@ -3801,7 +3793,7 @@ 2003-03-20 Reiner Steib - * message.el (message-check-news-header-syntax): Fixed regexp. + * message.el (message-check-news-header-syntax): Fix regexp. 2003-03-20 ShengHuo ZHU @@ -3860,7 +3852,7 @@ * spam.el (spam-group-ham-mark-p, spam-group-spam-mark-p) (spam-group-ham-marks, spam-group-spam-marks): New functions. - (spam-spam-marks, spam-ham-marks): Removed in favor of the + (spam-spam-marks, spam-ham-marks): Remove in favor of the spam-marks and ham-marks parameters. (spam-generic-register-routine, spam-ham-move-routine): Use the new spam-group-{spam,ham}-mark-p functions. @@ -4030,23 +4022,23 @@ 2003-03-09 Kevin Greiner - * gnus-agent.el (gnus-agent-fetched-hook): New variable. Just - fixing the code to match the documentation. - (gnus-agent-fetch-selected-article): Replaced + * gnus-agent.el (gnus-agent-fetched-hook): New variable. + Just fixing the code to match the documentation. + (gnus-agent-fetch-selected-article): Replace gnus-summary-update-article-line with gnus-summary-update-line as the former did not correctly recalculate the thread indentation. (gnus-agent-find-parameter): The agent-predicate, if not found anywhere else, defaults to the value of gnus-agent-predicate. - (gnus-agent-fetch-session): Fixed typo; now executes + (gnus-agent-fetch-session): Fix typo; now executes gnus-agent-fetched-hook rather than the undocumented gnus-agent-fetch-hook. - (gnus-agent-fetch-group-1): Removed part of 2003-03-06 fix. The - default agent predicate is now provided by + (gnus-agent-fetch-group-1): Remove part of 2003-03-06 fix. + The default agent predicate is now provided by gnus-agent-find-parameter. (gnus-agent-message): New macro. This macro avoids potentially costly parameter evaluation when the message's level is too high to display. - (gnus-agent-expire-group-1): Disabled undo tracking in temp + (gnus-agent-expire-group-1): Disable undo tracking in temp overview buffer. Uses new gnus-agent-message macro to reduce overhead of optional messages. Reversed message levels to emphasize percent completion messages. Detailed messages of @@ -4054,8 +4046,8 @@ 2003-03-08 Teodor Zlatanov - * spam.el (spam-ham-move-routine): Use - spam-mark-ham-unread-before-move-from-spam-group. + * spam.el (spam-ham-move-routine): + Use spam-mark-ham-unread-before-move-from-spam-group. (spam-mark-ham-unread-before-move-from-spam-group): New variable. 2003-03-07 Teodor Zlatanov @@ -4074,7 +4066,7 @@ 2003-03-07 Teodor Zlatanov * spam.el (spam-use-hashcash): New variable. - (spam-list-of-checks): Added spam-use-hashcash with associated + (spam-list-of-checks): Add spam-use-hashcash with associated spam-check-hashcash. (spam-check-hashcash): New function, installed iff hashcash.el is loaded. @@ -4082,7 +4074,7 @@ 2003-03-06 Kevin Greiner - * gnus-agent.el (gnus-agent-fetch-group-1): Added default + * gnus-agent.el (gnus-agent-fetch-group-1): Add default predicate of `false' to avoid an error when a group defines no predicate. Fixed typo that disabled agent scoring (i.e. the low/high predicates should now work). @@ -4091,10 +4083,10 @@ * spam.el: Add spam-maybe-spam-stat-load to gnus-get-top-new-news-hook, remove it from gnus-get-new-news-hook. - (spam-bogofilter-register-with-bogofilter): Use - spam-bogofilter-spam-switch and spam-bogofilter-ham-switch. - (spam-bogofilter-spam-switch, spam-bogofilter-ham-switch): New - custom variables to replace "-s" and "-n". + (spam-bogofilter-register-with-bogofilter): + Use spam-bogofilter-spam-switch and spam-bogofilter-ham-switch. + (spam-bogofilter-spam-switch, spam-bogofilter-ham-switch): + New custom variables to replace "-s" and "-n". * gnus-group.el (gnus-group-get-new-news): Call the new gnus-get-top-new-news-hook hook. @@ -4113,9 +4105,9 @@ 2003-03-06 Kevin Greiner - * gnus-agent.el (gnus-agent-fetch-group-1): Added missing binding + * gnus-agent.el (gnus-agent-fetch-group-1): Add missing binding on gnus-agent-short-article. - (gnus-category-read): Replaced CL function mapcar* with new macro: + (gnus-category-read): Replace CL function mapcar* with new macro: gnus-mapcar. * gnus-util.el (gnus-mapcar): New macro. Generalizes mapcar to support functions that accept multiple parameters. A separate @@ -4144,19 +4136,19 @@ 2003-03-04 Kai Großjohann - * gnus-agent.el (gnus-function-implies-unread-1): Grok - byte-compiled functions. + * gnus-agent.el (gnus-function-implies-unread-1): + Grok byte-compiled functions. 2003-03-04 Kevin Greiner - * gnus-sum.el (gnus-auto-goto-ignores): New variable. Provides - customization between new maneuvering (which permits selecting + * gnus-sum.el (gnus-auto-goto-ignores): New variable. + Provides customization between new maneuvering (which permits selecting undownloaded articles) and old maneuvering (which skipped over undownloaded articles) behaviors. (gnus-summary-find-next): Pass through the unread and subject parameters when calling gnus-summary-find-prev. - (gnus-summary-find-next, gnus-summary-find-prev): Apply - gnus-auto-goto-ignores to filter out unacceptable articles. + (gnus-summary-find-next, gnus-summary-find-prev): + Apply gnus-auto-goto-ignores to filter out unacceptable articles. 2003-03-04 Jesper Harder @@ -4167,8 +4159,8 @@ (mail-source-fetch-webmail): Use read-passwd. * nntp.el (nntp-send-authinfo, nntp-send-nosy-authinfo) - (nntp-open-telnet, nntp-open-via-telnet-and-telnet): Use - read-passwd. + (nntp-open-telnet, nntp-open-via-telnet-and-telnet): + Use read-passwd. * nnwarchive.el (nnwarchive-open-server): Use read-passwd. @@ -4182,14 +4174,14 @@ (sieve-manage-interactive-login): Use read-passwd. * pop3.el (pop3-read-passwd): Remove. - (pop3-movemail, pop3-get-message-count, pop3-apop): Use - read-passwd. + (pop3-movemail, pop3-get-message-count, pop3-apop): + Use read-passwd. * pgg.el (pgg-read-passphrase): Simplify. 2003-03-04 Kevin Greiner - * gnus-agent.el (gnus-agent-mode): Fixed the mode line reports + * gnus-agent.el (gnus-agent-mode): Fix the mode line reports 'plugged' when actually 'unplugged' bug. (gnus-category-read): Ignore nil values when converting an old-format category so that the new-format category will default @@ -4197,8 +4189,8 @@ 2003-03-03 Reiner Steib - * mail-source.el (mail-source-delete-old-incoming-confirm): Fixed - doc-string. + * mail-source.el (mail-source-delete-old-incoming-confirm): + Fix doc-string. 2003-03-03 Jesper Harder @@ -4226,12 +4218,12 @@ 2003-03-03 Reiner Steib * gnus-msg.el (gnus-extended-version): Fix for 'emacs-gnus-config. - (gnus-user-agent): Fixed typo. + (gnus-user-agent): Fix typo. 2003-03-03 Kevin Greiner - * gnus-agent.el (gnus-agent-enable-expiration): Fixed documentation. - (gnus-agent-expire-group-1): Removed invalid (interactive) specifier. + * gnus-agent.el (gnus-agent-enable-expiration): Fix documentation. + (gnus-agent-expire-group-1): Remove invalid (interactive) specifier. 2003-03-03 Lars Magne Ingebrigtsen @@ -4241,8 +4233,8 @@ 2003-03-03 Jesper Harder * gnus-sum.el (gnus-highlight-selected-summary) - (gnus-article-get-xrefs, gnus-summary-show-thread): Use - `gnus-point-at-bol' and `gnus-point-at-eol' instead of + (gnus-article-get-xrefs, gnus-summary-show-thread): + Use `gnus-point-at-bol' and `gnus-point-at-eol' instead of `(progn (beginning-of-line) (point))'. It's shorter, faster, and makes it clear that we don't need the side effect. * gnus-util.el (gnus-delete-line): Do. @@ -4280,8 +4272,8 @@ 2003-03-02 Kevin Greiner - * gnus-agent.el (gnus-agent-enable-expiration): New - variable. Either ENABLE or DISABLE. Sets default behavior for + * gnus-agent.el (gnus-agent-enable-expiration): + New variable. Either ENABLE or DISABLE. Sets default behavior for selecting which groups are expired. (gnus-agent-cat-set-property, gnus-agent-cat-defaccessor, gnus-agent-set-cat-groups): Provides abstract interface for @@ -4289,8 +4281,8 @@ (gnus-agent-add-group, gnus-agent-remove-group, gnus-category-insert-line, gnus-category-edit-predicate, gnus-category-edit-score, gnus-category-edit-groups, - gnus-category-copy, gnus-category-add, gnus-group-category): Use - new agent category abstraction. + gnus-category-copy, gnus-category-add, gnus-group-category): + Use new agent category abstraction. (gnus-agent-find-parameter): New function. Search for agent configuration parameter first in the group's parameters, then its topics (if any), and then the group's category. If not found @@ -4310,11 +4302,11 @@ (gnus-category-write): Writes category file compatible with current, and previous, versions of gnus-agent. (gnus-category-make-function, gnus-category-make-function-1): - Corrected documentation; parameter is predicate NOT category. + Correct documentation; parameter is predicate NOT category. (gnus-predicate-implies-unread): Now works in more cases per the todo comment. - (gnus-function-implies-unread-1): New function. Supports - gnus-predicate-implies-unread. + (gnus-function-implies-unread-1): New function. + Supports gnus-predicate-implies-unread. (gnus-agent-expire-group): Command now provides default of group under point. (gnus-agent-expire-group-1): Obeys new agent-enable-expiration and @@ -4323,12 +4315,12 @@ (gnus-agent-request-article): Now performs its own checks of gnus-agent, gnus-agent-cache, and gnus-plugged rather than assuming that the caller will do them correctly. - (): Added one-time hook to gnus-group-prepare-hook. Detects when + (): Add one-time hook to gnus-group-prepare-hook. Detects when gnus-agent-expire-days is set to an alist. Converts said alist into group parameter so that gnus-agent-expire-days will not be needed. - * gnus-art.el (gnus-request-article-this-buffer): Conditional - checks surrounding gnus-agent-request-article removed; now + * gnus-art.el (gnus-request-article-this-buffer): + Conditional checks surrounding gnus-agent-request-article removed; now performed by gnus-agent-request-article. * gnus-cus.el (gnus-agent-parameters): New variable. List of customizable group/topic parameters that regulate the agent. @@ -4351,8 +4343,8 @@ warnings. (gnus-long-file-names): New function. Isolates platform dependent msdos-long-file-names. - (gnus-save-startup-file-via-temp-buffer): New variable. Provides - option of writing directly to file. Avoids memory exhausted + (gnus-save-startup-file-via-temp-buffer): New variable. + Provides option of writing directly to file. Avoids memory exhausted errors when .newsrc.eld is huge. (gnus-save-newsrc-file): Uses new gnus-save-startup-file-via-temp-buffer. @@ -4419,12 +4411,11 @@ nnimap-split-download-body, we add it to gnus-get-new-news-hook. (spam-list-of-statistical-checks): List of statistical splitter checks. - (spam-split): Added a widen call when a statistical check is - enabled. + (spam-split): Add a widen call when a statistical check is enabled. 2003-02-28 Reiner Steib - * gnus-msg.el (gnus-user-agent): Changed default to + * gnus-msg.el (gnus-user-agent): Change default to 'emacs-gnus-type, renamed 'full. 2003-02-28 ShengHuo ZHU @@ -4444,8 +4435,8 @@ 2003-02-26 Simon Josefsson - * gnus-sum.el (gnus-summary-toggle-header): Run - gnus-article-decode-hook instead of calling a-decode-encoded-words + * gnus-sum.el (gnus-summary-toggle-header): + Run gnus-article-decode-hook instead of calling a-decode-encoded-words directly (the latter is run as part of the former). 2003-02-26 ShengHuo ZHU @@ -4460,13 +4451,13 @@ 2003-02-25 Reiner Steib - * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): Added - compensation for TDMA addresses. + * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): + Add compensation for TDMA addresses. 2003-02-24 Reiner Steib * gnus-msg.el (gnus-user-agent): New variable. - (gnus-version-expose-system): Removed. Obsoleted by + (gnus-version-expose-system): Remove. Obsoleted by `gnus-user-agent'. (gnus-extended-version): Use `gnus-user-agent'. @@ -4478,17 +4469,17 @@ 2003-02-24 Kevin Greiner - * gnus-group.el (gnus-topic-mode-p): Fixed free variable + * gnus-group.el (gnus-topic-mode-p): Fix free variable reference. 2003-02-24 Kevin Greiner - * nnheader.el (nnheader-find-nov-line): Changed midpoint + * nnheader.el (nnheader-find-nov-line): Change midpoint calculation to avoid integer overflow. 2003-02-24 Reiner Steib - * gnus-start.el (gnus-backup-startup-file): Fixed custom type. + * gnus-start.el (gnus-backup-startup-file): Fix custom type. 2003-02-24 Teodor Zlatanov @@ -4528,10 +4519,10 @@ clause of the condition-case statement. Errors connecting to a server no longer terminate gnus. - * gnus-agent.el (gnus-agent-toggle-plugged): Renamed parameter to + * gnus-agent.el (gnus-agent-toggle-plugged): Rename parameter to make its use obvious. Added no-nothing case to avoid opening(closing) servers when already open(closed). - (gnus-agent-while-plugged): Added macro to facilitate internal use + (gnus-agent-while-plugged): Add macro to facilitate internal use of gnus-agent-toggle-plugged. (gnus-agent-fetch-group): Use new gnus-agent-while-plugged to temporarily open servers. @@ -4565,8 +4556,8 @@ 2003-02-20 Reiner Steib - * message.el (message-user-fqdn, message-valid-fqdn-regexp): New - variables. + * message.el (message-user-fqdn, message-valid-fqdn-regexp): + New variables. (message-make-fqdn): Use it. Improved validity check. 2003-02-23 Lars Magne Ingebrigtsen @@ -4592,7 +4583,7 @@ 2003-02-23 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-button-url-regexp): Removed `. + * gnus-art.el (gnus-button-url-regexp): Remove `. 2003-02-23 Max Froumentin @@ -4603,13 +4594,13 @@ * gnus-art.el (gnus-mime-action-on-part): Require a match interactively. - * gnus-start.el (gnus-save-newsrc-file): Use - gnus-backup-startup-file. + * gnus-start.el (gnus-save-newsrc-file): + Use gnus-backup-startup-file. (gnus-backup-startup-file): New variable. 2003-02-22 Lars Magne Ingebrigtsen - * gnus.el (gnus-summary-buffer-name): Moved function here. + * gnus.el (gnus-summary-buffer-name): Move function here. * gnus-draft.el (defun): Remove debug. @@ -4631,8 +4622,8 @@ 2003-02-22 Kai Großjohann - * gnus-agent.el (gnus-agent-get-undownloaded-list): Sort - `gnus-newsgroup-headers'. + * gnus-agent.el (gnus-agent-get-undownloaded-list): + Sort `gnus-newsgroup-headers'. 2003-02-22 Karl Pflästerer @@ -4651,18 +4642,18 @@ just article ID. * gnus-registry.el (gnus-registry-hashtb, gnus-register-action) - (gnus-register-spool-action): Added hashtable of message ID keys + (gnus-register-spool-action): Add hashtable of message ID keys with message motion data. 2003-02-21 Reiner Steib - * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): New - variable, used in `gnus-button-mid-or-mail-heuristic'. + * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): + New variable, used in `gnus-button-mid-or-mail-heuristic'. (gnus-button-mid-or-mail-heuristic): New function derived from Florian Weimer's Perl script. (gnus-button-handle-mid-or-mail): Allow a function instead of 'guess. - (gnus-button-guessed-mid-regexp): Removed. + (gnus-button-guessed-mid-regexp): Remove. 2003-02-20 Katsumi Yamaoka @@ -4700,7 +4691,7 @@ 2003-02-19 Reiner Steib * gnus-cite.el (gnus-cite-unsightly-citation-regexp) - (gnus-cite-parse): Renamed `gnus-unsightly-citation-regexp' to + (gnus-cite-parse): Rename `gnus-unsightly-citation-regexp' to `gnus-cite-unsightly-citation-regexp'. 2003-02-19 Katsumi Yamaoka @@ -4723,8 +4714,8 @@ 2003-02-18 Teodor Zlatanov * spam.el (spam-ham-move-routine) - (spam-mark-spam-as-expired-and-move-routine): Use - gnus-summary-kill-process-mark and gnus-summary-yank-process-mark + (spam-mark-spam-as-expired-and-move-routine): + Use gnus-summary-kill-process-mark and gnus-summary-yank-process-mark around process-mark manipulation on the group. 2003-02-17 Kai Großjohann @@ -4739,8 +4730,8 @@ 2003-02-16 Lars Magne Ingebrigtsen - * nndraft.el (nndraft-request-move-article): Bind - nnmh-allow-delete-final to t. + * nndraft.el (nndraft-request-move-article): + Bind nnmh-allow-delete-final to t. 2003-02-14 ShengHuo ZHU @@ -4821,8 +4812,8 @@ * gnus-art.el (gnus-article-only-boring-p): New. (gnus-article-skip-boring): New. * gnus-cite.el (gnus-article-boring-faces): New. - * gnus-sum.el (gnus-summary-next-page): Use - gnus-article-only-boring-p. + * gnus-sum.el (gnus-summary-next-page): + Use gnus-article-only-boring-p. 2003-02-12 Teodor Zlatanov @@ -4842,7 +4833,7 @@ 2003-02-11 Kevin Greiner - * gnus-agent.el (gnus-summary-set-agent-mark): Added call to + * gnus-agent.el (gnus-summary-set-agent-mark): Add call to gnus-summary-goto-subject as gnus-summary-update-mark operates on the current LINE. (gnus-agent-summary-fetch-group): Minimized the number of times @@ -4868,8 +4859,8 @@ 2003-02-10 Jesper Harder - * mm-util.el (mm-mule-charset-to-mime-charset): Use - sort-coding-systems to prefer utf-8 over utf-16. + * mm-util.el (mm-mule-charset-to-mime-charset): + Use sort-coding-systems to prefer utf-8 over utf-16. 2003-02-09 Kevin Greiner @@ -4880,9 +4871,9 @@ If you don't want to run gnus-agent-expire, don't call it. (gnus-agent-expire): The broken test to disable gnus-agent-expire when g-a-e-d was NOT nil was removed. - (gnus-agent-article-name): Removed unnecessary input test as + (gnus-agent-article-name): Remove unnecessary input test as article IDs are always strings. - (gnus-agent-regenerate-group): Added check to protect against + (gnus-agent-regenerate-group): Add check to protect against servers that generate absurdly long article IDs. Valid IDs are less than 10 digits to avoid overflow errors. Fixed logic error when ensuring that the final article ID is present in the new @@ -4918,8 +4909,8 @@ 2003-02-08 Jesper Harder - * gnus-art.el (gnus-article-refer-article): Use - gnus-replace-in-string. + * gnus-art.el (gnus-article-refer-article): + Use gnus-replace-in-string. * gnus-util.el (gnus-map-function): Remove unneeded let-binding. (gnus-remove-duplicates): Do. @@ -4928,12 +4919,12 @@ * gnus-int.el (gnus-internal-registry-spool-current-method): New variable. - (gnus-request-scan): Set - gnus-internal-registry-spool-current-method to gnus-command-method + (gnus-request-scan): + Set gnus-internal-registry-spool-current-method to gnus-command-method before a request-scan operation. - * gnus-registry.el (regtest-nnmail): Use - gnus-internal-registry-spool-current-method. + * gnus-registry.el (regtest-nnmail): + Use gnus-internal-registry-spool-current-method. 2003-02-07 Lars Magne Ingebrigtsen @@ -4946,7 +4937,7 @@ * gnus-registry.el: New file with examples of using the hooks. - * gnus.el (gnus-registry): Added registry customization group. + * gnus.el (gnus-registry): Add registry customization group. (gnus-group-prefixed-name): Improve function to return full group name optionally. (gnus-group-guess-prefixed-name): Shortcut to @@ -4990,8 +4981,8 @@ 2003-02-07 Simon Josefsson - * mml-sec.el (mml-unsecure-message): Don't use kill-region. Tiny - patch from deskpot@myrealbox.com (Vasily Korytov). + * mml-sec.el (mml-unsecure-message): Don't use kill-region. + Tiny patch from deskpot@myrealbox.com (Vasily Korytov). 2003-02-02 Lars Magne Ingebrigtsen @@ -5000,8 +4991,8 @@ 2003-02-06 Katsumi Yamaoka - * gnus-art.el (gnus-mime-view-part-internally): Bind - buffer-read-only to nil. + * gnus-art.el (gnus-mime-view-part-internally): + Bind buffer-read-only to nil. 2003-02-05 Katsumi Yamaoka @@ -5120,14 +5111,14 @@ * gnus-util.el (gnus-prin1-to-string): Bind print-length and print-level. - * gnus-art.el (article-display-x-face): Removed gray x-face stuff. - (gnus-treat-display-grey-xface): Removed. + * gnus-art.el (article-display-x-face): Remove gray x-face stuff. + (gnus-treat-display-grey-xface): Remove. * gnus-fun.el (gnus-grab-cam-face): New. - (gnus-convert-image-to-gray-x-face): Removed. - (gnus-convert-gray-x-face-to-xpm): Removed. - (gnus-convert-gray-x-face-region): Removed. - (gnus-grab-gray-x-face): Removed. + (gnus-convert-image-to-gray-x-face): Remove. + (gnus-convert-gray-x-face-to-xpm): Remove. + (gnus-convert-gray-x-face-region): Remove. + (gnus-grab-gray-x-face): Remove. * nnmail.el (nnmail-expiry-wait-function): Doc indent. @@ -5179,7 +5170,7 @@ * gnus-fun.el (gnus-face-encode): New function. (gnus-convert-png-to-face): Use it. - * gnus-sum.el (gnus-summary-make-menu-bar): Added M-& to marks. + * gnus-sum.el (gnus-summary-make-menu-bar): Add M-& to marks. 2003-01-26 Jesper Harder @@ -5201,16 +5192,16 @@ * mm-encode.el (mm-qp-or-base64): Always QP iff mm-use-ultra-safe-encoding and cleartext PGP. - * gnus-sum.el (gnus-summary-select-article): Inhibit - redisplay (mainly for secured messages). + * gnus-sum.el (gnus-summary-select-article): + Inhibit redisplay (mainly for secured messages). * nnmail.el (nnmail-article-group): Copy body too (but don't process it). 2003-01-25 Jesper Harder - * gnus-art.el (gnus-article-setup-buffer): Reset - gnus-button-marker-list. + * gnus-art.el (gnus-article-setup-buffer): + Reset gnus-button-marker-list. 2003-01-25 Lars Magne Ingebrigtsen @@ -5219,8 +5210,8 @@ 2003-01-24 Lars Magne Ingebrigtsen - * nnheader.el (nnheader-directory-separator-character): New - variable. + * nnheader.el (nnheader-directory-separator-character): + New variable. 2003-01-24 Kai Großjohann @@ -5257,8 +5248,8 @@ 2003-01-24 Teodor Zlatanov * spam.el (spam-check-blackholes, spam-split) - (spam-mark-junk-as-spam-routine, spam-summary-prepare-exit): Added - gnus-message calls to show to users what spam.el is doing. + (spam-mark-junk-as-spam-routine, spam-summary-prepare-exit): + Add gnus-message calls to show to users what spam.el is doing. 2003-01-24 Jesper Harder @@ -5282,7 +5273,7 @@ * gnus-async.el (gnus-async-wait-for-article): Don't use a timeout. - * nntp.el (nntp-accept-process-output): Removed timeout. + * nntp.el (nntp-accept-process-output): Remove timeout. (nntp-read-timeout): New variable. (nntp-accept-process-output): Use it. @@ -5290,14 +5281,14 @@ 2003-01-23 Kevin Greiner - * gnus-sum.el (gnus-summary-first-subject): Fixed bug that I + * gnus-sum.el (gnus-summary-first-subject): Fix bug that I introduced on 2002-01-22. (gnus-summary-first-unseen-or-unread-subject): Ditto. 2003-01-23 Teodor Zlatanov * spam.el (spam-check-regex-headers, spam-list-of-checks) - (spam-regex-headers-spam, spam-regex-headers-ham): Added spam/ham + (spam-regex-headers-spam, spam-regex-headers-ham): Add spam/ham checks of incoming mail based on simple header regexp matching. 2003-01-22 Teodor Zlatanov @@ -5310,16 +5301,16 @@ gnus-newsgroup-unfetched, the list of articles whose headers have not been fetched from the server. - * gnus-sum.el (gnus-summary-find-next): Removed undownloaded + * gnus-sum.el (gnus-summary-find-next): Remove undownloaded parameter as it never worked due to a bug. Added check to prevent selection of any article in the gnus-newsgroup-unfetched list. - (gnus-summary-find-prev): Added check to prevent selection of any + (gnus-summary-find-prev): Add check to prevent selection of any article in the gnus-newsgroup-unfetched list. - (gnus-summary-first-subject): Documented API. Modified - implementation so that constraints are handled independently. + (gnus-summary-first-subject): Document API. + Modified implementation so that constraints are handled independently. Added check to prevent selection of any article in the gnus-newsgroup-unfetched list. - (gnus-summary-first-unseen-subject): Updated parameters in + (gnus-summary-first-unseen-subject): Update parameters in gnus-summary-first-subject call to match new API. (gnus-summary-first-unseen-or-unread-subject): Ditto. (gnus-summary-catchup): Do not mark unfetched articles as read. @@ -5330,8 +5321,8 @@ make-obsolete-variable allows only two arguments in XEmacs and Emacs 20. - * gnus-sum.el (gnus-summary-wash-hide-map): Remove - gnus-article-hide-pgp. + * gnus-sum.el (gnus-summary-wash-hide-map): + Remove gnus-article-hide-pgp. (gnus-summary-make-menu-bar): Do. * gnus-art.el (gnus-treat-strip-pgp): Make obsolete. @@ -5348,21 +5339,21 @@ 2003-01-21 Teodor Zlatanov - * spam.el (spam-group-ham-processor-bogofilter-p): Fixed bug. - (spam-ifile-register-ham-routine, spam-ifile-ham-category): New - option to make ifile a purely binary classifier. + * spam.el (spam-group-ham-processor-bogofilter-p): Fix bug. + (spam-ifile-register-ham-routine, spam-ifile-ham-category): + New option to make ifile a purely binary classifier. 2003-01-21 Lars Magne Ingebrigtsen - * mml-sec.el (mml-secure-sign-pgpauto): Renamed. - (mml-secure-encrypt-pgpmime): Removed double. + * mml-sec.el (mml-secure-sign-pgpauto): Rename. + (mml-secure-encrypt-pgpmime): Remove double. - * gnus-sum.el (gnus-summary-mark-article-as-replied): Added - debugging statements. + * gnus-sum.el (gnus-summary-mark-article-as-replied): + Add debugging statements. 2003-01-21 Andreas Fuchs - * mml-sec.el (mml-sign-alist): Added pgpauto. + * mml-sec.el (mml-sign-alist): Add pgpauto. 2003-01-21 Lars Magne Ingebrigtsen @@ -5374,7 +5365,7 @@ 2003-01-21 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-button-url-regexp): Removed |. + * gnus-art.el (gnus-button-url-regexp): Remove |. * message.el (message-send-hook): Doc fix. @@ -5394,10 +5385,10 @@ 2003-01-18 Kevin Greiner - * gnus-agent.el (gnus-agent-regenerate-group): Added interactive form. + * gnus-agent.el (gnus-agent-regenerate-group): Add interactive form. - * gnus-sum.el (gnus-summary-update-article-line): Fixed - calculation of net characters added for use in the gnus-data + * gnus-sum.el (gnus-summary-update-article-line): + Fix calculation of net characters added for use in the gnus-data structure. 2003-01-18 Kai Großjohann @@ -5431,8 +5422,8 @@ avoid encoding problems. * mailcap.el (mailcap-ps-command): New variable. - (mailcap-mime-data): Add print entry where applicable. Use - pdftotext on a tty. + (mailcap-mime-data): Add print entry where applicable. + Use pdftotext on a tty. 2003-01-16 ShengHuo ZHU @@ -5449,7 +5440,7 @@ * spam.el (spam-get-article-as-filename): New function (unused for now). (spam-get-article-as-buffer): New function. (spam-get-article-as-string): Use spam-get-article-as-buffer. - (spam-summary-prepare-exit): Fixed bug, noticed by Malcolm Purvis. + (spam-summary-prepare-exit): Fix bug, noticed by Malcolm Purvis. 2003-01-15 ShengHuo ZHU @@ -5500,7 +5491,7 @@ (spam-group-ham-processor-bogofilter-p): New functions for the new Bogofilter interface. (spam-summary-prepare-exit): Use the new Bogofilter functions. - (spam-list-of-checks): Added spam-use-bogofilter-headers. + (spam-list-of-checks): Add spam-use-bogofilter-headers. (spam-bogofilter-score): Rewrote function. (spam-check-bogofilter): Optional score parameter, uses spam-check-bogofilter-headers better. @@ -5546,9 +5537,9 @@ 2003-01-13 Jhair Tocancipa Triana - * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use - /usr/bin/play as default player. - (gnus-audio-play): Added ARG-DESCRIPTOR to prompt for a file to play. + * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): + Use /usr/bin/play as default player. + (gnus-audio-play): Add ARG-DESCRIPTOR to prompt for a file to play. 2003-01-14 Katsumi Yamaoka @@ -5560,7 +5551,7 @@ fictitious headers generated by nnagent (ie. Undownloaded Article ####) in the list of articles that have not been downloaded. - * gnus-int.el (): Added require declarations to resolve + * gnus-int.el (): Add require declarations to resolve compile-time warnings. (gnus-open-server): If the server status is set to offline, recursively execute gnus-open-server to open the offline backend @@ -5568,8 +5559,8 @@ 2003-01-14 Jesper Harder - * gnus-art.el (gnus-article-reply-with-original): Use - gnus-mark-active-p. + * gnus-art.el (gnus-article-reply-with-original): + Use gnus-mark-active-p. (gnus-article-followup-with-original): Do. 2003-01-13 Reiner Steib @@ -5596,8 +5587,8 @@ * deuglify.el (gnus-article-outlook-unwrap-lines) (gnus-article-outlook-repair-attribution) (gnus-article-outlook-rearrange-citation): New function names, - renamed from "gnus-outlook-" to "gnus-article-outlook-". Changed - doc-string. + renamed from "gnus-outlook-" to "gnus-article-outlook-". + Changed doc-string. * gnus-sum.el (gnus-summary-mode-map): Use new function names, removed `W k' key binding (use `W Y f' instead). @@ -5632,7 +5623,7 @@ 2003-01-12 Lars Magne Ingebrigtsen - * mail-source.el (mail-sources): Removed autoload to make it + * mail-source.el (mail-sources): Remove autoload to make it compile under XEmacs. 2003-01-12 Raymond Scholz @@ -5660,8 +5651,8 @@ 2003-01-12 Simon Josefsson - * sieve.el (sieve-upload-and-bury): New. Suggested by - kai.grossjohann@uni-duisburg.de (Kai Großjohann). + * sieve.el (sieve-upload-and-bury): New. + Suggested by kai.grossjohann@uni-duisburg.de (Kai Großjohann). * sieve-mode.el (sieve-mode-map): Bind s-u-a-b to C-c C-c. Suggested by kai.grossjohann@uni-duisburg.de (Kai Großjohann). @@ -5706,8 +5697,8 @@ 2003-01-10 Reiner Steib - * deuglify.el (gnus-outlook-deuglify-attrib-verb-regexp): Added - castellano. + * deuglify.el (gnus-outlook-deuglify-attrib-verb-regexp): + Add castellano. (gnus-outlook-display-hook): New variable. (gnus-outlook-display-article-buffer): New function. (gnus-outlook-unwrap-lines, gnus-outlook-repair-attribution) @@ -5716,8 +5707,8 @@ (gnus-article-outlook-deuglify-article): Use `g-o-d-a-b'. * gnus-sum.el: Added autoloads. - (gnus-summary-mode-map): Added gnus-summary-wash-deuglify-map. - (gnus-summary-make-menu-bar): Added "(Outlook) Deuglify" menu. + (gnus-summary-mode-map): Add gnus-summary-wash-deuglify-map. + (gnus-summary-make-menu-bar): Add "(Outlook) Deuglify" menu. 2003-01-11 Lars Magne Ingebrigtsen @@ -5765,7 +5756,7 @@ * gnus-fun.el (gnus-face-from-file): New function. (gnus-convert-face-to-png): Ditto. - * gnus-art.el (gnus-ignored-headers): Added Face. + * gnus-art.el (gnus-ignored-headers): Add Face. 2003-01-10 Simon Josefsson @@ -5787,13 +5778,13 @@ * spam-stat.el (spam-stat): Typo fix. (spam-stat-install-hooks): New variable. - (spam-stat-split-fancy-spam-group): Added documentation clarification. + (spam-stat-split-fancy-spam-group): Add documentation clarification. (spam-stat-split-fancy-spam-threshhold): New variable. (spam-stat-install-hooks): Make hooks conditional. (spam-stat-split-fancy): Use spam-stat-split-fancy-spam-threshhold. - * gnus.el (gnus-group-ham-exit-processor-stat, spam-process): Add - spam-stat ham/spam processor symbols. + * gnus.el (gnus-group-ham-exit-processor-stat, spam-process): + Add spam-stat ham/spam processor symbols. 2003-01-10 Lars Magne Ingebrigtsen @@ -5811,7 +5802,7 @@ 2003-01-09 Teodor Zlatanov - * spam.el (spam-check-ifile): Fixed call-process-region to use the + * spam.el (spam-check-ifile): Fix call-process-region to use the db parameter only if it's set. (spam-ifile-register-with-ifile): Ditto. @@ -5857,17 +5848,17 @@ * spam.el: Fixed the BBDB autoloads again, using bbdb-search-simple now (which is not a macro, thank god). - * gnus.el (ham-process-destination): Added new parameter for + * gnus.el (ham-process-destination): Add new parameter for destination of ham articles found in spam groups at summary exit. * spam.el (spam-get-ifile-database-parameter): use spam-ifile-database-path. (spam-check-ifile, spam-ifile-register-with-ifile): use spam-get-ifile-database-parameter. - (spam-ifile-database-path): Added new parameter for ifile's database. + (spam-ifile-database-path): Add new parameter for ifile's database. (spam-move-spam-nonspam-groups-only): New parameter to determine if spam should be moved from all groups or only some. - (spam-summary-prepare-exit): Fixed logic to use + (spam-summary-prepare-exit): Fix logic to use spam-move-spam-nonspam-groups-only when deciding to invoke spam-mark-spam-as-expired-and-move-routine; always invoke that routine after the spam has been expired-or-moved in case there's @@ -5879,8 +5870,8 @@ * gnus-spec.el (gnus-parse-complex-format): %~ => ~*. - * gnus-agent.el (gnus-agent-fetch-selected-article): Use - gnus-summary-update-article-line. + * gnus-agent.el (gnus-agent-fetch-selected-article): + Use gnus-summary-update-article-line. 2003-01-08 Simon Josefsson @@ -5889,7 +5880,7 @@ 2003-01-07 Teodor Zlatanov - * spam.el (spam-check-ifile): Fixed the spam-ifile-all-categories + * spam.el (spam-check-ifile): Fix the spam-ifile-all-categories logic, finally. 2003-01-08 Lars Magne Ingebrigtsen @@ -5914,21 +5905,21 @@ * message.el (message-make-mail-followup-to, message-generate-unsubscribed-mail-followup-to): New function names. Renamed functions: "-mft" -> "-mail-followup-to". - (message-make-mft, message-gen-unsubscribed-mft): Removed function + (message-make-mft, message-gen-unsubscribed-mft): Remove function names. * mml.el (mml-preview-insert-mail-followup-to): New function name. - (mml-preview-insert-mft): Removed function name. + (mml-preview-insert-mft): Remove function name. (mml-preview): Use new function names. * gnus-art.el (gnus-article-edit-mode-map): Use new function names. - * message.el (message-mode-field-menu): Moved header related + * message.el (message-mode-field-menu): Move header related commands from "Message" to "Field" menu. 2003-01-07 Reiner Steib - * message.el (message-generate-headers-first): Added customization + * message.el (message-generate-headers-first): Add customization if variable is a list. 2003-01-07 Michael Shields @@ -5940,8 +5931,8 @@ * gnus-msg.el (gnus-debug): Use ignore-errors. - * gnus-agent.el (gnus-agent-fetch-selected-article): Use - `gnus-summary-update-line'. + * gnus-agent.el (gnus-agent-fetch-selected-article): + Use `gnus-summary-update-line'. 2003-01-08 Simon Josefsson @@ -5969,8 +5960,8 @@ 2003-01-07 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-summary-make-menu-bar): Added - gnus-summary-refer-thread to thread menu. + * gnus-sum.el (gnus-summary-make-menu-bar): + Add gnus-summary-refer-thread to thread menu. 2003-01-07 Kevin Greiner @@ -5986,16 +5977,16 @@ * spam.el (spam-check-ifile, spam-ifile-register-with-ifile) (spam-ifile-register-spam-routine) - (spam-ifile-register-ham-routine): Added ifile functionality that + (spam-ifile-register-ham-routine): Add ifile functionality that does not use ifile-gnus.el to classify and register articles. (spam-get-article-as-string): Convenience function. - (spam-summary-prepare-exit): Added ifile spam and ham registration. + (spam-summary-prepare-exit): Add ifile spam and ham registration. (spam-ifile-all-categories, spam-ifile-spam-category) - (spam-ifile-path, spam-ifile): Added customization options. + (spam-ifile-path, spam-ifile): Add customization options. - * gnus.el (gnus-group-ham-exit-processor-ifile): Added ifile ham + * gnus.el (gnus-group-ham-exit-processor-ifile): Add ifile ham exit processor. - (spam-process): Added gnus-group-ham-exit-processor-ifile to the + (spam-process): Add gnus-group-ham-exit-processor-ifile to the list of choices. 2003-01-07 Lars Magne Ingebrigtsen @@ -6005,7 +5996,7 @@ 2003-01-06 Lars Magne Ingebrigtsen - * nnweb.el (nnweb-asynchronous-p): Changed to nil. + * nnweb.el (nnweb-asynchronous-p): Change to nil. 2003-01-07 Simon Josefsson @@ -6033,14 +6024,14 @@ 2003-01-06 Kevin Greiner - * gnus-agent.el (gnus-agent-fetch-group): Modified to permit execution + * gnus-agent.el (gnus-agent-fetch-group): Modify to permit execution in either the group or summary buffer. New command "JS", in summary buffer, will fetch articles per the group's category, predicate, and processable flags. (gnus-agent-summary-fetch-series): Rewritten to call gnus-agent-session-fetch-group once with all articles in the series. - (gnus-agent-summary-fetch-group): Fixed bug and modified code to + (gnus-agent-summary-fetch-group): Fix bug and modified code to return list of fetched articles. (gnus-agent-fetch-articles): Split fetch list into sublists such that the article buffer is only slightly larger than @@ -6055,9 +6046,9 @@ When called in the group buffer, articles that can not be fetched are AUTOMATICALLY MARKED AS READ. - * gnus-sum.el (): Modified eval-when-compile to minimize + * gnus-sum.el (): Modify eval-when-compile to minimize misleading compilation warnings. - (gnus-update-summary-mark-positions): Changed code to use + (gnus-update-summary-mark-positions): Change code to use gnus-undownloaded-mark rather than gnus-downloaded-mark. * nnheader.el (nnheader-insert-nov-file): Do not try to insert an @@ -6071,18 +6062,18 @@ determine the appropriate course of action. Instead, two function implementations are provided and the nntp-report function value is bound to the appropriate implementation. - (nntp-retrieve-data): Moved nntp-report call to end of implementation. + (nntp-retrieve-data): Move nntp-report call to end of implementation. (nntp-with-open-group): Now binds nntp-report's function cell rather than binding gnus-with-open-group-first-pass. Added a condition-case to detect a quit during a nntp command. When the quit occurs, the current connection is closed as a fetch articles request could have several megabytes queued up for reading. - (nntp-retrieve-headers): Bind articles to itself. If - nntp-with-open-group repeats this command, I must have access to + (nntp-retrieve-headers): Bind articles to itself. + If nntp-with-open-group repeats this command, I must have access to the original list of articles. (nntp-retrieve-groups): Ditto for groups. (nntp-retrieve-articles): Ditto for articles. - (*): Replaced nntp-possibly-change-group calls to + (*): Replace nntp-possibly-change-group calls to nntp-with-open-group forms in all, but one, occurrence. (nntp-accept-process-output): Bug fix. Detect when called with null process. @@ -6106,8 +6097,8 @@ * mm-url.el (mm-url-program): Doc fix. - * message.el (message-mode-map): Rebound - message-insert-wide-reply. + * message.el (message-mode-map): + Rebound message-insert-wide-reply. 2003-01-05 Katsumi Yamaoka @@ -6118,9 +6109,9 @@ * spam.el: Fixed line lengths to 80 chars or less. - * gnus-sum.el (gnus-read-mark-p): Added the spam-mark as a + * gnus-sum.el (gnus-read-mark-p): Add the spam-mark as a "not-read" mark. - (gnus-summary-mark-forward): Added the spam-mark to the list of + (gnus-summary-mark-forward): Add the spam-mark to the list of marks not to be marked as "read" when viewed. 2003-01-05 Lars Magne Ingebrigtsen @@ -6170,8 +6161,8 @@ 2003-01-04 Kevin Ryde - * gnus-art.el (gnus-mime-jka-compr-maybe-uncompress): New - function. + * gnus-art.el (gnus-mime-jka-compr-maybe-uncompress): + New function. 2003-01-04 Lars Magne Ingebrigtsen @@ -6215,7 +6206,7 @@ (spam-generic-register-routine, spam-BBDB-register-routine) (spam-ifile-register-routine, spam-blacklist-register-routine) (spam-whitelist-register-routine): New functions. - (spam-summary-prepare-exit): Added summary exit processing (expire + (spam-summary-prepare-exit): Add summary exit processing (expire or move) of spam-marked articles for spam groups; added slots for all the spam-*-register-routine functions. @@ -6254,8 +6245,8 @@ 2003-01-02 Jesper Harder - * gnus-group.el (gnus-group-fetch-charter): Use - http://TLH.news-admin.org/charters/GROUPNAME as a fallback. + * gnus-group.el (gnus-group-fetch-charter): + Use http://TLH.news-admin.org/charters/GROUPNAME as a fallback. 2003-01-02 Lars Magne Ingebrigtsen @@ -6316,13 +6307,13 @@ * gnus.el (nnheader): Require nnheader. - * nndraft.el (nndraft-request-associate-buffer): Use - make-local-variable. + * nndraft.el (nndraft-request-associate-buffer): + Use make-local-variable. 2003-01-02 Michael Shields - * nndraft.el (nndraft-request-associate-buffer): Make - write-contents-hooks buffer-local before setting it. + * nndraft.el (nndraft-request-associate-buffer): + Make write-contents-hooks buffer-local before setting it. 2003-01-02 Lars Magne Ingebrigtsen @@ -6344,11 +6335,11 @@ 2003-01-01 Teodor Zlatanov - * spam.el (spam-summary-prepare-exit): Added slots for spam- and + * spam.el (spam-summary-prepare-exit): Add slots for spam- and ham-processing of articles; use the new spam-group-(spam|ham)-contents-p functions. - (spam-group-spam-contents-p, spam-group-ham-contents-p): New - convenience functions. + (spam-group-spam-contents-p, spam-group-ham-contents-p): + New convenience functions. (spam-mark-junk-as-spam-routine): Use the new spam-group-spam-contents-p function. @@ -6360,13 +6351,13 @@ (gnus-group-spam-exit-processor-whitelist) (gnus-group-spam-exit-processor-BBDB) (gnus-group-spam-classification-spam) - (gnus-group-spam-classification-ham): Added new symbols for the + (gnus-group-spam-classification-ham): Add new symbols for the spam-process and spam-contents parameters. - * spam.el (spam-ham-marks, spam-spam-marks): Changed list + * spam.el (spam-ham-marks, spam-spam-marks): Change list customization and list itself to store mark symbol rather than mark character. - (spam-bogofilter-register-routine): Added logic to generate mark + (spam-bogofilter-register-routine): Add logic to generate mark values list from spam-ham-marks and spam-spam-marks, so (member) would work. @@ -6376,10 +6367,10 @@ 2003-01-01 Teodor Zlatanov - * spam.el (spam-ham-marks, spam-spam-marks): Changed list + * spam.el (spam-ham-marks, spam-spam-marks): Change list customization and list itself to store mark symbol rather than mark character. - (spam-bogofilter-register-routine): Added logic to generate mark + (spam-bogofilter-register-routine): Add logic to generate mark values list from spam-ham-marks and spam-spam-marks, so (member) would work. @@ -6396,16 +6387,16 @@ message-cross-post-note-function): New variables names. (message-xpost-old-target, message-xpost-default, message-xpost-note, message-fup2-note, - message-xpost-note-function): Removed variable names. + message-xpost-note-function): Remove variable names. (message-cross-post-followup-to-header, message-cross-post-insert-note, message-cross-post-followup-to): New function names. (message-xpost-fup2-header, message-xpost-insert-note, - message-xpost-fup2): Removed function names. + message-xpost-fup2): Remove function names. 2002-12-30 Reiner Steib - * message.el (message-send-mail): Added message-cleanup-headers to + * message.el (message-send-mail): Add message-cleanup-headers to prevent newlines in headers. 2003-01-01 Lars Magne Ingebrigtsen @@ -6417,8 +6408,8 @@ 2003-01-01 Wes Hardaker - * gnus-sum.el (gnus-summary-display-while-building): New - variable. + * gnus-sum.el (gnus-summary-display-while-building): + New variable. 2003-01-01 Raymond Scholz @@ -6435,8 +6426,8 @@ lambda form. (message-draft-headers): New variable. - * gnus-msg.el (gnus-inews-make-draft-meta-information): New - function. + * gnus-msg.el (gnus-inews-make-draft-meta-information): + New function. (gnus-setup-message): Use it. * message.el (message-generate-headers-first): Doc fix. @@ -6455,8 +6446,8 @@ 2002-12-31 Raymond Scholz - * deuglify.el (gnus-outlook-rearrange-article): Use - `transpose-regions' instead of tempering the kill-ring. + * deuglify.el (gnus-outlook-rearrange-article): + Use `transpose-regions' instead of tempering the kill-ring. (gnus-article-outlook-deuglify-article): Rehighlight article instead of a complete redisplay. @@ -6515,7 +6506,7 @@ 2002-12-30 Reiner Steib - * message.el (message-completion-alist): Added "Mail-Followup-To" + * message.el (message-completion-alist): Add "Mail-Followup-To" and "Mail-Copies-To". 2002-07-21 Jesper Harder @@ -6528,10 +6519,10 @@ * spam.el (spam-use-dig): New variable for blackhole checking through dig.el. - (spam-check-blackholes): Added dig.el checking functionality and + (spam-check-blackholes): Add dig.el checking functionality and more verbose reporting; query-dig is autoloaded from dig.el. (spam-use-blackholes): Disabled by default. - (spam-blackhole-servers): Removed rbl.maps.vix.com from the + (spam-blackhole-servers): Remove rbl.maps.vix.com from the blackhole servers list. 2002-12-30 Lars Magne Ingebrigtsen @@ -6555,7 +6546,7 @@ 2002-08-10 Jari Aalto - * nnmail.el (nnmail-split-it): Added tracing to + * nnmail.el (nnmail-split-it): Add tracing to `:' split rule. 2002-08-13 Hrvoje Niksic @@ -6581,7 +6572,7 @@ * gnus-topic.el (gnus-topic-display-missing-topic): New function. (gnus-topic-goto-missing-group): Use it. - * message.el (message-required-news-headers): Removed Lines. + * message.el (message-required-news-headers): Remove Lines. (message-reply): Don't insert References first. (message-followup): Ditto. (message-make-references): New function. @@ -6702,7 +6693,7 @@ 2002-12-12 Kevin Greiner - * gnus-agent.el (gnus-agent-fetch-selected-article): Added call to + * gnus-agent.el (gnus-agent-fetch-selected-article): Add call to gnus-summary-update-download-mark to update the article in the summary. @@ -6712,14 +6703,14 @@ gnus-summary-normal-uncached-face, gnus-summary-low-uncached-face) New faces. - * gnus-agent.el (gnus-agent-downloaded-article-face): REMOVED. I - added this on 2002-11-23 but it just wasn't working out as + * gnus-agent.el (gnus-agent-downloaded-article-face): REMOVED. + I added this on 2002-11-23 but it just wasn't working out as intended. The idea isn't entirely dead, three new faces gnus-summary-*-uncached-face are being added to gnus.el to provide the basis for an improved implementation. - (gnus-agent-read-servers): Undo the change made on 2002-11-23. The - proper file to open is lib/servers. - (gnus-summary-set-agent-mark): Expanded documentation. Unmarking + (gnus-agent-read-servers): Undo the change made on 2002-11-23. + The proper file to open is lib/servers. + (gnus-summary-set-agent-mark): Expand documentation. Unmarking (i.e. removing the article from gnus-newsgroup-downloadable) will now restore the article's default mark rather than simply setting no mark. @@ -6730,8 +6721,8 @@ (gnus-agent-summary-fetch-group): Keep gnus-newsgroup-undownloaded up to date. Call new gnus-summary-update-download-mark to keep summary buffer up-to-date. - (gnus-agent-fetch-selected-article): Keep - gnus-newsgroup-undownloaded up to date. + (gnus-agent-fetch-selected-article): + Keep gnus-newsgroup-undownloaded up to date. (gnus-agent-fetch-articles): Return list of articles that were successfully fetched. (gnus-agent-check-overview-buffer): No more thingatpt. @@ -6749,14 +6740,14 @@ downloaded/undownloaded mark is no longer stored as the article's mark. - * gnus-salt.el (gnus-tree-highlight-node): Added uncached as + * gnus-salt.el (gnus-tree-highlight-node): Add uncached as gnus-summary-highlight may use it. Added downloaded as gnus-summary-highlight was using it. - * gnus-sum.el (gnus-undownloaded-mark): Changed from ?@ to ?- as + * gnus-sum.el (gnus-undownloaded-mark): Change from ?@ to ?- as the download mark now follows Kai's +/- convention. - (gnus-downloaded-mark): Added ?+ mark. - (gnus-summary-highlight): Added rules to select + (gnus-downloaded-mark): Add ?+ mark. + (gnus-summary-highlight): Add rules to select gnus-summary-high-uncached-face, gnus-summary-normal-uncached-face, and gnus-summary-low-uncached-face. Removed the @@ -6770,7 +6761,7 @@ you don't have to agentize every server that you use. (gnus-update-summary-mark-positions): Completed support for the download type of mark. - (gnus-summary-insert-line): Added undownloaded to the parameters. + (gnus-summary-insert-line): Add undownloaded to the parameters. (gnus-summary-prepare-threads): Set gnus-tmp-downloaded for reference by the gnus-summary-line-format-spec. @@ -6816,8 +6807,8 @@ 2002-12-09 Kai Großjohann - * nntp.el (nntp-send-command): Braino in last commit. Replace - `and' with `or'. + * nntp.el (nntp-send-command): Braino in last commit. + Replace `and' with `or'. 2002-12-08 Kai Großjohann @@ -6850,7 +6841,7 @@ 2002-11-29 Kai Großjohann - * gnus-art.el (gnus-inhibit-mime-unbuttonizing): Moved here from + * gnus-art.el (gnus-inhibit-mime-unbuttonizing): Move here from gnus-sum. Made into a user option. * gnus-sum.el (gnus-simplify-ignored-prefixes) @@ -6911,7 +6902,7 @@ (gnus-summary-mark-article-as-unread) (gnus-mark-article-as-unread, gnus-summary-highlight-line): Reformatting to avoid long lines. - (gnus-inhibit-mime-unbuttonizing): Moved to gnus-art. + (gnus-inhibit-mime-unbuttonizing): Move to gnus-art. 2002-11-28 Daiki Ueno @@ -6933,15 +6924,15 @@ 2002-11-26 ShengHuo ZHU - * gnus-agent.el (gnus-agent-uncached-articles): If - gnus-agent-load-alist fails, return ARTICLES. + * gnus-agent.el (gnus-agent-uncached-articles): + If gnus-agent-load-alist fails, return ARTICLES. * nnrss.el (nnrss-group-alist): Update the link of Jabber. 2002-11-26 Kai Großjohann - * gnus-sum.el (gnus-summary-insert-old-articles): Remove - superfluous function call. + * gnus-sum.el (gnus-summary-insert-old-articles): + Remove superfluous function call. (gnus-summary-catchup-all, gnus-summary-catchup-all-and-exit): Add warning to docstring. @@ -6952,8 +6943,8 @@ 2002-11-26 Kai Großjohann - * gnus-agent.el (gnus-agent-check-overview-buffer): Explicitly - require thingatpt (for number-at-point) and protect against + * gnus-agent.el (gnus-agent-check-overview-buffer): + Explicitly require thingatpt (for number-at-point) and protect against deactivate-mark being unbound (on XEmacs). 2002-11-25 Kai Großjohann @@ -6968,8 +6959,8 @@ 2002-11-24 Kai Großjohann - * gnus-sum.el (gnus-summary-insert-old-articles): Use - gnus-remove-from-range instead of gnus-range-difference which + * gnus-sum.el (gnus-summary-insert-old-articles): + Use gnus-remove-from-range instead of gnus-range-difference which doesn't exist. 2002-11-23 Kevin Greiner @@ -6979,11 +6970,11 @@ (gnus-agent-article-alist): Format change. Add documentation. (gnus-agent-summary-mode-map): New keybinding `J s' for fetching process-marked articles. - (gnus-agent-summary-fetch-series): Command for `J s'. Articles - in the series are individually fetched to minimize lose of + (gnus-agent-summary-fetch-series): Command for `J s'. + Articles in the series are individually fetched to minimize lose of content due to an error/quit. - (gnus-agent-synchronize-flags-server, gnus-agent-add-server): Use - gnus-message instead of message. + (gnus-agent-synchronize-flags-server, gnus-agent-add-server): + Use gnus-message instead of message. (gnus-agent-read-servers): Use file lib/methods instead of lib/servers. TODO: Why? (gnus-summary-set-agent-mark): Adapt to new agent-alist format. @@ -6992,7 +6983,7 @@ (gnus-agent-fetch-selected-article): Don't use history. (gnus-agent-save-history, gnus-agent-enter-history) (gnus-agent-article-in-history-p, gnus-agent-history-path): - Removed function; history is not used anymore. + Remove function; history is not used anymore. (gnus-agent-fetch-articles): Fix handling of crossposted articles. (gnus-agent-crosspost): Started rewrite then realized that a typo in gnus-agent-fetch-articles ensures that this function is never @@ -7022,8 +7013,8 @@ (gnus-agent-regenerate-group): No longer needs to be called from gnus-agent-regenerate. Individual groups may be regenerated. The regeneration code now fixes duplicate, and mis-ordered, NOV entries. - The article fetch dates are validated in the article alist. The - article alist is pruned of entries that do not reference existing + The article fetch dates are validated in the article alist. + The article alist is pruned of entries that do not reference existing NOV entries. All changes are computed then applied with inhibit-quit bound to t. As a result, it is now safe to quit out of regeneration. The optional clean parameter has been replaced with @@ -7031,11 +7022,11 @@ regeneration gets the appropriate setting from gnus-agent-consider-all-articles. The new reread parameter will result in fetched, or all, articles being marked as unread. - (gnus-agent-regenerate): Removed code to regenerate the history + (gnus-agent-regenerate): Remove code to regenerate the history file as it is no longer used. - * gnus-start.el (gnus-make-ascending-articles-unread): New - function, for efficient mass-marking. + * gnus-start.el (gnus-make-ascending-articles-unread): + New function, for efficient mass-marking. * gnus-sum.el (gnus-summary-highlight): Use new face for downloaded articles. @@ -7045,7 +7036,7 @@ line. (gnus-summary-highlight-line): Use new face for downloaded articles. - (gnus-summary-insert-old-articles): Improved performance by + (gnus-summary-insert-old-articles): Improve performance by replacing the initial LIST of older articles with a compressed RANGE of older articles. Some servers appear to lie about their active range so the original list could contain millions @@ -7069,8 +7060,8 @@ 2002-11-19 Simon Josefsson - * gnus-sum.el (gnus-summary-morse-message): Load - morse.el (unmorse-region not autoloaded in Emacs 20 nor XEmacs). + * gnus-sum.el (gnus-summary-morse-message): + Load morse.el (unmorse-region not autoloaded in Emacs 20 nor XEmacs). (unmorse-region): Autoload it instead. 2002-11-18 Simon Josefsson @@ -7097,13 +7088,13 @@ 2002-11-17 ShengHuo ZHU - * message.el (message-set-auto-save-file-name): Use - make-directory, to avoid the dependence on gnus-util. + * message.el (message-set-auto-save-file-name): + Use make-directory, to avoid the dependence on gnus-util. 2002-11-16 Simon Josefsson * nnimap.el (nnimap-callback-callback-function): - (nnimap-callback-buffer): Removed, these cannot be global but must + (nnimap-callback-buffer): Remove, these cannot be global but must be embedded into the callback. (nnimap-make-callback): New. Embedd article number, callback and buffer in function. @@ -7119,8 +7110,8 @@ 2002-11-11 Simon Josefsson - * pgg.el (pgg-encrypt, pgg-decrypt, pgg-sign, pgg-verify): Display - output when called interactively. + * pgg.el (pgg-encrypt, pgg-decrypt, pgg-sign, pgg-verify): + Display output when called interactively. 2002-11-08 Katsumi Yamaoka @@ -7201,15 +7192,15 @@ works better. (gnus-agent-fetch-headers): New implementation from Kevin Greiner. Uses gnus-agent-article-alist to store information - about fetched messages which aren't on the server anymore. The - trick is to return a list of considered messages to the caller, + about fetched messages which aren't on the server anymore. + The trick is to return a list of considered messages to the caller, but to only fetch those which haven't been fetched yet. 2002-10-30 Simon Josefsson * pgg-def.el (pgg-passphrase-cache-expiry): New, defcustom. - * pgg.el (pgg-passphrase-cache-expiry): Removed. + * pgg.el (pgg-passphrase-cache-expiry): Remove. 2002-10-30 TSUCHIYA Masatoshi @@ -7217,14 +7208,14 @@ versions of emacs-w3m than 1.3.3. * mm-view.el (mm-w3m-mode-command-alist) - (mm-w3m-mode-dont-bind-keys, mm-w3m-mode-ignored-keys): Removed. + (mm-w3m-mode-dont-bind-keys, mm-w3m-mode-ignored-keys): Remove. (mm-w3m-mode-map): Undefined for Emacs21 and XEmacs. - (mm-setup-w3m): Simplified. + (mm-setup-w3m): Simplify. (mm-w3m-local-map-property): New function. (mm-inline-text-html-render-with-w3m): Use it. - * gnus-art.el (gnus-article-wash-html-with-w3m): Use - mm-w3m-local-map-property. + * gnus-art.el (gnus-article-wash-html-with-w3m): + Use mm-w3m-local-map-property. 2002-10-29 Katsumi Yamaoka @@ -7240,7 +7231,7 @@ 2002-10-28 Josh Huber - * mml.el (mml-mode-map): Fixed keybindings for mml-secure-* + * mml.el (mml-mode-map): Fix keybindings for mml-secure-* functions. 2002-10-28 Mark A. Hershberger @@ -7256,8 +7247,8 @@ 2002-10-25 Kai Großjohann - * gnus-agent.el (gnus-agent-save-fetched-headers): Create - directory if it doesn't exist. + * gnus-agent.el (gnus-agent-save-fetched-headers): + Create directory if it doesn't exist. (gnus-agent-fetch-headers): Remove old cruft that tried to abstain from downloading articles more than once if gnus-agent-consider-all-articles was true. This is now done @@ -7289,8 +7280,8 @@ * gnus-agent.el (gnus-agent-fetched-headers): New variable, contains range of headers that have been fetched by the agent already. Compare gnus-agent-article-alist. - (gnus-agent-file-header-cache): Like - gnus-agent-file-loading-cache, but for gnus-agent-fetched-headers. + (gnus-agent-file-header-cache): + Like gnus-agent-file-loading-cache, but for gnus-agent-fetched-headers. (gnus-agent-fetch-headers): Improve comment. Revert to old seen/recent logic. Remember which headers have been fetched before and don't fetch @@ -7351,7 +7342,7 @@ * gnus-group.el (gnus-fetch-group): Allow an optional specification of the articles to select. - * gnus-srvr.el (gnus-server-prepare): Removed superfluous cdr. + * gnus-srvr.el (gnus-server-prepare): Remove superfluous cdr. 2002-10-20 Kai Großjohann @@ -7363,8 +7354,8 @@ 2002-10-20 Steve Youngs - * pgg-parse.el (pgg-parse-public-key-algorithm-alist): XEmacs - doesn't have the 'alist custom type, use cons cells instead. + * pgg-parse.el (pgg-parse-public-key-algorithm-alist): + XEmacs doesn't have the 'alist custom type, use cons cells instead. (pgg-parse-symmetric-key-algorithm-alist): Ditto. (pgg-parse-hash-algorithm-alist): Ditto. (pgg-parse-compression-algorithm-alist): Ditto. @@ -7441,8 +7432,8 @@ (nnheader-remove-cr-followed-by-lf): New function. (nnheader-ms-strip-cr): Use the above function. - * gnus-agent.el (gnus-agent-regenerate-group): Call - `nnheader-remove-body'; use `nnheader-parse-naked-head' instead of + * gnus-agent.el (gnus-agent-regenerate-group): + Call `nnheader-remove-body'; use `nnheader-parse-naked-head' instead of `nnheader-parse-head'. * gnus-cache.el (gnus-cache-possibly-enter-article): Ditto. @@ -7463,8 +7454,8 @@ 2002-10-16 Katsumi Yamaoka * spam-stat.el: Check for the existence of hash functions instead - of the Emacs version to decide whether to load cl. Suggested by - Kai Großjohann. + of the Emacs version to decide whether to load cl. + Suggested by Kai Großjohann. 2002-10-15 Kai Großjohann @@ -7487,7 +7478,7 @@ 2002-10-11 Teodor Zlatanov - * spam.el (spam-check-ifile): Added ifile as a spam checking + * spam.el (spam-check-ifile): Add ifile as a spam checking backend, and spam-use-ifle as the variable to toggle that check. 2002-10-12 Simon Josefsson @@ -7526,7 +7517,7 @@ * mml2015.el (mml2015-pgg-decrypt): Set gnus details even when decrypt failed. - (mml2015-trust-boundaries-alist): Removed. + (mml2015-trust-boundaries-alist): Remove. (mml2015-gpg-extract-signature-details): Don't use it. (mml2015-unabbrev-trust-alist): New. (mml2015-gpg-extract-signature-details): Use it. @@ -7547,8 +7538,8 @@ * pgg-gpg.el (pgg-gpg-verify-region): Filter out stuff into output buffer and error buffer depending on type of information. - * mml2015.el (mml2015-gpg-extract-signature-details): Parse - --status-fd stuff even if gpg.el is not used (revert earlier + * mml2015.el (mml2015-gpg-extract-signature-details): + Parse --status-fd stuff even if gpg.el is not used (revert earlier change). (mml2015-pgg-{clear-,}verify): Store both output and errors as gnus details. @@ -7594,8 +7585,8 @@ 2002-10-08 Kai Großjohann - * gnus-agent.el (gnus-agent-fetch-selected-article): Bind - gnus-agent-current-history. + * gnus-agent.el (gnus-agent-fetch-selected-article): + Bind gnus-agent-current-history. 2002-10-06 Simon Josefsson @@ -7623,8 +7614,8 @@ * pgg-gpg.el (pgg-gpg-encrypt-region): Make signencrypt work. - * pgg-pgp.el (pgg-pgp-verify-region): Inline - binary-write-decoded-region from MEL. + * pgg-pgp.el (pgg-pgp-verify-region): + Inline binary-write-decoded-region from MEL. * pgg.el (pgg-encrypt-region): Support sign. @@ -7679,13 +7670,13 @@ (pgg-string-as-unibyte): Defalias. (pgg-parse-armor-region): Use it. - * pgg-gpg.el (pgg-gpg-process-region): Use - pgg-temporary-file-directory. + * pgg-gpg.el (pgg-gpg-process-region): + Use pgg-temporary-file-directory. * luna.el: Don't def-edebug. - * pgg-pgp5.el (pgg-scheme-verify-region): Inline - binary-write-decoded-region from MEL. + * pgg-pgp5.el (pgg-scheme-verify-region): + Inline binary-write-decoded-region from MEL. * pgg-pgp5.el, pgg-gpg.el: Don't require mel. @@ -7790,8 +7781,8 @@ * gnus-art.el (gnus-article-mode-syntax-table): Make M-. work in article buffers. - * nnimap.el (nnimap-fixup-unread-after-getting-new-news): Autoload - it just in case. + * nnimap.el (nnimap-fixup-unread-after-getting-new-news): + Autoload it just in case. (nnimap-update-unseen): New function; update unseen count in `n-m-info'. (nnimap-close-group): Call it. @@ -7924,8 +7915,8 @@ * gnus-art.el (gnus-button-handle-apropos-variable): Fall back to apropos if apropos-variable does not exist. (gnus-button-guessed-mid-regexp) - (gnus-button-handle-describe-prefix, gnus-button-alist): Better - regexes. + (gnus-button-handle-describe-prefix, gnus-button-alist): + Better regexes. (gnus-button-handle-describe-function) (gnus-button-handle-describe-variable): Doc fix. (gnus-button-handle-describe-key, gnus-button-handle-apropos) @@ -7960,8 +7951,8 @@ 2002-09-23 Reiner Steib - * gnus-art.el (gnus-button-guessed-mid-regexp): Improved regexp. - (gnus-button-alist): Improved regexp for + * gnus-art.el (gnus-button-guessed-mid-regexp): Improve regexp. + (gnus-button-alist): Improve regexp for gnus-button-handle-mid-or-mail (false positives), fixed gnus-button-handle-man entries. @@ -7972,8 +7963,8 @@ 2002-09-23 Paul Jarc - * nnmaildir.el: Store article numbers persistently. General - revision. + * nnmaildir.el: Store article numbers persistently. + General revision. (nnmaildir-request-expire-articles): Handle 'immediate and 'never for nnmail-expiry-wait; delete instead of moving if 'force is given. @@ -8015,8 +8006,8 @@ * gnus-msg.el (gnus-configure-posting-styles): Sort results. - * gnus-art.el (gnus-article-reply-with-original): Correct - with-current-buffer scope. + * gnus-art.el (gnus-article-reply-with-original): + Correct with-current-buffer scope. * message.el (message-completion-alist): Add Reply-To, From, etc. @@ -8043,7 +8034,7 @@ describtion and menu. (message-change-subject, message-xpost-fup2): Signal error if current header is empty. - (message-xpost-insert-note): Changed insert position. + (message-xpost-insert-note): Change insert position. (message-archive-note): Ensure to insert note in message body (not in head). (message-archive-header, message-archive-note) @@ -8056,7 +8047,7 @@ (message-subject-trailing-was-query) (message-subject-trailing-was-ask-regexp) (message-subject-trailing-was-regexp): New variables. - (message-to-list-only): Added doc-string and menu entry. + (message-to-list-only): Add doc-string and menu entry. * message-utils.el: Removed. Functions are now in message.el. @@ -8177,8 +8168,8 @@ 2002-09-03 Katsumi Yamaoka - * gnus-util.el (gnus-frame-or-window-display-name): Exclude - invalid display names. + * gnus-util.el (gnus-frame-or-window-display-name): + Exclude invalid display names. 2002-08-30 Reiner Steib @@ -8220,8 +8211,8 @@ 2002-08-27 Simon Josefsson - * gnus-msg.el (posting-charset-alist): Use - gnus-define-group-parameter instead of defcustom. + * gnus-msg.el (posting-charset-alist): + Use gnus-define-group-parameter instead of defcustom. (gnus-put-message): Handle SPC in GCC. (gnus-inews-insert-gcc): Ditto. (gnus-inews-insert-archive-gcc): Ditto. @@ -8326,12 +8317,12 @@ 2002-08-11 Reiner Steib * message-utils.el (message-xpost-default) - (message-xpost-fup2-header, message-xpost-fup2): Fixed Typos. + (message-xpost-fup2-header, message-xpost-fup2): Fix Typos. 2002-08-09 Simon Josefsson - * message.el (message-canlock-password): Set - canlock-password-for-verify to newly generated canlock-password. + * message.el (message-canlock-password): + Set canlock-password-for-verify to newly generated canlock-password. When Emacs is restarted, Custom makes sure this is set, but during the same session we must set it manually. @@ -8389,7 +8380,7 @@ * nnweb.el (nnweb-type, nnweb-type-definition) (nnweb-gmane-create-mapping, nnweb-gmane-wash-article) - (nnweb-gmane-search, nnweb-gmane-identity): Added gmane + (nnweb-gmane-search, nnweb-gmane-identity): Add gmane functionality. * nnweb.el: Removed old non-functioning search engines. @@ -8401,8 +8392,8 @@ * flow-fill.el (fill-flowed): Disable filladapt-mode. - * gnus-sieve.el (gnus-sieve-guess-rule-for-article): Don't - regexp-quote, Cyrus Sieve is fixed. + * gnus-sieve.el (gnus-sieve-guess-rule-for-article): + Don't regexp-quote, Cyrus Sieve is fixed. * sieve-manage.el (sieve-manage-deletescript): New function. @@ -8420,13 +8411,13 @@ * mm-decode.el (mm-inline-text-html-with-images): Doc fix. (mm-w3m-safe-url-regexp): New user option. - * mm-view.el (mm-inline-text-html-render-with-w3m): Use - `mm-w3m-safe-url-regexp' to bind `w3m-safe-url-regexp'. + * mm-view.el (mm-inline-text-html-render-with-w3m): + Use `mm-w3m-safe-url-regexp' to bind `w3m-safe-url-regexp'. 2002-07-23 Karl Kleinpaste - * gnus-sum.el (gnus-summary-delete-article): Force - nnmail-expiry-target to 'delete, so that absolute deletion + * gnus-sum.el (gnus-summary-delete-article): + Force nnmail-expiry-target to 'delete, so that absolute deletion happens when absolute deletion is requested. 2002-07-21 Nevin Kapur @@ -8487,8 +8478,8 @@ 2002-07-06 ShengHuo ZHU - * gnus-topic.el (gnus-topic-indent, gnus-topic-unindent): Change - cdaar to cdar and car. + * gnus-topic.el (gnus-topic-indent, gnus-topic-unindent): + Change cdaar to cdar and car. * nnsoup.el (nnsoup-retrieve-headers, nnsoup-request-type) (nnsoup-read-active-file, nnsoup-article-to-area): Ditto. @@ -8574,8 +8565,8 @@ 2002-06-17 Simon Josefsson - * gnus-start.el (gnus-clear-system, gnus-read-newsrc-file): Make - sure to write byte-compiled versions of gnus-*-format-alist to + * gnus-start.el (gnus-clear-system, gnus-read-newsrc-file): + Make sure to write byte-compiled versions of gnus-*-format-alist to .newsrc.eld. 2002-06-16 Bjørn Mork @@ -8594,7 +8585,7 @@ * nnheader.el (nnheader-file-name-translation-alist): Set the default value for MS Windows systems. - * gnus-ems.el (nnheader-file-name-translation-alist): Removed. + * gnus-ems.el (nnheader-file-name-translation-alist): Remove. 2002-06-14 Katsumi Yamaoka @@ -8660,8 +8651,8 @@ * gnus-msg.el (gnus-group-mail, gnus-group-news) (gnus-group-post-news, gnus-summary-mail-other-window) - (gnus-summary-news-other-window, gnus-summary-post-news): Bind - gnus-article-copy to nil, thereby inhibiting the `header' posting + (gnus-summary-news-other-window, gnus-summary-post-news): + Bind gnus-article-copy to nil, thereby inhibiting the `header' posting style match to use data from last viewed article. Suggested by Hrvoje Niksic. @@ -8753,8 +8744,8 @@ 2002-05-20 Jason Baker (tiny change) - * gnus-art.el (gnus-request-article-this-buffer): Try - reconnecting if you don't get the message. + * gnus-art.el (gnus-request-article-this-buffer): + Try reconnecting if you don't get the message. 2002-05-20 Lars Magne Ingebrigtsen @@ -8840,7 +8831,7 @@ 2002-05-06 Josh Huber - * mml2015.el (mml2015-gpg-encrypt): Changed name of optional + * mml2015.el (mml2015-gpg-encrypt): Change name of optional argument, and fixed compiler warning. (Added autoload for gpg-encrypt). @@ -8864,10 +8855,10 @@ * mml-sec.el (mml-signencrypt-style): New. * mml-sec.el (mml-pgpmime-encrypt-buffer): Accept optional argument `sign'. - * mml-sec.el (mml-secure-message-encrypt-pgp): Changed default to + * mml-sec.el (mml-secure-message-encrypt-pgp): Change default to signencrypt. * mml-sec.el (mml-secure-message-encrypt-pgpmime): Ditto. - * mml.el (mml-generate-mime-1): Changed logic so a part which is + * mml.el (mml-generate-mime-1): Change logic so a part which is both signed & encryped is processed in one operation (rather than two separate ops: sign, then encrypt). * mml2015.el (mml2015-gpg-extract-signature-details): Give some @@ -8903,8 +8894,8 @@ 2002-05-01 Simon Josefsson - * imap.el (imap-parse-resp-text-code, imap-parse-status): Treat - UIDNEXT as a string. + * imap.el (imap-parse-resp-text-code, imap-parse-status): + Treat UIDNEXT as a string. * nnimap.el (nnimap-string-lessp-numerical): New function. (nnimap-retrieve-groups): Compare UIDNEXT as strings instead of @@ -8927,8 +8918,8 @@ (nnimap-mailbox-info): New internal variable. (nnimap-retrieve-groups): Implement faster new mail check. - * nnimap.el (nnimap-split-articles): Support - nnmail-cache-accepted-message-ids. + * nnimap.el (nnimap-split-articles): + Support nnmail-cache-accepted-message-ids. (nnimap-request-accept-article): Ditto. * imap.el (imap-mailbox-status-asynch): New command. @@ -9013,8 +9004,8 @@ 2002-04-23 Matthieu Moy - * gnus-msg.el (gnus-summary-resend-message-edit): Remove - message-ignored-resent-headers, too. + * gnus-msg.el (gnus-summary-resend-message-edit): + Remove message-ignored-resent-headers, too. 2002-04-22 Björn Torkelsson @@ -9048,7 +9039,7 @@ (message-mode): Add description for `message-to-list-only'. (message-to-list-only): New. - (message-make-mft): Changed to use the cl loop macro, and added + (message-make-mft): Change to use the cl loop macro, and added optional flag to return only the matched list (for use in new message-to-list-only function). @@ -9082,11 +9073,11 @@ 2002-04-13 Josh Huber - * mml-sec.el (mml-secure-message): Changed to support arbritrary + * mml-sec.el (mml-secure-message): Change to support arbritrary modes. * mml-sec.el (mml-secure-message-encrypt-(smime|pgp|pgpmime)): changed to support "signencrypt" mode. - * mml.el (mml-parse-1): Changed to support different secure modes + * mml.el (mml-parse-1): Change to support different secure modes more easily (for signencrypt). 2002-04-11 Stefan Monnier @@ -9107,13 +9098,13 @@ 2002-04-12 Daiki Ueno - * gnus-srvr.el (gnus-server-set-info): Clear - `gnus-server-method-cache' when `gnus-server-alist' is changed. + * gnus-srvr.el (gnus-server-set-info): + Clear `gnus-server-method-cache' when `gnus-server-alist' is changed. 2002-04-11 Simon Josefsson - * gnus-sum.el (gnus-summary-force-verify-and-decrypt): Force - viewing of security buttons. Thanks to Nicolas Kowalski + * gnus-sum.el (gnus-summary-force-verify-and-decrypt): + Force viewing of security buttons. Thanks to Nicolas Kowalski . * smime.el (smime-CA-directory): Fix doc. Thanks to Arne @@ -9142,7 +9133,7 @@ 2002-04-07 Josh Huber - * message.el (message-make-mft): Changed MFT code from using + * message.el (message-make-mft): Change MFT code from using message-recipients (which included Bcc) to use only the To and CC headers. @@ -9202,8 +9193,8 @@ * nnmaildir.el: Use defstruct. Use a single copy of nnmail-extra-headers to save memory. Store server's group name prefix instead of each group's prefixed name. - * nnnil.el (nnnil-retrieve-headers, nnnil-request-list): Erase - nntp-server-buffer. + * nnnil.el (nnnil-retrieve-headers, nnnil-request-list): + Erase nntp-server-buffer. 2002-03-31 Lars Magne Ingebrigtsen @@ -9272,7 +9263,7 @@ 2002-03-22 Josh Huber - * mml.el (mml-mode-map): Added a keybinding for + * mml.el (mml-mode-map): Add a keybinding for `mml-unsecure-message'. Also, added a menu entry for said function in the Attachments menu. @@ -9340,8 +9331,8 @@ 2002-03-12 Faried Nawaz (tiny change) - * message.el (message-qmail-inject-args): May be function. Adjust - doc string and custom type. + * message.el (message-qmail-inject-args): May be function. + Adjust doc string and custom type. (message-send-mail-with-qmail): Call function if m-q-i-a is a function. @@ -9367,8 +9358,8 @@ 2002-03-09 Andre Srinivasan (tiny change) - * gnus-sum.el (gnus-summary-save-parts-default-mime): Remove - duplication. + * gnus-sum.el (gnus-summary-save-parts-default-mime): + Remove duplication. (gnus-summary-save-parts-type-history): Ditto. (gnus-summary-save-parts-last-directory): Ditto. @@ -9408,8 +9399,8 @@ * qp.el (quoted-printable-decode-region): Doc addition. From: Eli Zaretskii - * mail-source.el (make-source-make-complex-temp-name): Use - make-temp-file. + * mail-source.el (make-source-make-complex-temp-name): + Use make-temp-file. * mm-util.el (mm-make-temp-file): New function. * nneething.el (nneething-file-name): Use it. @@ -9424,8 +9415,8 @@ 2002-03-04 Paul Jarc - * message.el (nnmaildir-article-number-to-base-name): New - function. + * message.el (nnmaildir-article-number-to-base-name): + New function. (nnmaildir-base-name-to-article-number): New function. 2002-03-04 Katsumi Yamaoka @@ -9477,7 +9468,7 @@ * gnus-util.el (gnus-multiple-choice): New function. - * gnus-kill.el (gnus-score-insert-help): Removed, because it is + * gnus-kill.el (gnus-score-insert-help): Remove, because it is also defined in gnus-score.el. 2002-03-01 Paul Jarc @@ -9544,8 +9535,8 @@ 2002-02-22 Andre Srinivasan (tiny change) - * mm-decode.el (mm-display-external): Use - mm-file-name-rewrite-functions. + * mm-decode.el (mm-display-external): + Use mm-file-name-rewrite-functions. 2002-02-22 Paul Jarc @@ -9559,13 +9550,13 @@ 2002-02-21 Paul Jarc - * nnmaildir.el (nnmaildir-request-expire-articles): Use - nnmail-expiry-wait* if expire-age parameter is not set. + * nnmaildir.el (nnmaildir-request-expire-articles): + Use nnmail-expiry-wait* if expire-age parameter is not set. 2002-02-21 ShengHuo ZHU - * gnus-group.el (gnus-group-sort-groups-by-real-name): New - function. + * gnus-group.el (gnus-group-sort-groups-by-real-name): + New function. (gnus-group-sort-selected-groups-by-real-name): New function. (gnus-group-make-menu-bar): Add sort by real name. @@ -9615,8 +9606,8 @@ * rfc2231.el (rfc2231-parse-string): Support non-ascii chars. - * gnus-art.el (gnus-article-wash-html-with-w3): Remove - w3-delay-image-loads. + * gnus-art.el (gnus-article-wash-html-with-w3): + Remove w3-delay-image-loads. * mm-view.el (mm-inline-text-html-render-with-w3): Ditto. (mm-w3-prepare-buffer): Ditto. @@ -9686,7 +9677,7 @@ 2002-02-18 Katsumi Yamaoka - * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Improved to speed + * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Improve to speed up. Suggested by Yuuichi Teranishi . * gnus-art.el (article-display-x-face): Sort gray X-Faces. @@ -9784,8 +9775,8 @@ * gnus-agent.el (gnus-get-predicate): Use nconc. - * gnus-sum.el (gnus-summary-display-make-predicate): Use - gnus-summary-display-cache as cache. + * gnus-sum.el (gnus-summary-display-make-predicate): + Use gnus-summary-display-cache as cache. * nndoc.el (nndoc-type-alist): Add mail-in-mail type. (nndoc-mail-in-mail-type-p): New function. @@ -9795,8 +9786,8 @@ * mailcap.el (mailcap-mime-data): Use enriched-decode. - * gnus-cite.el (gnus-article-fill-cited-article): Bind - use-hard-newlines to nil. + * gnus-cite.el (gnus-article-fill-cited-article): + Bind use-hard-newlines to nil. * gnus-xmas.el (gnus-xmas-image-type-available-p): Assume that image is not available if window-system is not available. @@ -9813,8 +9804,8 @@ * gnus-soup.el (gnus-soup-send-packet): Send news and mail directly instead of calling message-send-mail. - * gnus-start.el (gnus-read-descriptions-file): Use - gnus-default-charset. + * gnus-start.el (gnus-read-descriptions-file): + Use gnus-default-charset. * mm-util.el (mm-guess-mime-charset): New function. @@ -9857,16 +9848,16 @@ 2002-02-07 ShengHuo ZHU - * gnus-art.el (gnus-article-treat-body-boundary): Add - gnus-decoration property. + * gnus-art.el (gnus-article-treat-body-boundary): + Add gnus-decoration property. * gnus-msg.el (gnus-copy-article-buffer): Remove gnus-decoration. * gnus-art.el (gnus-article-treat-unfold-headers): Don't remove too many spaces. * rfc2047.el (rfc2047-unfold-region): Ditto. - (rfc2047-decode-region): Don't unfold. Let - gnus-article-treat-unfold-headers do it. + (rfc2047-decode-region): Don't unfold. + Let gnus-article-treat-unfold-headers do it. 2002-02-07 Matt Armstrong @@ -9946,8 +9937,8 @@ force, prevent errors when following up from article buffer. (gnus-article-reply-with-original): Ditto. - * binhex.el (binhex-decoder-switches): Fix doc. From - Pavel@Janik.cz (Pavel Janík). + * binhex.el (binhex-decoder-switches): Fix doc. + From Pavel@Janik.cz (Pavel Janík). 2002-02-04 ShengHuo ZHU @@ -9984,11 +9975,11 @@ * gnus-cache.el (gnus-summary-insert-cached-articles): (gnus-summary-limit-include-cached): gnus-newsgroup-cached is sorted. - * gnus-group.el (gnus-group-mark-article-read): Nreverse - gnus-newsgroups-unselected. + * gnus-group.el (gnus-group-mark-article-read): + Nreverse gnus-newsgroups-unselected. - * gnus-agent.el (gnus-summary-set-agent-mark): Use - gnus-add-to-sorted-list. + * gnus-agent.el (gnus-summary-set-agent-mark): + Use gnus-add-to-sorted-list. * gnus-sum.el (gnus-summary-update-info): gnus-newsgroup-unreads gnus-newsgroup-unselected are sorted. Use gnus-sorted-union. @@ -10003,8 +9994,8 @@ directories. (gnus-dired-print): New function. - * gnus-art.el (gnus-mime-print-part): Add argument filename. Call - ps-despool. + * gnus-art.el (gnus-mime-print-part): Add argument filename. + Call ps-despool. 2002-02-02 Simon Josefsson @@ -10048,11 +10039,11 @@ 2002-01-31 ShengHuo ZHU - * nnfolder.el (nnfolder-request-replace-article): Unfold. Don't - use mail-header-unfold-field. + * nnfolder.el (nnfolder-request-replace-article): Unfold. + Don't use mail-header-unfold-field. - * gnus-cache.el (gnus-summary-insert-cached-articles): Use - gnus-summary-limit. + * gnus-cache.el (gnus-summary-insert-cached-articles): + Use gnus-summary-limit. * gnus-range.el (gnus-add-to-sorted-list): New function. * gnus-sum.el (gnus-mark-article-as-read): Use it. @@ -10068,8 +10059,8 @@ * gnus-msg.el (gnus-posting-styles): Add new format of header. (gnus-configure-posting-styles): Support the new format. - * mail-source.el (mail-source-bind, mail-source-bind-common): Set - edebug-form-spec to (sexp body). + * mail-source.el (mail-source-bind, mail-source-bind-common): + Set edebug-form-spec to (sexp body). Suggested by Joe Wells . * message.el (message-reply-headers): Add doc. @@ -10095,19 +10086,19 @@ * nnagent.el (nnagent-retrieve-headers): Use gnus-sorted-difference. - * gnus-agent.el (gnus-agent-retrieve-headers): Use - gnus-sorted-difference. + * gnus-agent.el (gnus-agent-retrieve-headers): + Use gnus-sorted-difference. - * nnsoup.el (nnsoup-request-expire-articles): Use - gnus-sorted-difference. + * nnsoup.el (nnsoup-request-expire-articles): + Use gnus-sorted-difference. * nnheader.el: Autoload gnus-sorted-difference. - * nnfolder.el (nnfolder-request-expire-articles): Use - gnus-sorted-difference. + * nnfolder.el (nnfolder-request-expire-articles): + Use gnus-sorted-difference. - * gnus-cache.el (gnus-cache-retrieve-headers): Use - gnus-sorted-difference. + * gnus-cache.el (gnus-cache-retrieve-headers): + Use gnus-sorted-difference. * gnus-range.el: Autoload cookies. (gnus-sorted-difference): New function. @@ -10122,8 +10113,8 @@ * gnus-sum.el (gnus-select-newsgroup): Use gnus-sorted-difference, gnus-sorted-ndifference, and gnus-sorted-nintersection. (gnus-articles-to-read): Use gnus-sorted-difference. - (gnus-summary-limit-mark-excluded-as-read): Use - gnus-sorted-intersection and gnus-sorted-ndifference. + (gnus-summary-limit-mark-excluded-as-read): + Use gnus-sorted-intersection and gnus-sorted-ndifference. (gnus-list-of-read-articles): Use gnus-list-range-difference. (gnus-summary-insert-articles): Use gnus-sorted-difference. @@ -10139,7 +10130,7 @@ * mm-view.el (mm-w3m-mode-map): New variable. (mm-w3m-mode-command-alist): New variable. - (mm-w3m-minor-mode): Removed. + (mm-w3m-minor-mode): Remove. (mm-setup-w3m): Setup `mm-w3m-mode-map'; don't add minor mode. (mm-inline-text-html-render-with-w3m): Add keymap property to the buffer for using emacs-w3m command keys. @@ -10150,11 +10141,11 @@ (message-cite-prefix-regexp): Auto detect non word constituents. (message-cite-prefix-regexp): Don't use with-syntax-table. - * gnus-sum.el (gnus-summary-update-info): Use - gnus-list-range-intersection. + * gnus-sum.el (gnus-summary-update-info): + Use gnus-list-range-intersection. - * gnus-agent.el (gnus-agent-fetch-headers): Use - gnus-list-range-intersection. + * gnus-agent.el (gnus-agent-fetch-headers): + Use gnus-list-range-intersection. * gnus-range.el (gnus-range-normalize): Use correct predicate. (gnus-list-range-intersection): Use it. @@ -10189,8 +10180,8 @@ Don't split when the window is small, e.g. when a small *BBDB* window is the lowest one. - * gnus-agent.el (gnus-agent-retrieve-headers): Use - nnheader-find-nov-line to speed up. Use nreverse, because it is + * gnus-agent.el (gnus-agent-retrieve-headers): + Use nnheader-find-nov-line to speed up. Use nreverse, because it is sorted. Use nnheader-insert-nov-file. 2002-01-28 Katsumi Yamaoka @@ -10208,7 +10199,7 @@ * time-date.el: Add autoload cookies. Many doc fixes. (time-add): New function. - (time-subtract): Renamed from subtract-time. + (time-subtract): Rename from subtract-time. (subtract-time): New alias for time-subtract. 2002-01-28 Katsumi Yamaoka @@ -10254,7 +10245,7 @@ 2002-01-26 Lars Magne Ingebrigtsen * nnml.el (nnml-use-compressed-files): New variable. - (nnml-filenames-are-evil): Removed. + (nnml-filenames-are-evil): Remove. (nnml-current-group-article-to-file-alist): Don't use. (nnml-update-file-alist): Inhibit. (nnml-article-to-file): Use new var. @@ -10319,7 +10310,7 @@ 2002-01-25 Lars Magne Ingebrigtsen - * gnus-agent.el (gnus-agent-save-alist): Optimized. + * gnus-agent.el (gnus-agent-save-alist): Optimize. 2002-01-25 Lars Magne Ingebrigtsen @@ -10330,15 +10321,15 @@ (gnus-server-method-cache): New variable. (gnus-server-to-method): Use it. (gnus-group-method-cache): New variable. - (gnus-find-method-for-group-1): Renamed. + (gnus-find-method-for-group-1): Rename. (gnus-find-method-for-group): New function. - (gnus-group-method-cache): Removed. + (gnus-group-method-cache): Remove. * gnus-sum.el (gnus-compute-unseen-list): Use new optimized function. * gnus-range.el (gnus-members-of-range): New function. - (gnus-list-range-intersection): Renamed. + (gnus-list-range-intersection): Rename. (gnus-inverse-list-range-intersection): New function. * gnus-sum.el (gnus-compute-unseen-list): Made into own function. @@ -10350,8 +10341,8 @@ 2002-01-25 Katsumi Yamaoka - * mm-view.el (mm-inline-text-html-render-with-w3m): Decode - charset-encoded html contents. + * mm-view.el (mm-inline-text-html-render-with-w3m): + Decode charset-encoded html contents. 2002-01-24 ShengHuo ZHU @@ -10401,12 +10392,12 @@ 2002-01-22 Josh Huber - * mml.el (mml-parse-1): Fixed usage of recipients in the secure + * mml.el (mml-parse-1): Fix usage of recipients in the secure tag. 2002-01-22 Josh Huber - * message.el (message-font-lock-keywords): Added the secure tag. + * message.el (message-font-lock-keywords): Add the secure tag. * mml-sec.el: Added functions to generate/modify/remove the secure tag while in message mode. * mml-sec.el (mml-secure-message): New. @@ -10417,12 +10408,12 @@ * mml-sec.el (mml-secure-message-encrypt-smime): New. * mml-sec.el (mml-secure-message-encrypt-pgp): New. * mml-sec.el (mml-secure-message-encrypt-pgpmime): New. - * mml.el (mml-parse-1): Added code to recognize the secure tag and + * mml.el (mml-parse-1): Add code to recognize the secure tag and convert it to either a part or multipart depending on if there are other parts in the message. - * mml.el (mml-mode-map): Changed default sign/encrypt keybindings + * mml.el (mml-mode-map): Change default sign/encrypt keybindings to use the secure tag, rather than the part tag. - * mml.el (mml-preview): Added a save-excursion to keep cursor + * mml.el (mml-preview): Add a save-excursion to keep cursor position after doing an MML preview. 2002-01-22 Lars Magne Ingebrigtsen @@ -10462,8 +10453,8 @@ 2002-01-20 Lars Magne Ingebrigtsen - * nnfolder.el (nnfolder-request-accept-article): Unfold - x-from-line. + * nnfolder.el (nnfolder-request-accept-article): + Unfold x-from-line. (nnfolder-request-replace-article): Ditto. 2002-01-20 Nevin Kapur @@ -10487,8 +10478,8 @@ * message.el (message-dont-send): Doc fix. - * gnus-util.el (gnus-completing-read): Remove - inherit-input-method. + * gnus-util.el (gnus-completing-read): + Remove inherit-input-method. * gnus-art.el (gnus-treat-smiley): Doc fix. @@ -10541,8 +10532,8 @@ 2002-01-19 Daniel Pittman - * gnus-sum.el (gnus-summary-first-unseen-or-unread-subject): New - functions. + * gnus-sum.el (gnus-summary-first-unseen-or-unread-subject): + New functions. 2002-01-19 Lars Magne Ingebrigtsen @@ -10551,7 +10542,7 @@ * gnus-sum.el (gnus-summary-goto-subject): Error on non-numerical articles. - * gnus-util.el (gnus-completing-read-with-default): Renamed. + * gnus-util.el (gnus-completing-read-with-default): Rename. * nnmail.el (nnmail-article-group): Clean up. @@ -10571,17 +10562,17 @@ * smiley-ems.el (smiley-region): Register smiley. (smiley-toggle-buffer): Rewrite the function. - (smiley-active): Removed. + (smiley-active): Remove. 2002-01-19 Simon Josefsson - * gnus-util.el (gnus-parent-id): Optimize null n case. From - Jesper Harder . + * gnus-util.el (gnus-parent-id): Optimize null n case. + From Jesper Harder . 2002-01-18 TSUCHIYA Masatoshi - * gnus-art.el (gnus-request-article-this-buffer): Call - `nneething-get-file-name' to extract the file name from the + * gnus-art.el (gnus-request-article-this-buffer): + Call `nneething-get-file-name' to extract the file name from the message id. * nneething.el (nneething-encode-file-name): New function. @@ -10649,21 +10640,21 @@ 2002-01-17 ShengHuo ZHU * gnus-agent.el (gnus-agent-retrieve-headers): Use correct buffer. - (gnus-agent-braid-nov): Switch back to nntp-server-buffer. Remove - duplications. + (gnus-agent-braid-nov): Switch back to nntp-server-buffer. + Remove duplications. (gnus-agent-batch): Bind gnus-agent-confirmation-function. 2002-01-16 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-summary-initial-limit): Inline - gnus-summary-limit-children. + * gnus-sum.el (gnus-summary-initial-limit): + Inline gnus-summary-limit-children. (gnus-summary-initial-limit): Don't limit if gnus-newsgroup-display is nil. (gnus-summary-initial-limit): No, don't. * gnus-util.el - (gnus-put-text-property-excluding-characters-with-faces): Inline - gnus-put-text-property. + (gnus-put-text-property-excluding-characters-with-faces): + Inline gnus-put-text-property. * gnus-spec.el (gnus-default-format-specs): New variable. @@ -10680,8 +10671,8 @@ * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Inline some functions. - (gnus-gather-threads-by-references): Inline - `gnus-split-references'. + (gnus-gather-threads-by-references): + Inline `gnus-split-references'. * gnus-spec.el (gnus-summary-line-format-spec): New, optimized default value of gnus-summary-line-format-spec. @@ -10691,7 +10682,7 @@ * nnslashdot.el (nnslashdot-retrieve-headers-1): A better error message. (nnslashdot-request-list): Ditto. - (nnslashdot-sid-strip): Removed. + (nnslashdot-sid-strip): Remove. 2002-01-15 Simon Josefsson @@ -10705,14 +10696,14 @@ 2002-01-15 TSUCHIYA Masatoshi - * nneething.el (nneething-request-article): Set - `nnmail-file-coding-system' to `binary' locally, in order to read + * nneething.el (nneething-request-article): + Set `nnmail-file-coding-system' to `binary' locally, in order to read files without any conversion. 2002-01-15 ShengHuo ZHU - * gnus-agent.el (gnus-agent-retrieve-headers): Use - nnheader-file-coding-system and nnmail-active-file-coding-system. + * gnus-agent.el (gnus-agent-retrieve-headers): + Use nnheader-file-coding-system and nnmail-active-file-coding-system. (gnus-agent-regenerate-group): Ditto. (gnus-agent-regenerate): Ditto. (gnus-agent-write-active): Ditto. @@ -10747,19 +10738,19 @@ * imap.el (imap-close): Keep going if quit. - * gnus-agent.el (gnus-agent-retrieve-headers): Erase - nntp-server-buffer. + * gnus-agent.el (gnus-agent-retrieve-headers): + Erase nntp-server-buffer. 2002-01-12 Lars Magne Ingebrigtsen * mm-view.el (mm-display-inline-fontify): Require font-lock to avoid unbinding shadowed variables. - * gnus-art.el (gnus-picon-databases): Moved here. - (gnus-picons-installed-p): Moved here. + * gnus-art.el (gnus-picon-databases): Move here. + (gnus-picons-installed-p): Move here. (gnus-article-reply-with-original): Use `mark'. - * gnus.el (gnus-picon): Moved here and renamed. + * gnus.el (gnus-picon): Move here and renamed. * gnus-art.el (gnus-treat-from-picon): Only be on if picons are installed. @@ -10782,8 +10773,8 @@ 2002-01-12 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-article-reply-with-original): Use - `mark-active'. + * gnus-art.el (gnus-article-reply-with-original): + Use `mark-active'. * gnus-msg.el (gnus-summary-reply): Don't bug out on regions. @@ -10794,16 +10785,16 @@ 2002-01-12 Simon Josefsson * flow-fill.el (fill-flowed-display-column) - (fill-flowed-encode-columnq): New variables. Suggested by - Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann). + (fill-flowed-encode-columnq): New variables. + Suggested by Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann). (fill-flowed-encode, fill-flowed): Use them. - * message.el (message-send-news, message-send-mail): Use - m-b-s-n-p-e-h-n. + * message.el (message-send-news, message-send-mail): + Use m-b-s-n-p-e-h-n. * mml.el (autoload): Autoload fill-flowed-encode. - (mml-buffer-substring-no-properties-except-hard-newlines): New - function. + (mml-buffer-substring-no-properties-except-hard-newlines): + New function. (mml-read-part): Use it. (mml-generate-mime-1): Encode format=flowed if appropriate. (mml-insert-mime-headers): Insert format=flowed. @@ -10843,8 +10834,8 @@ gnus-article-prepare-hook. * gnus-agent.el (gnus-agent-retrieve-headers): Load agentview. - (gnus-agent-toggle-plugged): Use gnus-agent-go-online. Move - gnus-agent-possibly-synchronize-flags to the last. + (gnus-agent-toggle-plugged): Use gnus-agent-go-online. + Move gnus-agent-possibly-synchronize-flags to the last. (gnus-agent-go-online): New function. New variable. 2002-01-11 ShengHuo ZHU @@ -10904,8 +10895,8 @@ 2002-01-10 ShengHuo ZHU - * nnkiboze.el (nnkiboze-request-article): Use - gnus-agent-request-article. + * nnkiboze.el (nnkiboze-request-article): + Use gnus-agent-request-article. * nnagent.el (nnagent-retrieve-headers): Don't use nnml function. Insert undownloaded NOV. @@ -10915,13 +10906,13 @@ * gnus.el (gnus-agent-cache): New variable. - * gnus-int.el (gnus-retrieve-headers): Use - gnus-agent-retrieve-headers. + * gnus-int.el (gnus-retrieve-headers): + Use gnus-agent-retrieve-headers. (gnus-request-head): Use gnus-agent-request-article. (gnus-request-body): Ditto. - * gnus-art.el (gnus-request-article-this-buffer): Use - gnus-agent-request-article. + * gnus-art.el (gnus-request-article-this-buffer): + Use gnus-agent-request-article. * gnus-sum.el (gnus-summary-read-group-1): Don't show the first article if it is undownloaded. @@ -10942,8 +10933,8 @@ 2002-01-08 ShengHuo ZHU - * mm-encode.el (mm-content-transfer-encoding-defaults): Add - application/x-emacs-lisp. + * mm-encode.el (mm-content-transfer-encoding-defaults): + Add application/x-emacs-lisp. * gnus-msg.el (gnus-bug): Use application/emacs-lisp. @@ -10986,8 +10977,8 @@ 2002-01-07 TSUCHIYA Masatoshi * nneething.el (nneething-request-article): When a non-text file - is converted to an article, its data is encoded in base64. Call - `nneething-make-head' with options to specify MIME types. + is converted to an article, its data is encoded in base64. + Call `nneething-make-head' with options to specify MIME types. (nneething-make-head): Add optional arguments to specify MIME types. @@ -11007,13 +10998,13 @@ 2002-01-06 Simon Josefsson - * imap.el (imap-ssl-open, imap-ssl-open, imap-parse-fetch): Use - condition-case, not ignore-errors. + * imap.el (imap-ssl-open, imap-ssl-open, imap-parse-fetch): + Use condition-case, not ignore-errors. 2002-01-06 ShengHuo ZHU - * gnus-sum.el (gnus-summary-insert-old-articles): Bind - gnus-fetch-old-headers. + * gnus-sum.el (gnus-summary-insert-old-articles): + Bind gnus-fetch-old-headers. * gnus-art.el (article-display-x-face): Use the current buffer unless `W f'. Otherwise, X-Face may be shown in the header of a @@ -11023,8 +11014,8 @@ 2002-01-06 Lars Magne Ingebrigtsen - * gnus-group.el (gnus-group-read-ephemeral-group): Fix - parameters. + * gnus-group.el (gnus-group-read-ephemeral-group): + Fix parameters. 2002-01-06 ShengHuo ZHU @@ -11034,8 +11025,8 @@ (mm-detect-coding-region): New function. (mm-detect-mime-charset-region): New function. - * gnus-sum.el (gnus-summary-show-article): Use - mm-detect-coding-region. + * gnus-sum.el (gnus-summary-show-article): + Use mm-detect-coding-region. 2002-01-06 Lars Magne Ingebrigtsen @@ -11071,7 +11062,7 @@ 2002-01-05 Lars Magne Ingebrigtsen - * gnus.el (gnus-logo-color-alist): Added more colors from Luis. + * gnus.el (gnus-logo-color-alist): Add more colors from Luis. 2002-01-05 Keiichi Suzuki (tiny change) @@ -11096,7 +11087,7 @@ 2002-01-05 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-thread-latest-date): New function. - (gnus-thread-sort-by-most-recent-number): Renamed. + (gnus-thread-sort-by-most-recent-number): Rename. (gnus-thread-sort-functions): Doc fix. (gnus-select-group-hook): Don't use setq on a hook. (gnus-thread-latest-date): Use date, not number. @@ -11104,14 +11095,14 @@ * gnus-agent.el (gnus-agent-expire-days): Doc fix. (gnus-agent-expire): Allow regexp of expire-days. - * gnus-art.el (gnus-article-reply-with-original): Deactivate - region. + * gnus-art.el (gnus-article-reply-with-original): + Deactivate region. (gnus-article-followup-with-original): Ditto. * gnus-sum.el (gnus-thread-highest-number): Doc fix. - * gnus-art.el (gnus-mime-display-alternative): Use - gnus-local-map-property. + * gnus-art.el (gnus-mime-display-alternative): + Use gnus-local-map-property. (gnus-mime-display-alternative): Ditto. (gnus-insert-mime-security-button): Ditto. (gnus-insert-next-page-button): Ditto. @@ -11130,7 +11121,7 @@ "X-Face: " to the data in the built-in scenario. * gnus-spec.el (gnus-parse-simple-format): Use gnus-pad-form. - (gnus-correct-pad-form): Renamed. + (gnus-correct-pad-form): Rename. (gnus-tilde-max-form): Clean up. (gnus-pad-form): Use gnus-use-correct-string-widths. @@ -11161,30 +11152,30 @@ * gnus-fun.el (gnus-display-x-face-in-from): Use face. - * gnus-ems.el (gnus-article-xface-ring-internal): Removed. - (gnus-article-xface-ring-size): Removed. - (gnus-article-display-xface): Removed. + * gnus-ems.el (gnus-article-xface-ring-internal): Remove. + (gnus-article-xface-ring-size): Remove. + (gnus-article-display-xface): Remove. (gnus-remove-image): Cleaned up. * gnus-xmas.el (gnus-xmas-create-image): Convert pbm to xbm. (gnus-xmas-create-image): Take pbm files. - (gnus-x-face): Removed. - (gnus-xmas-article-display-xface): Removed. + (gnus-x-face): Remove. + (gnus-xmas-article-display-xface): Remove. - * gnus-fun.el (gnus-display-x-face-in-from): Bind - default-enable-multibyte-characters. + * gnus-fun.el (gnus-display-x-face-in-from): + Bind default-enable-multibyte-characters. * compface.el (uncompface): Doc fix. - * gnus-art.el (gnus-article-x-face-command): Use - gnus-display-x-face-in-from. + * gnus-art.el (gnus-article-x-face-command): + Use gnus-display-x-face-in-from. * gnus-xmas.el (gnus-xmas-put-image): Return the image. * gnus-ems.el (gnus-put-image): Return the image. * gnus-fun.el (gnus-display-x-face-in-from): New function. - (gnus-x-face): Moved here. + (gnus-x-face): Move here. 2002-01-04 ShengHuo ZHU @@ -11218,9 +11209,9 @@ * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Use uncompface. - * compface.el (compface-xbm-p): Removed. + * compface.el (compface-xbm-p): Remove. - * gnus-ems.el (gnus-article-compface-xbm): Removed. + * gnus-ems.el (gnus-article-compface-xbm): Remove. (gnus-article-display-xface): Use compface. * compface.el: New file. @@ -11232,8 +11223,8 @@ 2002-01-03 Paul Jarc - * nnmaildir.el (nnmaildir-request-expire-articles): Evaluate - the expire-group parameter once per article rather than once + * nnmaildir.el (nnmaildir-request-expire-articles): + Evaluate the expire-group parameter once per article rather than once per group; bind `nnmaildir-article-file-name' and `article' for convenience. Leave article alone when expire-group specifies the current group. @@ -11246,7 +11237,7 @@ 2002-01-03 Dave Love - * gnus-start.el (gnus-startup-file-coding-system): Removed. + * gnus-start.el (gnus-startup-file-coding-system): Remove. (gnus-read-init-file): Don't use it. 2002-01-03 Lars Magne Ingebrigtsen @@ -11268,7 +11259,7 @@ 2002-01-03 Per Abrahamsen - * gnus.el (gnus-summary-line-format): Added :link. + * gnus.el (gnus-summary-line-format): Add :link. * gnus-topic.el (gnus-topic-line-format): Ditto. * gnus-sum.el (gnus-summary-dummy-line-format): Ditto. * gnus-srvr.el (gnus-server-line-format): Ditto. @@ -11336,7 +11327,7 @@ 2002-01-02 Lars Magne Ingebrigtsen - * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed. + * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Rename. * gnus-art.el (gnus-ignored-headers): Hide all X-Faces. (article-display-x-face): Display gray X-Faces. @@ -11389,10 +11380,10 @@ * gnus-fun.el: New file. (gnus-convert-image-to-x-face-command): New variable. (gnus-insert-x-face): New function. - (gnus-random-x-face): Renamed. - (gnus-x-face-from-file): Renamed. + (gnus-random-x-face): Rename. + (gnus-x-face-from-file): Rename. - * gnus-art.el (gnus-body-boundary-delimiter): Changed default to + * gnus-art.el (gnus-body-boundary-delimiter): Change default to "_". (gnus-body-boundary-delimiter): Typo fix. @@ -11442,7 +11433,7 @@ * gnus-picon.el (gnus-picon-find-face): Search MISC for all types. (gnus-picon-transform-address): Search for unknown faces as well. (gnus-picon-find-face): Don't search "news" for MISC. - (gnus-picon-user-directories): Changed default back to exclude + (gnus-picon-user-directories): Change default back to exclude "unknown". * gnus-sum.el (gnus-summary-hide-all-threads): Reversed logic. @@ -11455,13 +11446,13 @@ keystroke. (gnus-topic-goto-next-topic): Ditto. - * gnus.el (gnus-summary-line-format): Changed default. + * gnus.el (gnus-summary-line-format): Change default. * nnmail.el (nnmail-extra-headers): Change default. * gnus-sum.el (gnus-extra-headers): Change default. - * message.el (message-news-other-window): Changed "news" to + * message.el (message-news-other-window): Change "news" to "posting". (message-news-other-frame): Ditto. (message-do-send-housekeeping): Ditto. @@ -11499,8 +11490,8 @@ 2002-01-01 Steve Youngs - * gnus-xmas.el (gnus-xmas-article-display-xface): Uncomment - 'set-glyph-face' so x-face back/foreground can be set. + * gnus-xmas.el (gnus-xmas-article-display-xface): + Uncomment 'set-glyph-face' so x-face back/foreground can be set. 2001-12-31 ShengHuo ZHU @@ -11508,16 +11499,16 @@ 2002-01-01 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-treat-smiley): Renamed command. + * gnus-art.el (gnus-treat-smiley): Rename command. (gnus-article-remove-images): New command and keystroke. - * gnus-sum.el (gnus-summary-toggle-smiley): Removed. + * gnus-sum.el (gnus-summary-toggle-smiley): Remove. - * smiley-ems.el (gnus-smiley-display): Removed. + * smiley-ems.el (gnus-smiley-display): Remove. * gnus.el (gnus-version-number): Update version. - * message.el (message-text-with-property): Renamed and moved + * message.el (message-text-with-property): Rename and moved here. (message-fix-before-sending): Highlight invisible text and place point there. @@ -11528,7 +11519,7 @@ 2002-01-01 Lars Magne Ingebrigtsen - * gnus-delay.el (gnus-delay-send-queue): Renamed. + * gnus-delay.el (gnus-delay-send-queue): Rename. * gnus-art.el (gnus-ignored-headers): More headers. @@ -11558,7 +11549,7 @@ 2001-12-31 Lars Magne Ingebrigtsen - * gnus-group.el (gnus-group-line-format): Added %O to the default + * gnus-group.el (gnus-group-line-format): Add %O to the default value. * gnus-util.el (gnus-text-with-property): The smallest point is @@ -11591,7 +11582,7 @@ * gnus-ems.el (gnus-article-display-xface): Mark and store image. - * gnus-art.el (gnus-article-wash-status-entry): Renamed. + * gnus-art.el (gnus-article-wash-status-entry): Rename. (gnus-article-wash-status): Use it. (gnus-signature-toggle): Clean up. (gnus-add-wash-status): New function. @@ -11615,7 +11606,7 @@ * smiley-ems.el (gnus-smiley-file-types): New variable. (smiley-update-cache): Use it. (smiley-regexp-alist): Suffix-less smiley names. - (smiley-regexp-alist): Added more smileys. + (smiley-regexp-alist): Add more smileys. * gnus-sum.el (gnus-print-buffer): Made into own function. (gnus-summary-print-article): Use it. @@ -11630,8 +11621,8 @@ 2001-12-31 Simon Josefsson - * imap.el (imap-parse-fetch): Notice empty flags responses. From - Nic Ferrier . + * imap.el (imap-parse-fetch): Notice empty flags responses. + From Nic Ferrier . 2001-12-30 ShengHuo ZHU @@ -11644,15 +11635,15 @@ 2001-12-30 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-article-treat-fold-newsgroups): Don't - infloop. + * gnus-art.el (gnus-article-treat-fold-newsgroups): + Don't infloop. * gnus-sum.el (t): New `W D' map. * gnus-art.el (gnus-treat-fold-newsgroups): New variable. (gnus-article-treat-body-boundary): Clean up. - (gnus-body-boundary-face): Removed. - (gnus-article-goto-header): Moved here. + (gnus-body-boundary-face): Remove. + (gnus-article-goto-header): Move here. (gnus-article-goto-header): Allow better regexps. (gnus-article-treat-fold-newsgroups): New command. @@ -11667,7 +11658,7 @@ * mail-parse.el (mail-header-fold-line): New alias. (mail-header-unfold-line): Ditto. - * gnus-art.el (gnus-body-boundary-face): Renamed. + * gnus-art.el (gnus-body-boundary-face): Rename. (gnus-article-treat-body-boundary): Use it. (gnus-article-treat-body-boundary): Use an invisible header and a line of underline characters. @@ -11682,8 +11673,8 @@ (gnus-picon-transform-address): Use it. Set first to t for each address. - * gnus-art.el (gnus-with-article-headers): Move to here. Define - the macro then use it. + * gnus-art.el (gnus-with-article-headers): Move to here. + Define the macro then use it. (gnus-treatment-function-alist): Treat picons earlier. 2001-12-30 Lars Magne Ingebrigtsen @@ -11704,7 +11695,7 @@ * gnus-xmas.el (gnus-xmas-group-startup-message): Use general colors. - * gnus.el (gnus-logo-color-alist): Moved here and renamed. + * gnus.el (gnus-logo-color-alist): Move here and renamed. (gnus-logo-color-style): Ditto. (gnus-logo-colors): Ditto. @@ -11718,26 +11709,26 @@ * ietf-drums.el (ietf-drums-parse-addresses): Accept a nil string. - * gnus-picon.el (gnus-treat-mail-picon): Renamed. + * gnus-picon.el (gnus-treat-mail-picon): Rename. * gnus-art.el (gnus-treat-cc-picon): New variable. - (gnus-treat-mail-picon): Renamed. + (gnus-treat-mail-picon): Rename. * gnus-picon.el: New implementation. - (gnus-picon-find-face): Renamed. - (gnus-treat-from-picon): Use it. - (gnus-picon-transform-address): Renamed. - (gnus-treat-from-picon): Use it. - (gnus-picon-create-glyph): Renamed. + (gnus-picon-find-face): Rename. + (gnus-treat-from-picon): Use it. + (gnus-picon-transform-address): Rename. + (gnus-treat-from-picon): Use it. + (gnus-picon-create-glyph): Rename. (gnus-picon-transform-address): Use it. (gnus-treat-cc-picon): New command. - * mm-decode.el (mm-create-image-xemacs): Separated out into + * mm-decode.el (mm-create-image-xemacs): Separate out into function. (mm-get-image): Use it. * gnus-art.el (gnus-treat-display-picons): Simplify. - (gnus-treat-from-picon): Renamed. + (gnus-treat-from-picon): Rename. * gnus-ems.el (gnus-create-image): New function. (gnus-put-image): New function. @@ -11764,7 +11755,7 @@ 2001-12-29 Lars Magne Ingebrigtsen * gnus-art.el (gnus-treat-unfold-lines): New variable. - (gnus-treat-unfold-headers): Renamed. + (gnus-treat-unfold-headers): Rename. (gnus-article-treat-unfold-headers): New command and keystroke. * rfc2047.el (rfc2047-encode-message-header): Clean up. @@ -11781,7 +11772,7 @@ 2001-12-29 Lars Magne Ingebrigtsen - * gnus-picon.el (gnus-picons-news-directories): Removed obsolete + * gnus-picon.el (gnus-picons-news-directories): Remove obsolete alias. (gnus-picons-database): Default to list. (gnus-picons-lookup-internal): Use it. @@ -11819,8 +11810,8 @@ * gnus-art.el (gnus-treatment-function-alist): Emphasize after other treatments. - * gnus-util.el (gnus-put-overlay-excluding-newlines): New - function. + * gnus-util.el (gnus-put-overlay-excluding-newlines): + New function. * gnus-art.el (gnus-article-show-hidden-text): Remove the type from the list of hidden types. @@ -11833,7 +11824,7 @@ 2001-12-29 Lars Magne Ingebrigtsen - * gnus-art.el (gnus-ignored-headers): Added more headers. + * gnus-art.el (gnus-ignored-headers): Add more headers. 2001-12-29 Jesper Harder @@ -11846,13 +11837,13 @@ 2001-12-28 Simon Josefsson - * gnus-srvr.el (gnus-browse-foreign-server): Fix typo. From - Jesper Harder . + * gnus-srvr.el (gnus-browse-foreign-server): Fix typo. + From Jesper Harder . 2001-12-27 Simon Josefsson - * gnus-sum.el (gnus-select-newsgroup): Make - `gnus-newsgroup-unseen' sorted. Make `gnus-newsgroup-unseen' + * gnus-sum.el (gnus-select-newsgroup): + Make `gnus-newsgroup-unseen' sorted. Make `gnus-newsgroup-unseen' contain all articles (instead of none) when no seen marks have been set for the group. (gnus-update-marks): Use `gnus-range-add' on a uncompressed list @@ -11860,8 +11851,8 @@ 2001-12-26 11:00:00 Jesper Harder - * mm-util.el (mm-iso-8859-x-to-15-region): Use - insert-before-markers. + * mm-util.el (mm-iso-8859-x-to-15-region): + Use insert-before-markers. 2001-12-26 Paul Jarc @@ -11874,8 +11865,8 @@ 2001-12-22 22:00:00 ShengHuo ZHU - * gnus-group.el (gnus-group-read-ephemeral-group): Call - gnus-group-real-name. + * gnus-group.el (gnus-group-read-ephemeral-group): + Call gnus-group-real-name. * gnus-sum.el (gnus-decode-encoded-word-methods): Backslash paren. (gnus-newsgroup-variables): Ditto. @@ -11904,8 +11895,8 @@ * nnimap.el (top-level): Don't require cl. Suggested by ShengHuo ZHU . - (nnimap-close-group): Don't quote KEYLIST items. Suggested by - Brian P Templeton . + (nnimap-close-group): Don't quote KEYLIST items. + Suggested by Brian P Templeton . 2001-12-19 17:00:00 Paul Jarc @@ -11946,8 +11937,8 @@ * gnus-salt.el (gnus-tree-recenter, gnus-generate-tree) (gnus-generate-tree, gnus-highlight-selected-tree) - (gnus-highlight-selected-tree, gnus-tree-highlight-article): Use - it. + (gnus-highlight-selected-tree, gnus-tree-highlight-article): + Use it. * gnus-art.el (gnus-article-set-window-start) (gnus-mm-display-part, gnus-request-article-this-buffer) @@ -12004,7 +11995,7 @@ 2001-12-13 Josh Huber - * gnus-cus.el (gnus-extra-topic-parameters): Added topic parameter + * gnus-cus.el (gnus-extra-topic-parameters): Add topic parameter subscribe-level * gnus-topic.el (gnus-subscribe-topics): Use it. @@ -12110,8 +12101,8 @@ 2001-12-07 09:00:00 ShengHuo ZHU - * nnrss.el (nnrss-decode-entities-unibyte-string): Use - mm-url-decode-entities-nbsp. + * nnrss.el (nnrss-decode-entities-unibyte-string): + Use mm-url-decode-entities-nbsp. * nnlistserv.el, nnultimate.el, nnwarchive.el, nnweb.el: * webmail.el, nnwfm.el: Use mm-url. @@ -12131,7 +12122,7 @@ 2001-12-06 10:00:00 ShengHuo ZHU - * nnweb.el (nnweb-replace-in-string): Removed. + * nnweb.el (nnweb-replace-in-string): Remove. * gnus-util.el (gnus-replace-in-string): New function. (gnus-mode-string-quote): Use it. @@ -12179,8 +12170,8 @@ 2001-12-01 15:00:00 ShengHuo ZHU - * gnus-sum.el (gnus-summary-save-article): Nix - gnus-display-mime-function and gnus-article-prepare-hook. + * gnus-sum.el (gnus-summary-save-article): + Nix gnus-display-mime-function and gnus-article-prepare-hook. * gnus-spec.el (gnus-parse-complex-format): Properly handle %C at the beginning of lines. @@ -12216,8 +12207,8 @@ 2001-11-29 Kai Großjohann * message.el (message-newgroups-header-regexp) - (message-completion-alist, message-tab-body-function): Use - defcustom rather than defvar. + (message-completion-alist, message-tab-body-function): + Use defcustom rather than defvar. (message-tab): Mention `message-tab-body-function' in doc. Suggested by Karl Eichwalder. @@ -12252,8 +12243,8 @@ * message.el (message-mode): make-local-hook is harmless in Emacs 21. - * gnus-msg.el (gnus-configure-posting-styles): Use - make-local-hook. Add LOCAL for add-hook. + * gnus-msg.el (gnus-configure-posting-styles): + Use make-local-hook. Add LOCAL for add-hook. 2001-11-27 Per Abrahamsen @@ -12419,8 +12410,8 @@ 2001-11-15 Per Abrahamsen - * gnus-art.el (gnus-article-wash-status-strings): Use - `copy-sequence', not `copy-seq'. + * gnus-art.el (gnus-article-wash-status-strings): + Use `copy-sequence', not `copy-seq'. 2001-11-15 Per Abrahamsen @@ -12435,7 +12426,7 @@ 2001-11-12 Simon Josefsson * mml1991.el (mml1991-use, mml1991-function-alist): New variables. - (mml1991-gpg-sign, mml1991-gpg-encrypt): Renamed, from + (mml1991-gpg-sign, mml1991-gpg-encrypt): Rename, from `mml1991-sign' and `mml1991-encrypt'. (mml1991-encrypt, mml1991-sign): New glue functions. (mml1991-mailcrypt-sign, mml1991-mailcrypt-encrypt): New functions. @@ -12466,8 +12457,8 @@ * message.el (top-level): Autoload sha1. (message-canlock-generate): Use sha1 instead of md5 (sha1 used by - canlock, no need to require two different hash algs). Suggested - by Ferenc Wagner . + canlock, no need to require two different hash algs). + Suggested by Ferenc Wagner . 2001-11-09 Pavel Janík @@ -12493,13 +12484,13 @@ * sieve-mode.el (sieve-control-commands-face) (sieve-control-commands-face, sieve-action-commands-face) - (sieve-test-commands-face, sieve-tagged-arguments-face): New - faces. + (sieve-test-commands-face, sieve-tagged-arguments-face): + New faces. (sieve-font-lock-keywords): Use them. (sieve-mode): Only set font-lock-defaults in emacs. - * gnus-art.el (gnus-default-article-saver): Add - gnus-summary-save-body-in-file. + * gnus-art.el (gnus-default-article-saver): + Add gnus-summary-save-body-in-file. (gnus-summary-write-to-file): Fix doc. 2001-11-07 Simon Josefsson @@ -12588,7 +12579,7 @@ (nnimap-expunge): Don't use it. * imap.el (imap-callbacks): New variable. - (imap-remassoc): Copied from `gnus-remassoc'. + (imap-remassoc): Copy from `gnus-remassoc'. (imap-add-callback): New function. (imap-mailbox-expunge, imap-mailbox-close): Support asynchronous behavior. @@ -12633,8 +12624,8 @@ * smiley-ems.el (smiley-update-cache): Auto detect file type. - * message.el (message-forward-rmail-make-body): Use - save-window-excursion. + * message.el (message-forward-rmail-make-body): + Use save-window-excursion. (message-encode-message-body): Search with noerror. (message-setup-1): Convert compose-mail send-actions to message-send-actions. @@ -12715,8 +12706,8 @@ (mm-charset-synonym-alist): Remove windows-125[02]. Make other entries conditional on not having a coding system defined for them. - (mm-mule-charset-to-mime-charset): Use - find-coding-systems-for-charsets if defined. + (mm-mule-charset-to-mime-charset): + Use find-coding-systems-for-charsets if defined. (mm-charset-to-coding-system): Don't use mm-get-coding-system-list. Look in mm-charset-synonym-alist later. Add last resort search of coding systems. @@ -12742,8 +12733,8 @@ 2001-10-30 13:00:00 ShengHuo ZHU - * gnus-spec.el (gnus-parse-simple-format): Use - buffer-substring-no-properties. + * gnus-spec.el (gnus-parse-simple-format): + Use buffer-substring-no-properties. 2001-10-30 Katsumi Yamaoka @@ -12846,8 +12837,8 @@ 2001-10-22 Simon Josefsson - * gnus-msg.el (gnus-extended-version): Include - system-configuration. + * gnus-msg.el (gnus-extended-version): + Include system-configuration. Suggested by Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann). 2001-10-22 Per Abrahamsen @@ -12860,8 +12851,8 @@ 2001-10-21 Simon Josefsson * nnimap.el (nnimap): Defgroup. - (nnimap-strict-function, nnimap-strict-function-match): New - widget, from Per Abrahamsen . + (nnimap-strict-function, nnimap-strict-function-match): + New widget, from Per Abrahamsen . (nnimap-split-crosspost, nnimap-split-inbox) (nnimap-split-rule, nnimap-split-predicate) (nnimap-split-predicate): Defcustom. @@ -12907,9 +12898,9 @@ * message.el (message-do-auto-fill): New version that does not rely on text properties, by Simon Josefsson . - (message-setup-1): Removed the `message-field' property. + (message-setup-1): Remove the `message-field' property. - * gnus-draft.el (gnus-draft-edit-message): Removed the + * gnus-draft.el (gnus-draft-edit-message): Remove the `message-field' property. 2001-10-19 Per Abrahamsen @@ -12945,8 +12936,8 @@ * message.el (message-check-news-header-syntax): Special case nnvirtual groups. - * gnus-sum.el (gnus-summary-respool-default-method): Changed - customize type to `symbol'. + * gnus-sum.el (gnus-summary-respool-default-method): + Change customize type to `symbol'. 2001-10-17 12:00:00 ShengHuo ZHU @@ -12968,13 +12959,13 @@ 2001-10-17 Per Abrahamsen - * gnus-msg.el (gnus-post-method): Changed two instances of + * gnus-msg.el (gnus-post-method): Change two instances of `active' to `current' and one `null' to `not'. 2001-10-16 Katsumi Yamaoka - * message.el (message-setup-fill-variables): Use - `normal-auto-fill-function' instead of `auto-fill-function'. + * message.el (message-setup-fill-variables): + Use `normal-auto-fill-function' instead of `auto-fill-function'. 2001-10-16 Simon Josefsson @@ -13040,8 +13031,8 @@ 2001-10-12 Kai Großjohann Suggested by Oliver Scholz . - * message.el (message-do-auto-fill): New function. Like - `do-auto-fill' but don't fill when in the message header. + * message.el (message-do-auto-fill): New function. + Like `do-auto-fill' but don't fill when in the message header. (message-setup-1): Put a text property on the message header. (message-setup-fill-variables): Use `message-do-auto-fill'. @@ -13063,8 +13054,8 @@ 2001-10-10 Katsumi Yamaoka - * gnus-group.el (gnus-group-name-charset-group-alist): Use - `find-coding-system' for XEmacs to check whether the coding-system + * gnus-group.el (gnus-group-name-charset-group-alist): + Use `find-coding-system' for XEmacs to check whether the coding-system `utf-8' is available. 2001-10-09 Per Abrahamsen @@ -13074,8 +13065,8 @@ 2001-10-09 Per Abrahamsen - * message.el (message-send-news): Allow - `gnus-group-name-charset-group-alist' to affect encoding of the + * message.el (message-send-news): + Allow `gnus-group-name-charset-group-alist' to affect encoding of the "Newsgroups" and "Followup-To" headers. 2001-10-07 Per Abrahamsen @@ -13096,7 +13087,7 @@ default charset for newsgroup names in accordance with USEFOR. * gnus-group.el (gnus-group-name-charset-method-alist, - gnus-group-name-charset-group-alist): Removed "*" from doc + gnus-group-name-charset-group-alist): Remove "*" from doc strings, "*" should not be used for complex variables. 2001-10-06 Simon Josefsson @@ -13110,18 +13101,18 @@ `gnus-article-decode-hook's except `article-decode-charset' instead of hardcoding call to one of them. - * gnus-art.el (gnus-article-decode-hook): Add - `article-decode-group-name'. + * gnus-art.el (gnus-article-decode-hook): + Add `article-decode-group-name'. (article-decode-group-name): New function, use `g-d-n'. - * gnus-group.el (gnus-group-insert-group-line): Decode - gnus-tmp-group using `g-d-n'. + * gnus-group.el (gnus-group-insert-group-line): + Decode gnus-tmp-group using `g-d-n'. * gnus-util.el (gnus-decode-newsgroups): New function. 2001-10-06 Per Abrahamsen - * gnus-srvr.el (gnus-browse-foreign-server): Fixed bug non-nil + * gnus-srvr.el (gnus-browse-foreign-server): Fix bug non-nil `gnus-group-name-charset-group-alist'. 2001-10-05 Simon Josefsson @@ -13283,8 +13274,8 @@ 2001-09-19 Sam Steingold - * gnus-win.el (gnus-buffer-configuration): Respect - `gnus-bug-create-help-buffer'. + * gnus-win.el (gnus-buffer-configuration): + Respect `gnus-bug-create-help-buffer'. 2001-09-18 Simon Josefsson @@ -13338,7 +13329,7 @@ 2001-09-14 Simon Josefsson - * gnus-start.el (gnus-group-mode-hook): Moved from gnus-group + * gnus-start.el (gnus-group-mode-hook): Move from gnus-group (otherwise e.g. gnus-agentize in .gnus overrides the customized default before gnus-group is loaded and the variable set.) @@ -13369,11 +13360,11 @@ * nndiary.el (nndiary-request-accept-article-hooks): New. * nndiary.el (nndiary-request-accept-article): Use it, check message validity. - * nndiary.el (nndiary-get-new-mail): Changed default to nil. + * nndiary.el (nndiary-get-new-mail): Change default to nil. * nndiary.el (nndiary-schedule): Fix bug (misplaced condition-case): it didn't return nil on error. * gnus-diary.el: New version. - * gnus-diary.el (gnus-diary-summary-line-format): Removed %I. + * gnus-diary.el (gnus-diary-summary-line-format): Remove %I. * gnus-diary.el (gnus-diary-header-value-history): New. * gnus-diary.el (gnus-diary-narrow-to-headers): New. * gnus-diary.el (gnus-diary-add-header): New. @@ -13383,11 +13374,11 @@ 2001-09-10 TSUCHIYA Masatoshi - * gnus-sum.el (gnus-select-newsgroup): Make - `gnus-current-select-method' buffer-local. + * gnus-sum.el (gnus-select-newsgroup): + Make `gnus-current-select-method' buffer-local. - * gnus-art.el (gnus-request-article-this-buffer): Refer - `gnus-current-select-method' in the current summary buffer. + * gnus-art.el (gnus-request-article-this-buffer): + Refer `gnus-current-select-method' in the current summary buffer. 2001-09-10 Daniel Pittman @@ -13395,10 +13386,10 @@ 2001-09-09 Simon Josefsson - * mm-decode.el (mm-inline-media-tests): Add - application/x-emacs-lisp. - (mm-attachment-override-types): Add - application/{x-,}pkcs7-signature. + * mm-decode.el (mm-inline-media-tests): + Add application/x-emacs-lisp. + (mm-attachment-override-types): + Add application/{x-,}pkcs7-signature. * gnus-srvr.el (gnus-server-mode-hook, gnus-server-exit-hook) (gnus-server-line-format, gnus-server-mode-line-format) @@ -13431,8 +13422,8 @@ (nnml-request-update-info): Don't update if marks didn't change. * gnus-agent.el (gnus-agent-any-covered-gcc) - (gnus-agent-add-server, gnus-agent-remove-server): Use - gnus-agent-method-p. + (gnus-agent-add-server, gnus-agent-remove-server): + Use gnus-agent-method-p. * gnus-art.el (gnus-buttonized-mime-types): New variable. (gnus-unbuttonized-mime-type-p): Use it. @@ -13634,8 +13625,8 @@ * gnus-spec.el (gnus-compile): Don't compile gnus-version. - * gnus-group.el (gnus-update-group-mark-positions): Bind - gnus-group-update-hook to nil. + * gnus-group.el (gnus-update-group-mark-positions): + Bind gnus-group-update-hook to nil. 2001-08-24 13:00:00 ShengHuo ZHU @@ -13655,8 +13646,8 @@ 2001-08-24 Simon Josefsson - * gnus-group.el (gnus-info-clear-data): Call - nnfoo-request-set-mark to propagate marks. Fix bug: + * gnus-group.el (gnus-info-clear-data): + Call nnfoo-request-set-mark to propagate marks. Fix bug: `gnus-group-update-line' doesn't update read range unless we call `gnus-get-unread-articles-in-group' first. @@ -13732,8 +13723,8 @@ 2001-08-20 15:00:00 ShengHuo ZHU - * nnslashdot.el (nnslashdot-retrieve-headers-1): Replace - nnslashdot-*-retrieve-headers. + * nnslashdot.el (nnslashdot-retrieve-headers-1): + Replace nnslashdot-*-retrieve-headers. (nnslashdot-request-article): Fix for slashcode 2.2. (nnslashdot-make-tuple): New function. (nnslashdot-read-groups): Use it. @@ -13775,15 +13766,15 @@ * mm-view.el (mm-inline-text): Ignore vcard errors. - * gnus-art.el (gnus-ignored-headers): Added more junk headers. + * gnus-art.el (gnus-ignored-headers): Add more junk headers. * gnus-score.el (gnus-all-score-files): Use append instead of nconc. * gnus.el (gnus-splash-face): Doc fix. - * mm-decode.el (mm-mailcap-command): Use - mm-path-name-rewrite-functions. + * mm-decode.el (mm-mailcap-command): + Use mm-path-name-rewrite-functions. (mm-path-name-rewrite-functions): New variable. * gnus-spec.el (gnus-parse-complex-format): React to ?=. @@ -13797,10 +13788,10 @@ the positional spec. (gnus-parse-complex-format): React to %C. - * gnus-ems.el (gnus-char-width): Moved here. + * gnus-ems.el (gnus-char-width): Move here. - * gnus-sum.el (gnus-select-newsgroup): Set - gnus-newsgroup-articles. + * gnus-sum.el (gnus-select-newsgroup): + Set gnus-newsgroup-articles. (gnus-unseen-mark): New variable. (gnus-newsgroup-unseen): Ditto. (gnus-newsgroup-seen): Ditto. @@ -13858,15 +13849,15 @@ 2001-08-18 Simon Josefsson - * gnus-util.el (gnus-remassoc, gnus-update-alist-soft): Moved from + * gnus-util.el (gnus-remassoc, gnus-update-alist-soft): Move from nnimap. - * nnimap.el (nnimap-remassoc, nnimap-update-alist-soft): Moved to + * nnimap.el (nnimap-remassoc, nnimap-update-alist-soft): Move to gnus-util. (nnimap-request-update-info-internal): Use new functions. - * nnml.el (nnml-request-set-mark, nnml-request-update-info): Use - new functions. + * nnml.el (nnml-request-set-mark, nnml-request-update-info): + Use new functions. 2001-08-18 Simon Josefsson @@ -13963,7 +13954,7 @@ * gnus-start.el (gnus-setup-news): Push the archive server only the server list. - * mml.el (mml-menu): Changed name to "Attachments". + * mml.el (mml-menu): Change name to "Attachments". * mm-decode.el (mm-destroy-postponed-undisplay-list): Only message when there is something to destroy. @@ -13999,8 +13990,8 @@ `nnmail-split-history' if recent is > 0. (nnimap-request-update-info-internal): Update `recent' marks. (nnimap-request-set-mark): Never set `recent' marks. - (nnimap-mark-to-predicate-alist, nnimap-mark-to-flag-alist): Add - recent. + (nnimap-mark-to-predicate-alist, nnimap-mark-to-flag-alist): + Add recent. * gnus-sum.el (gnus-recent-mark): New mark. (gnus-newsgroup-recent): New variable. @@ -14013,8 +14004,8 @@ 2001-08-12 Simon Josefsson - * mm-bodies.el (mm-decode-content-transfer-encoding): Returns - whether successful decoding took place. Add doc. + * mm-bodies.el (mm-decode-content-transfer-encoding): + Returns whether successful decoding took place. Add doc. 2001-08-12 Simon Josefsson Suggested by Per Abrahamsen @@ -14051,8 +14042,8 @@ 2001-08-10 02:00:00 ShengHuo ZHU - * gnus-ml.el (turn-on-gnus-mailing-list-mode): Use - gnus-group-find-parameter. Suggested by Janne Rinta-Manty + * gnus-ml.el (turn-on-gnus-mailing-list-mode): + Use gnus-group-find-parameter. Suggested by Janne Rinta-Manty . * mail-source.el (mail-source-movemail): The error buffer is @@ -14065,8 +14056,8 @@ 2001-08-09 15:00:00 ShengHuo ZHU - * nndraft.el (nndraft-request-group): Use - nndraft-auto-save-file-name. + * nndraft.el (nndraft-request-group): + Use nndraft-auto-save-file-name. 2001-08-09 Simon Josefsson @@ -14091,8 +14082,8 @@ 2001-08-09 Simon Josefsson - * message.el (message-get-reply-headers): Fix string. Suggested by - Christoph Conrad . + * message.el (message-get-reply-headers): Fix string. + Suggested by Christoph Conrad . 2001-08-08 15:00:00 ShengHuo ZHU @@ -14107,8 +14098,8 @@ 2001-08-04 Nuutti Kotivuori - * gnus-sum.el (gnus-summary-show-article): Call - gnus-summary-update-secondary-secondary-mark. + * gnus-sum.el (gnus-summary-show-article): + Call gnus-summary-update-secondary-secondary-mark. * gnus-sum.el (gnus-summary-edit-article-done): Ditto. * gnus-sum.el (gnus-summary-reparent-thread): Ditto. @@ -14131,8 +14122,8 @@ 2001-08-06 Florian Weimer - * message.el (message-indent-citation): Use - `message-yank-cited-prefix' for empty lines. + * message.el (message-indent-citation): + Use `message-yank-cited-prefix' for empty lines. 2001-08-05 Florian Weimer @@ -14141,8 +14132,8 @@ 2001-08-05 Nuutti Kotivuori (tiny change) - * gnus-cache.el (gnus-cache-possibly-enter-article): Use - gnus-cache-fully-p. + * gnus-cache.el (gnus-cache-possibly-enter-article): + Use gnus-cache-fully-p. 2001-08-04 Simon Josefsson @@ -14152,7 +14143,7 @@ 2001-08-04 Simon Josefsson * gnus-cache.el (gnus-cache-possibly-enter-article): Revert. - (gnus-cache-passively-or-fully-p): Removed. + (gnus-cache-passively-or-fully-p): Remove. (gnus-cache-fully-p): Fix it. * mm-view.el (mm-pkcs7-signed-magic): Support more ASN.1 lengths. @@ -14180,8 +14171,8 @@ 2001-08-04 10:00:00 ShengHuo ZHU - * gnus-art.el (gnus-mime-security-verify-or-decrypt): Insert - before remove. + * gnus-art.el (gnus-mime-security-verify-or-decrypt): + Insert before remove. (gnus-mime-security-show-details): Ditto. 2001-08-04 Kai Großjohann @@ -14228,7 +14219,7 @@ 2001-08-02 Simon Josefsson - * smime.el (smime-extra-arguments): Removed. + * smime.el (smime-extra-arguments): Remove. (smime-call-openssl-region): Don't use it. 2001-08-02 Simon Josefsson @@ -14236,8 +14227,8 @@ * smime.el (smime-sign-region): Handle stderr. (smime-encrypt-region): Ditto. - * mm-view.el (mm-pkcs7-signed-magic): Make it a regexp. Don't - match the ASN.1 length bytes. + * mm-view.el (mm-pkcs7-signed-magic): Make it a regexp. + Don't match the ASN.1 length bytes. (mm-pkcs7-enveloped-magic): Ditto. (mm-view-pkcs7-get-type): Don't regexp quote. @@ -14305,8 +14296,8 @@ * smime.el (smime-call-openssl-region): Revert previous change, just pass on buf to `call-process-region'. - (smime-verify-region): Doc fix. Don't message stuff. Use - `smime-new-details-buffer'. Inserts error messages into buffer. + (smime-verify-region): Doc fix. Don't message stuff. + Use `smime-new-details-buffer'. Inserts error messages into buffer. (smime-noverify-region): Ditto. (smime-decrypt-region): Ditto. Handles stderr separately. (smime-verify-buffer, smime-noverify-buffer) @@ -14321,8 +14312,8 @@ 2001-07-30 12:00:00 ShengHuo ZHU - * gnus-art.el (gnus-mime-save-part-and-strip): Save - gnus-article-mime-handles. + * gnus-art.el (gnus-mime-save-part-and-strip): + Save gnus-article-mime-handles. 2001-07-29 Simon Josefsson @@ -14380,8 +14371,8 @@ * gnus.el (gnus-summary-line-format): Mention `gnus-sum-thread-*' for %B spec. - * gnus-sum.el (gnus-summary-prepare-threads): If - gnus-sum-thread-tree-root is nil, use subject instead. + * gnus-sum.el (gnus-summary-prepare-threads): + If gnus-sum-thread-tree-root is nil, use subject instead. (gnus-sum-thread-tree-root, gnus-sum-thread-tree-single-indent) (gnus-sum-thread-tree-vertical, gnus-sum-thread-tree-indent) (gnus-sum-thread-tree-leaf-with-other) @@ -14407,16 +14398,16 @@ 2001-07-27 12:00:00 ShengHuo ZHU - * nnfolder.el (nnfolder-request-accept-article): Bind - nntp-server-buffer. + * nnfolder.el (nnfolder-request-accept-article): + Bind nntp-server-buffer. * nnmail.el (nnmail-parse-active): Read from buffer instead of nntp-server-buffer. 2001-07-27 11:00:00 ShengHuo ZHU - * message.el (message-check-news-header-syntax): Use - message-post-method. + * message.el (message-check-news-header-syntax): + Use message-post-method. (message-send-news): Bind message-post-method. 2001-07-27 07:00:00 ShengHuo ZHU @@ -14428,8 +14419,8 @@ 2001-07-26 22:00:00 ShengHuo ZHU - * nnfolder.el (nnfolder-request-accept-article): Replace - nnfolder-request-list. + * nnfolder.el (nnfolder-request-accept-article): + Replace nnfolder-request-list. 2001-07-27 Simon Josefsson @@ -14444,8 +14435,8 @@ * gnus-art.el (gnus-mm-display-part): Narrow to point if eobp. - * message.el (message-set-auto-save-file-name): More - poor-system-types. + * message.el (message-set-auto-save-file-name): + More poor-system-types. * mailcap.el (mailcap-parse-mimetypes): poor-system-types. @@ -14489,8 +14480,8 @@ 2001-07-25 22:22:22 Raymond Scholz - * nnmail.el (nnmail-split-fancy-with-parent-ignore-groups): New - variable. + * nnmail.el (nnmail-split-fancy-with-parent-ignore-groups): + New variable. (nnmail-split-fancy-with-parent): Ignore certain groups. 2001-07-25 11:00:00 ShengHuo ZHU @@ -14574,8 +14565,8 @@ 2001-07-23 Katsumi Yamaoka - * gnus-start.el (gnus-setup-news): Call - `gnus-check-bogus-newsgroups' just after the native server is + * gnus-start.el (gnus-setup-news): + Call `gnus-check-bogus-newsgroups' just after the native server is opened. 2001-07-23 Kai Großjohann @@ -14614,8 +14605,8 @@ * mm-util.el (mm-read-coding-system): Take two arguments. - * gnus-sum.el (gnus-summary-show-article): Use - mm-read-coding-system. + * gnus-sum.el (gnus-summary-show-article): + Use mm-read-coding-system. * gnus-art.el (article-de-quoted-unreadable): (article-de-base64-unreadable, article-wash-html): @@ -14631,8 +14622,8 @@ * nntp.el (nntp-request-newgroups): Use UTC date for NEWGROUPS command. - * gnus-start.el (gnus-find-new-newsgroups): Use - `message-make-date' instead of `current-time-string'. + * gnus-start.el (gnus-find-new-newsgroups): + Use `message-make-date' instead of `current-time-string'. (gnus-ask-server-for-new-groups): Ditto. (gnus-check-first-time-used): Ditto. @@ -14757,7 +14748,7 @@ 2001-07-12 Björn Torkelsson - * gnus-srvr.el (gnus-browse-make-menu-bar): Changed one of the + * gnus-srvr.el (gnus-browse-make-menu-bar): Change one of the Browse->Next entries to Browse->Prev. 2001-07-11 22:00:00 ShengHuo ZHU @@ -15078,8 +15069,8 @@ 2001-06-15 09:00:00 ShengHuo ZHU - * gnus-art.el (article-strip-multiple-blank-lines): Use - delete-region instead of replace-match. + * gnus-art.el (article-strip-multiple-blank-lines): + Use delete-region instead of replace-match. 2001-06-14 16:00:00 ShengHuo ZHU @@ -15160,8 +15151,8 @@ 2001-06-05 Alex Schroeder - * mm-decode.el (mm-handle-set-external-undisplayer): Don't - generate compiler warnings. + * mm-decode.el (mm-handle-set-external-undisplayer): + Don't generate compiler warnings. 2001-06-04 Hrvoje Niksic @@ -15346,7 +15337,7 @@ 2001-04-25 Per Abrahamsen - * mm-uu.el (mm-uu-configure-list): Fixed customize type. + * mm-uu.el (mm-uu-configure-list): Fix customize type. 2001-04-24 Hrvoje Niksic @@ -15416,7 +15407,7 @@ 2001-04-02 Nevin Kapur - * nnmail.el (nnmail-split-it): Added check for .* at the end of + * nnmail.el (nnmail-split-it): Add check for .* at the end of regexp in nnmail-split-fancy. 2001-04-10 Simon Josefsson @@ -15545,8 +15536,8 @@ 2001-03-31 00:03:42 Lars Magne Ingebrigtsen - * gnus-msg.el (gnus-inews-insert-draft-meta-information): Allow - lists of articles. + * gnus-msg.el (gnus-inews-insert-draft-meta-information): + Allow lists of articles. * gnus-uu.el (gnus-uu-digest-mail-forward): Mark as forwarded. @@ -15563,7 +15554,7 @@ forwarded. (gnus-summary-mail-forward): Clean up. - * gnus.el (gnus-article-mark-lists): Added forward. + * gnus.el (gnus-article-mark-lists): Add forward. * gnus-sum.el (gnus-forwarded-mark): New variable. (gnus-summary-prepare-threads): Use it. @@ -15593,14 +15584,14 @@ 2001-03-15 09:47:23 Lars Magne Ingebrigtsen - * nnultimate.el (nnultimate-retrieve-headers): Understand - long-form month names. + * nnultimate.el (nnultimate-retrieve-headers): + Understand long-form month names. 2001-03-18 23:00:00 ShengHuo ZHU * gnus-sum.el (gnus-summary-show-all-headers): - gnus-article-show-all-headers is broken. Use - gnus-summary-toggle-header instead. + gnus-article-show-all-headers is broken. + Use gnus-summary-toggle-header instead. * mml2015.el (mml2015-gpg-extract-from): No error. @@ -15612,8 +15603,8 @@ 2001-03-17 10:00:00 ShengHuo ZHU - * message.el (message-setup-fill-variables): Use - fill-paragraph-function. + * message.el (message-setup-fill-variables): + Use fill-paragraph-function. (message-fill-paragraph): Take an argument. (message-newline-and-reformat): Take another argument. @@ -15628,7 +15619,7 @@ 2001-03-16 Simon Josefsson - * nnimap.el (nnimap-dont-use-nov-p): Renamed from + * nnimap.el (nnimap-dont-use-nov-p): Rename from `nnimap-use-nov-p' (it really tested the negative). (nnimap-retrieve-headers): Use it. @@ -15669,8 +15660,8 @@ ;; 2001-03-01 Dave Love - * mm-util.el (mm-inhibit-file-name-handlers): Add - image-file-handler. + * mm-util.el (mm-inhibit-file-name-handlers): + Add image-file-handler. 2001-02-11 Dave Love @@ -15704,8 +15695,8 @@ * gnus-score.el (gnus-score-find-bnews): Print messages on illegal SCORE paths. - * mm-decode.el (mm-dissect-buffer): Call - mail-extract-address-components only if necessary. + * mm-decode.el (mm-dissect-buffer): + Call mail-extract-address-components only if necessary. 2001-03-06 13:00:00 ShengHuo ZHU @@ -15715,8 +15706,8 @@ 2001-03-06 13:00:00 Adrian Aichner - * gnus-score.el (gnus-score-score-files-1): Use - gnus-kill-files-directory. + * gnus-score.el (gnus-score-score-files-1): + Use gnus-kill-files-directory. 2001-03-05 08:00:00 ShengHuo ZHU @@ -15726,8 +15717,8 @@ * mml.el (mml-preview): Disable local map. - * gnus-sum.el (gnus-summary-make-menu-bar): Make - gnus-article-post-menu here. + * gnus-sum.el (gnus-summary-make-menu-bar): + Make gnus-article-post-menu here. * gnus-art.el (gnus-article-make-menu-bar): Make summary-menu bar if it has not been made. @@ -15824,8 +15815,8 @@ * smiley.el (gnus-smiley-display): Don't do widening. - * smiley-ems.el (gnus-smiley-display): Don't do widening. Smiley - within body. + * smiley-ems.el (gnus-smiley-display): Don't do widening. + Smiley within body. * gnus-msg.el (gnus-inews-do-gcc): Activate group anyway. @@ -15911,7 +15902,7 @@ 2001-02-14 15:00:00 ShengHuo ZHU - * gnus.el (gnus-define-group-parameter): Improved. + * gnus.el (gnus-define-group-parameter): Improve. * gnus-sum.el (charset): Define parameter. (ignored-charsets): Ditto. @@ -15927,8 +15918,8 @@ 2001-02-13 21:00:00 ShengHuo ZHU - * gnus-sum.el (gnus-summary-read-group-1): Remove - gnus-summary-set-local-parameters. + * gnus-sum.el (gnus-summary-read-group-1): + Remove gnus-summary-set-local-parameters. (gnus-summary-setup-buffer): Put it here. 2001-02-13 20:00:00 ShengHuo ZHU @@ -15980,8 +15971,8 @@ (article-remove-leading-whitespace): New function. (gnus-article-make-menu-bar): Use it. - * gnus-sum.el (gnus-summary-wash-empty-map): Add - remove-leading-whitespace. + * gnus-sum.el (gnus-summary-wash-empty-map): + Add remove-leading-whitespace. (gnus-summary-wash-map): Bind strip-headers-in-body to `W a', because of conflict. @@ -16012,13 +16003,13 @@ 2001-02-08 Tommi Vainikainen (tiny change) - * gnus-sum.el (gnus-simplify-subject-re): Use - message-subject-re-regexp. + * gnus-sum.el (gnus-simplify-subject-re): + Use message-subject-re-regexp. 2001-02-08 18:00:00 ShengHuo ZHU - * nnmail.el (nnmail-expiry-target-group): Bind - nnmail-cache-accepted-message-ids to nil. + * nnmail.el (nnmail-expiry-target-group): + Bind nnmail-cache-accepted-message-ids to nil. * gnus-xmas.el (gnus-xmas-article-display-xface): Use binary coding system. @@ -16072,34 +16063,34 @@ 2001-02-06 02:00:00 ShengHuo ZHU - * gnus-xmas.el (gnus-xmas-article-menu-add): Add - gnus-article-commands-menu. + * gnus-xmas.el (gnus-xmas-article-menu-add): + Add gnus-article-commands-menu. * gnus-sum.el (gnus-summary-make-menu-bar): Don't share menu bar in Emacs. - * gnus-start.el (gnus-read-descriptions-file): Use - gnus-group-name-charset and gnus-group-charset-alist. + * gnus-start.el (gnus-read-descriptions-file): + Use gnus-group-name-charset and gnus-group-charset-alist. 2001-02-04 23:00:00 ShengHuo ZHU - * gnus-sum.el (gnus-summary-mark-as-processable): Understand - active region. + * gnus-sum.el (gnus-summary-mark-as-processable): + Understand active region. * gnus-start.el (gnus-group-change-level): Remove from both gnus-zombie-list and gnus-killed-list. 2001-02-04 11:00:00 ShengHuo ZHU - * gnus-start.el (gnus-subscribe-options-newsgroup-method): Add - gnus-subscribe-topics. + * gnus-start.el (gnus-subscribe-options-newsgroup-method): + Add gnus-subscribe-topics. * gnus-cus.el (gnus-extra-topic-parameters): Fix doc. 2001-02-04 11:00:00 ShengHuo ZHU - * gnus-art.el (gnus-article-make-menu-bar): Make - gnus-article-post-menu. + * gnus-art.el (gnus-article-make-menu-bar): + Make gnus-article-post-menu. * gnus-xmas.el (gnus-xmas-article-menu-add): Add post menu. @@ -16131,8 +16122,8 @@ 2001-01-31 Dave Love * gnus-art.el (gnus-article-x-face-command) - (gnus-treat-display-xface, gnus-treat-display-smileys): Add - :version. + (gnus-treat-display-xface, gnus-treat-display-smileys): + Add :version. 2001-01-26 Dave Love @@ -16170,7 +16161,7 @@ 2001-01-31 Karl Kleinpaste - * nnmail.el (nnmail-remove-list-identifiers): Improved. + * nnmail.el (nnmail-remove-list-identifiers): Improve. 2001-01-31 09:00:00 ShengHuo ZHU @@ -16317,8 +16308,8 @@ 2001-01-18 18:00:00 ShengHuo ZHU - * message.el (message-yank-original): Understand - universal-argument. + * message.el (message-yank-original): + Understand universal-argument. 2001-01-18 16:00:00 ShengHuo ZHU @@ -16349,8 +16340,8 @@ 2001-01-15 16:00:00 ShengHuo ZHU - * gnus-art.el (article-display-x-face): Use - gnus-original-article-buffer. + * gnus-art.el (article-display-x-face): + Use gnus-original-article-buffer. 2001-01-15 Jack Twilley @@ -16408,8 +16399,8 @@ (message-make-forward-subject-function) (message-send-mail-function, message-reply-to-function) (message-wide-reply-to-function, message-followup-to-function) - (message-distribution-function, message-auto-save-directory): Fix - :type. + (message-distribution-function, message-auto-save-directory): + Fix :type. * mml.el (mml-parse-1): Frob mml-confirmation-set when proceeding after warnings. Amend multipart warning message. @@ -16420,8 +16411,8 @@ compiling. (gnus-make-directory): Require nnmail. - * mm-decode.el (mm-inline-media-tests): Add - image/x-portable-bitmap. + * mm-decode.el (mm-inline-media-tests): + Add image/x-portable-bitmap. (mm-get-image): Grok pbm. 2001-01-10 Paul Stevenson @@ -16574,8 +16565,8 @@ 2000-12-30 00:17:38 Lars Magne Ingebrigtsen - * gnus-sum.el (gnus-summary-limit-include-expunged): Really - include the expunged articles. + * gnus-sum.el (gnus-summary-limit-include-expunged): + Really include the expunged articles. * gnus-group.el (gnus-group-sort-by-server): New function. @@ -16595,7 +16586,7 @@ * gnus-cite.el (gnus-article-fill-cited-article): Add a space after the fill prefix. - * gnus-sum.el (gnus-summary-make-menu-bar): Removed "Enter + * gnus-sum.el (gnus-summary-make-menu-bar): Remove "Enter score...". * gnus-art.el (gnus-ignored-headers): Hide more headers. @@ -16612,12 +16603,12 @@ 2000-12-29 01:00:00 ShengHuo ZHU - * mm-util.el (mm-enable-multibyte): Use - default-enable-multibyte-characters. + * mm-util.el (mm-enable-multibyte): + Use default-enable-multibyte-characters. (mm-enable-multibyte-mule4): Ditto. (mm-disable-multibyte): Test XEmacs. (mm-disable-multibyte-mule4): Ditto. - (mm-with-unibyte-current-buffer): Simplified. + (mm-with-unibyte-current-buffer): Simplify. (mm-with-unibyte-current-buffer-mule4): Ditto. 2000-12-28 19:44:56 Lars Magne Ingebrigtsen @@ -16672,8 +16663,8 @@ 2000-12-24 Simon Josefsson - * mm-bodies.el (mm-decode-content-transfer-encoding): Preserve - mailing list junk at end of part. + * mm-bodies.el (mm-decode-content-transfer-encoding): + Preserve mailing list junk at end of part. 2000-12-23 Simon Josefsson @@ -16768,7 +16759,7 @@ * mml.el (gnus-ems): Don't require. - * gnus.el (gnus-decode-rfc1522): Removed. + * gnus.el (gnus-decode-rfc1522): Remove. (gnus-set-text-properties): Define. 2000-12-21 09:00:00 ShengHuo ZHU @@ -16791,8 +16782,8 @@ 2000-12-20 17:00:00 ShengHuo ZHU * message.el (message-mail-user-agent): New variable. - (message-setup): Renamed to message-setup-1. Support - mail-user-agent. + (message-setup): Rename to message-setup-1. + Support mail-user-agent. (message-mail-user-agent): New function. (message-mail): Use it. (message-reply): Use it. @@ -16845,8 +16836,8 @@ 2000-12-20 03:00:00 ShengHuo ZHU - * mm-decode.el (mm-possibly-verify-or-decrypt): Use - mail-extract-a-c instead. Don't depend on Gnus. + * mm-decode.el (mm-possibly-verify-or-decrypt): + Use mail-extract-a-c instead. Don't depend on Gnus. * mml.el (gnus-ems): Require it. @@ -16959,11 +16950,11 @@ 2000-11-30 Dave Love - * message.el (message-auto-save-directory): Use - file-name-as-directory. - (message-set-auto-save-file-name): Create - message-auto-save-directory if necessary. - (message-replace-chars-in-string): Removed -- unused. + * message.el (message-auto-save-directory): + Use file-name-as-directory. + (message-set-auto-save-file-name): + Create message-auto-save-directory if necessary. + (message-replace-chars-in-string): Remove -- unused. (message-mail-alias-type): Customize. (message-headers): Remove duplicate defgroup. @@ -16990,8 +16981,8 @@ * uu-post.pbm, uu-decode.pbm: New files from XPMs. * mm-uu.el (uudecode): Require. - (uudecode-decode-region, uudecode-decode-region-external): Don't - autoload. + (uudecode-decode-region, uudecode-decode-region-external): + Don't autoload. (mm-uu-copy-to-buffer): Doc fix. (mm-uu-decode-function, mm-uu-binhex-decode-function): Doc, custom type fix. @@ -17001,7 +16992,7 @@ (mailcap): New group. (mailcap-download-directory): Customize. (mailcap-generate-unique-filename, mailcap-binary-suffixes) - (mailcap-temporary-directory): Deleted (unused). + (mailcap-temporary-directory): Delete (unused). (mailcap-unescape-mime-test): Simplify slightly. (mailcap-viewer-passes-test): Use functionp. (mailcap-command-p): Aliased to executable-find. @@ -17039,11 +17030,11 @@ * gnus-agent.el (gnus-agent-confirmation-function): Add :version. (gnus-agent-lib-file, gnus-agent-load-alist) - (gnus-agent-save-alist, gnus-agent-article-name): Use - expand-file-name. + (gnus-agent-save-alist, gnus-agent-article-name): + Use expand-file-name. - * gnus-group.el (gnus-group-name-charset-method-alist): Add - :version. + * gnus-group.el (gnus-group-name-charset-method-alist): + Add :version. (nnkiboze-score-file): Defvar when compiling. * gnus-start.el (gnus-read-newsrc-file): Add :version. @@ -17075,8 +17066,8 @@ * gnus-cache.el (gnus-cache-active-file): Don't use file-name-as-directory on directory. - (gnus-cache-file-name): Use expand-file-name, not concat. Don't - use file-name-as-directory on directory. + (gnus-cache-file-name): Use expand-file-name, not concat. + Don't use file-name-as-directory on directory. * time-date.el (timezone-make-date-arpa-standard): Autoload. (date-to-time): Use it. @@ -17098,7 +17089,7 @@ * gnus-int.el (gnus-start-news-server): Use expand-file-name, not concat. - * pop3.el (pop3-version): Deleted. + * pop3.el (pop3-version): Delete. (pop3-make-date): New function, avoiding message-make-date. (pop3-munge-message-separator): Use it. @@ -17114,12 +17105,12 @@ * message.el (tool-bar-map): Defvar when compiling. * gnus-setup.el (running-xemacs, gnus-use-installed-tm) - (gnus-tm-lisp-directory): Deleted. - (gnus-use-installed-mailcrypt, gnus-emacs-lisp-directory): Use - (featurep 'xemacs). + (gnus-tm-lisp-directory): Delete. + (gnus-use-installed-mailcrypt, gnus-emacs-lisp-directory): + Use (featurep 'xemacs). (gnus-gnus-lisp-directory, gnus-mailcrypt-lisp-directory) - (gnus-mailcrypt-lisp-directory, gnus-bbdb-lisp-directory): Remove - version numbers from file names. + (gnus-mailcrypt-lisp-directory, gnus-bbdb-lisp-directory): + Remove version numbers from file names. 2000-11-08 Dave Love @@ -17220,8 +17211,8 @@ * rfc2047.el (base64): Require unconditionally. (message-posting-charset): Defvar when compiling. - (rfc2047-encode-message-header, rfc2047-encodable-p): Require - message. + (rfc2047-encode-message-header, rfc2047-encodable-p): + Require message. * gnus-sum.el (nnoo): Require. (mm-uu-dissect): Autoload. @@ -17318,8 +17309,8 @@ 2000-10-09 Dave Love - * mail-source.el (mail-source-fetch-imap): Bind - default-enable-multibyte-characters rather than using + * mail-source.el (mail-source-fetch-imap): + Bind default-enable-multibyte-characters rather than using mm-disable-multibyte. 2000-10-05 Dave Love @@ -17356,8 +17347,8 @@ 2000-10-04 Dave Love - * smiley-ems.el (smiley-regexp-alist, smiley-update-cache): Use - pbm images. + * smiley-ems.el (smiley-regexp-alist, smiley-update-cache): + Use pbm images. * frown.pbm, smile.pbm, wry.pbm: New files. @@ -17452,7 +17443,7 @@ 2000-12-15 10:00:00 ShengHuo ZHU * pop3.el (pop3-movemail): Use binary. - (pop3-movemail-file-coding-system): Removed. + (pop3-movemail-file-coding-system): Remove. 2000-12-14 13:00:00 ShengHuo ZHU @@ -17512,8 +17503,8 @@ 2000-12-04 18:00:00 ShengHuo ZHU - * mail-source.el (mail-source-report-new-mail): Use - nnheader-run-at-time. + * mail-source.el (mail-source-report-new-mail): + Use nnheader-run-at-time. 2000-02-15 Andrew Innes @@ -17557,8 +17548,8 @@ 2000-12-01 Simon Josefsson - * mml-smime.el (mml-smime-verify): Don't modify MM buffer. Handle - more than one certificate inside PKCS#7 blob. Better security + * mml-smime.el (mml-smime-verify): Don't modify MM buffer. + Handle more than one certificate inside PKCS#7 blob. Better security information (clamed / actual sender, openssl output, certificates inside message). @@ -17567,8 +17558,8 @@ 2000-11-30 23:00:00 ShengHuo ZHU - * gnus-art.el (gnus-mime-security-button-line-format-alist): Add - ?d and ?D. + * gnus-art.el (gnus-mime-security-button-line-format-alist): + Add ?d and ?D. (gnus-mime-security-show-details-inline): New variable. (gnus-mime-security-show-details): Use them. (gnus-insert-mime-security-button): Ditto. @@ -17614,8 +17605,8 @@ 2000-11-22 Jan Nieuwenhuizen - * nnmh.el (nnmh-request-expire-articles): Implemented - expiry-target for nnmh backend. + * nnmh.el (nnmh-request-expire-articles): + Implemented expiry-target for nnmh backend. 2000-11-30 Simon Josefsson @@ -17681,8 +17672,8 @@ 2000-11-22 11:00:00 ShengHuo ZHU - * gnus-xmas.el (gnus-xmas-article-display-xface): Use - insert-buffer-substring. + * gnus-xmas.el (gnus-xmas-article-display-xface): + Use insert-buffer-substring. * message.el (message-send-mail): Use buffer-substring-no-properties. (message-send-news): Ditto. @@ -17777,13 +17768,13 @@ * mml-sec.el (mml-sign-alist): Update names. (mml-encrypt-alist): Ditto. - (mml-secure-part-smime-sign): Moved to mml-smime.el + (mml-secure-part-smime-sign): Move to mml-smime.el as `mml-smime-sign-query'. - (mml-secure-part-smime-encrypt-by-file): Moved to mml-smime.el as + (mml-secure-part-smime-encrypt-by-file): Move to mml-smime.el as `mml-smime-get-file-cert'. - (mml-secure-part-smime-encrypt-by-dns): Moved to mml-smime.el as + (mml-secure-part-smime-encrypt-by-dns): Move to mml-smime.el as `mml-smime-get-dns-cert'. - (mml-secure-part-smime-encrypt): Moved to mml-smime.el as + (mml-secure-part-smime-encrypt): Move to mml-smime.el as `mml-smime-encrypt-query'. (mml-smime-sign-buffer): Use mml-smime-sign. (mml-smime-encrypt-buffer): Use mml-smime-encrypt. @@ -17793,7 +17784,7 @@ (mml-smime-sign-query): (mml-smime-get-file-cert): (mml-smime-get-dns-cert): - (mml-smime-encrypt-query): Moved from mml-sec.el. + (mml-smime-encrypt-query): Move from mml-sec.el. 2000-11-16 Simon Josefsson @@ -17802,8 +17793,8 @@ 2000-11-17 14:21 ShengHuo ZHU - * message.el (message-setup-fill-variables): Use - message-cite-prefix-regexp. + * message.el (message-setup-fill-variables): + Use message-cite-prefix-regexp. (message-newline-and-reformat): Check the end of citation, leading WSP, break in the cite prefix. (message-fill-paragraph): New function. @@ -17844,8 +17835,8 @@ 2000-11-12 David Edmondson - * message.el (message-font-lock-keywords): Use - message-cite-prefix-regexp. + * message.el (message-font-lock-keywords): + Use message-cite-prefix-regexp. 2000-11-15 Kai Großjohann @@ -17939,15 +17930,15 @@ 2000-11-12 David Edmondson - * message.el (message-cite-prefix-regexp): Moved from gnus-cite.el + * message.el (message-cite-prefix-regexp): Move from gnus-cite.el and replace `.' with `\w' to allow for different syntax tables (from Vladimir Volovich). - * message.el (message-newline-and-reformat): Use - `message-cite-prefix-regexp'. - * gnus-cite.el (gnus-supercite-regexp): Use - `message-cite-prefix-regexp'. - * gnus-cite.el (gnus-cite-parse): Use - `message-cite-prefix-regexp'. + * message.el (message-newline-and-reformat): + Use `message-cite-prefix-regexp'. + * gnus-cite.el (gnus-supercite-regexp): + Use `message-cite-prefix-regexp'. + * gnus-cite.el (gnus-cite-parse): + Use `message-cite-prefix-regexp'. 2000-11-12 08:52:46 ShengHuo ZHU @@ -18124,8 +18115,8 @@ Verify S/MIME signature support. - * mm-decode.el (mm-inline-media-tests): Add - application/{x-,}pkcs7-signature. + * mm-decode.el (mm-inline-media-tests): + Add application/{x-,}pkcs7-signature. (mm-inlined-types): Ditto. (mm-automatic-display): Ditto. (mm-verify-function-alist): Ditto. Add name of method. @@ -18337,8 +18328,8 @@ * qp.el (quoted-printable-encode-region): Replace leading - when ultra safe. - * mml.el (mml-generate-mime-postprocess-function): Removed. - (mml-postprocess-alist): Removed. + * mml.el (mml-generate-mime-postprocess-function): Remove. + (mml-postprocess-alist): Remove. (mml-generate-mime-1): Use ultra-safe when sign. * mml2015.el (mml2015-fix-micalg): Uppercase. (mml2015-verify): Insert LF. @@ -18366,14 +18357,14 @@ 2000-10-30 08:17:46 ShengHuo ZHU - * gnus.el (gnus-server-browse-hashtb): Removed. + * gnus.el (gnus-server-browse-hashtb): Remove. * gnus-group.el (gnus-group-prepare-flat-list-dead): Use gnus-active. (gnus-group-insert-group-line-info): Use simplified method. * gnus-srvr.el (gnus-browse-foreign-server): Use gnus-set-active. 2000-10-30 01:52:40 ShengHuo ZHU - * gnus-util.el (gnus-union): Renamed from gnus-agent-union, and + * gnus-util.el (gnus-union): Rename from gnus-agent-union, and moved here. * gnus-agent.el (gnus-agent-fetch-headers): Use it. * gnus-group.el (gnus-group-prepare-flat): Use it. @@ -18450,9 +18441,9 @@ * mml-sec.el (mml-smime-encrypt-buffer): Support certfiles stored in buffers. - (mml-secure-dns-server): Removed. - (mml-secure-part-smime-encrypt-by-dns): Use DIG interface. Don't - write certificates to files. + (mml-secure-dns-server): Remove. + (mml-secure-part-smime-encrypt-by-dns): Use DIG interface. + Don't write certificates to files. * smime.el (smime-dns-server): New variable. (smime-mail-to-domain): === modified file 'src/ChangeLog.8' --- src/ChangeLog.8 2014-01-26 00:47:40 +0000 +++ src/ChangeLog.8 2014-08-28 22:18:39 +0000 @@ -73,8 +73,8 @@ * msdos.c (dos_set_window_size) [__DJGPP__ > 1]: If the frame dimensions changed, invalidate the mouse highlight info. - (disable_mouse_highlight, help_echo, previous_help_echo): New - variables. + (disable_mouse_highlight, help_echo, previous_help_echo): + New variables. (IT_set_mouse_pointer, show_mouse_face, clear_mouse_face) (fast_find_position, IT_note_mode_line_highlight) (IT_note_mouse_highlight): New functions. @@ -89,8 +89,8 @@ (internal_terminal_init): Initialize mouse-highlight related members of the_only_x_display. Assign IT_frame_up_to_date to frame_up_to_date_hook. - (dos_rawgetc): If the mouse moved, update mouse highlight. If - help_echo changed value, generate a HELP_EVENT event. + (dos_rawgetc): If the mouse moved, update mouse highlight. + If help_echo changed value, generate a HELP_EVENT event. (syms_of_msdos): Staticpro help_echo and previous_help_echo. * msdos.h (struct display_info): New. @@ -116,7 +116,7 @@ * lisp.h (GLYPH): Defined as `int', not `unsigned int'. Now the lowest 8 bits are single byte character code, the bits above are face ID. - (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the change + (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjust for the change above. (FAST_MAKE_GLYPH, FSST_GLYPH_FACE): Likewise. (GLYPH_MASK_REV_DIR, GLYPH_MASK_PADDING): Macros deleted. @@ -131,20 +131,20 @@ level members. Change members in union `u'. (GLYPH_EQUAL_P): Check also members face_id and padding_p. (GLYPH_CHAR_AND_FACE_EQUAL_P): New macro. - (SET_CHAR_GLYPH): Adjusted for the change of struct glyph. + (SET_CHAR_GLYPH): Adjust for the change of struct glyph. (CHAR_GLYPH_PADDING_P): Likewise. (GLYPH_FROM_CHAR_GLYPH): Likewise. Always return -1 for multibyte characters. - * dispnew.c (line_hash_code, direct_output_for_insert): Adjusted - for the change of struct glyph. - (line_draw_cost): Adjusted for the change of + * dispnew.c (line_hash_code, direct_output_for_insert): + Adjust for the change of struct glyph. + (line_draw_cost): Adjust for the change of GLYPH_FROM_CHAR_GLYPH. (count_match): Use macro GLYPH_CHAR_AND_FACE_EQUAL_P. - * term.c (encode_terminal_code): Adjusted for the change of struct + * term.c (encode_terminal_code): Adjust for the change of struct glyph and GLYPH_FROM_CHAR_GLYPH. - (write_glyphs, insert_glyphs, append_glyph): Adjusted for the + (write_glyphs, insert_glyphs, append_glyph): Adjust for the change of struct glyph. * xdisp.c: All codes adjusted for the change of struct glyph. @@ -284,8 +284,8 @@ 1999-12-15 Kenichi Handa - The following changes are for the new composition mechanism. We - have deleted `composition' charset and composite characters, + The following changes are for the new composition mechanism. + We have deleted `composition' charset and composite characters, instead introduced a special text property `composition'. * Makefile.in (INTERVAL_SRC): Include composite.h. @@ -298,7 +298,7 @@ (keyboard.o) (textprop.o) (intervals.o): Depend on INTERVAL_SRC. (composite.o): New target. - * alloc.c (Fmake_string): Adjusted for the change of CHAR_STRING. + * alloc.c (Fmake_string): Adjust for the change of CHAR_STRING. * callproc.c (Fcall_process): Call code_convert_string to encode arguments. Use CODING_REQUIRE_DECODING to check if the process @@ -317,7 +317,7 @@ (Fmake_category_table): New function. (syms_of_category): Defsubr it. - * ccl.c (CCL_WRITE_CHAR): Adjusted for the change of CHAR_STRING. + * ccl.c (CCL_WRITE_CHAR): Adjust for the change of CHAR_STRING. (ccl_driver): Delete codes for a composite character. * charset.h: In this entry, just `Modified' means that codes for a @@ -326,49 +326,49 @@ (charset_composition) (MIN_CHAR_COMPOSITION) (MAX_CHAR_COMPOSITION) (GENERIC_COMPOSITION_CHAR) (COMPOSITE_CHAR_P) (MAKE_COMPOSITE_CHAR) (COMPOSITE_CHAR_ID) - (PARSE_COMPOSITE_SEQ) (PARSE_CHARACTER_SEQ): Deleted. + (PARSE_COMPOSITE_SEQ) (PARSE_CHARACTER_SEQ): Delete. (MAX_CHAR) (CHARSET_VALID_P) (CHARSET_DEFINED_P) (CHARSET_AT) (FIRST_CHARSET_AT) (SAME_CHARSET_P) (MAKE_NON_ASCII_CHAR) (PARSE_MULTIBYTE_SEQ) (SPLIT_NON_ASCII_CHAR) (CHAR_PRINTABLE_P): - Modified. + Modify. (SPLIT_STRING): Call split_string, not split_non_ascii_string. (CHAR_STRING): Delete WORKBUF argument. Call char_string, not non_ascii_char_to_string. (STRING_CHAR): Call string_to_char, not string_to_non_ascii_char. (STRING_CHAR_AND_LENGTH): Likewise. (FETCH_CHAR_ADVANCE): New macro. - (MAX_COMPONENT_COUNT) (struct cmpchar_info): Deleted. + (MAX_COMPONENT_COUNT) (struct cmpchar_info): Delete. (MAX_MULTIBYTE_LENGTH): New macro. - (MAX_LENGTH_OF_MULTI_BYTE_FORM): Deleted. + (MAX_LENGTH_OF_MULTI_BYTE_FORM): Delete. (find_charset_in_str): Argument adjusted. - (CHAR_LEN): Modified. + (CHAR_LEN): Modify. * charset.c: In this entry, just `Modified' means that codes for a composite character is deleted. (Qcomposition) (leading_code_composition) (charset_composition) (min_composite_char) (cmpchar_table) - (cmpchar_table_size) (n_cmpchars): Deleted. - (SPLIT_COMPOSITE_SEQ): Deleted. - (SPLIT_MULTIBYTE_SEQ): Modified. - (char_to_string): Renamed from non_ascii_char_to_string. + (cmpchar_table_size) (n_cmpchars): Delete. + (SPLIT_COMPOSITE_SEQ): Delete. + (SPLIT_MULTIBYTE_SEQ): Modify. + (char_to_string): Rename from non_ascii_char_to_string. Modified. - (string_to_char): Renamed from string_to_non_ascii_char. - (split_string): Renamed from split_non_ascii_string. + (string_to_char): Rename from string_to_non_ascii_char. + (split_string): Rename from split_non_ascii_string. (char_printable_p) (Fsplit_char) (Ffind_charset_region) (Ffind_charset_string) (char_valid_p) - (char_bytes) (Fchar_width) (strwidth): Modified. + (char_bytes) (Fchar_width) (strwidth): Modify. (find_charset_in_str): Argument CMPCHARP deleted. Modified. - (Fstring): Adjusted for the change of CHAR_STRING. Modified. + (Fstring): Adjust for the change of CHAR_STRING. Modified. (hash_string) (CMPCHAR_HASH_TABLE_SIZE) (cmpchar_hash_table) (CMPCHAR_HASH_SIZE) (CMPCHAR_HASH_USED) (CMPCHAR_HASH_CMPCHAR_ID) (str_cmpchar_id) (cmpchar_component) (Fcmpcharp) (Fcmpchar_component) (Fcmpchar_cmp_rule) (Fcmpchar_cmp_rule_p) - (Fcmpchar_cmp_count): Deleted. + (Fcmpchar_cmp_count): Delete. (Fcompose_string): Implemented by Emacs Lisp in composite.el. - (init_charset_once): Modified. - (syms_of_charset): Modified. + (init_charset_once): Modify. + (syms_of_charset): Modify. - * cmds.c (internal_self_insert): Adjusted for the change of + * cmds.c (internal_self_insert): Adjust for the change of CHAR_STRING. * coding.h (emacs_code_class_type): Delete the member @@ -377,8 +377,8 @@ (COMPOSING_WITH_RULE_TAIL) (COMPOSING_NO_RULE_TAIL) (COMPOSING_WITH_RULE_RULE) (COMPOSING_HEAD_P) (COMPOSING_WITH_RULE_P): Macros deleted. - (COMPOSITION_DATA_SIZE) (COMPOSITION_DATA_MAX_BUNCH_LENGTH): New - macros. + (COMPOSITION_DATA_SIZE) (COMPOSITION_DATA_MAX_BUNCH_LENGTH): + New macros. (struct composition_data): New structure. (CODING_FINISH_INSUFFICIENT_CMP): New macro. (struct coding_system): New members composition_rule_follows, @@ -395,7 +395,7 @@ EMACS_leading_code_composition to 0x80. (detect_coding_iso2022): Handle new composition sequence. (DECODE_ISO_CHARACTER): Likewise. - (check_composing_code): Deleted. + (check_composing_code): Delete. (coding_allocate_composition_data): New function. (CODING_ADD_COMPOSITION_START) (CODING_ADD_COMPOSITION_END) (CODING_ADD_COMPOSITION_COMPONENT) (DECODE_COMPOSITION_START) @@ -404,7 +404,7 @@ (ENCODE_ISO_CHARACTER): Don't check composition here. (ENCODE_COMPOSITION_RULE) (ENCODE_COMPOSITION_START): New macros. (ENCODE_COMPOSITION_NO_RULE_START) - (ENCODE_COMPOSITION_WITH_RULE_START): Deleted. + (ENCODE_COMPOSITION_WITH_RULE_START): Delete. (ENCODE_COMPOSITION_END): Handle new composition sequence. (ENCODE_COMPOSITION_FAKE_START): New macro. (encode_coding_iso2022): Handle new composition sequence. @@ -414,12 +414,12 @@ coding_system. Enable composition only when the coding system has `composition' property t. (coding_free_composition_data) (coding_adjust_composition_offset) - (coding_save_composition) (coding_restore_composition): New - functions. + (coding_save_composition) (coding_restore_composition): + New functions. (code_convert_region): Call coding_save_composition for encoding and coding_allocate_composition_data for decoding. Don't skip - ASCII characters if we handle composition on encoding. Call - signal_after_change with Check_BORDER. + ASCII characters if we handle composition on encoding. + Call signal_after_change with Check_BORDER. (code_convert_string): Call coding_save_composition for encoding and coding_allocate_composition_data for decoding. Don't skip ASCII characters if we handle composition on encoding. @@ -448,9 +448,9 @@ * dispnew.c (direct_output_forward_char): Check point moving into or out of a composition. If so, give up direct method. - * doprnt.c (doprnt1): Adjusted for the change of CHAR_STRING. + * doprnt.c (doprnt1): Adjust for the change of CHAR_STRING. - * editfns.c (Fchar_to_string): Adjusted for the change of + * editfns.c (Fchar_to_string): Adjust for the change of CHAR_STRING. (general_insert_function): Likewise. (Finsert_char): Likewise. @@ -460,19 +460,19 @@ * emacs.c (main): Call syms_of_composite. - * fileio.c (Fsubstitute_in_file_name): Adjusted for the change of + * fileio.c (Fsubstitute_in_file_name): Adjust for the change of CHAR_STRING. (Finsert_file_contents): Set Vlast_coding_system_used before calling signal_after_change. Call update_compositions if some texts are inserted.. - (Fwrite_region): Adjusted for the change of a_write and e_write. + (Fwrite_region): Adjust for the change of a_write and e_write. (a_write): Argument changed. Work based on character position, not byte position. (e_write): Argument changed. Handle new way of composition. * fns.c (Flength): The length of char-table is MAX_CHAR. - (concat): Adjusted for the change of CHAR_STRING. - (Ffillarray): Adjusted for the change of CHAR_STRING. + (concat): Adjust for the change of CHAR_STRING. + (Ffillarray): Adjust for the change of CHAR_STRING. (Fset_char_table_default): Delete codes for a composite character. (hash_put): Return hash index. @@ -492,7 +492,7 @@ (Fmove_to_column): Likewise. (compute_motion): Likewise. - * insdel.c (copy_text): Adjusted for the change of CHAR_STRING. + * insdel.c (copy_text): Adjust for the change of CHAR_STRING. (insert_char): Likewise. (insert): Call update_compositions. (insert_and_inherit): Likewise. @@ -502,7 +502,7 @@ (insert_from_string_before_markers): Likewise. (insert_from_buffer): Likewise. (replace_range): Likewise. - (count_combining_composition): Deleted. + (count_combining_composition): Delete. (count_combining_before): Delete codes for a composite character. (count_combining_after): Likewise. (del_range_1): Call update_compositions. @@ -526,16 +526,16 @@ necessary. (adjust_point_for_property): New function. - * keymap.c (push_key_description): Adjusted for the change of + * keymap.c (push_key_description): Adjust for the change of CHAR_STRING. (Ftext_char_description): Likewise. * lisp.h (QCtest, QCweakness, Qequal): Extern them. - (hash_put): Adjusted for the change of the definition. + (hash_put): Adjust for the change of the definition. (signal_after_change): Likewise. (check_point_in_composition): Extern it. - * lread.c (readchar): Adjusted for the change of CHAR_STRING. + * lread.c (readchar): Adjust for the change of CHAR_STRING. Delete a code that handles an invalid too-long multibyte sequence because we are now sure that we never encounter with such a sequence. @@ -544,14 +544,14 @@ (init_obarray): Likewise. (read1): Likewise. Adjusted for the change of CHAR_STRING. - * print.c (printchar): Adjusted for the change of CHAR_STRING. + * print.c (printchar): Adjust for the change of CHAR_STRING. * process.c: Include composite.h. (read_process_output): Call update_compositions. - * regex.c (regex_compile): Adjusted for the change of CHAR_STRING. + * regex.c (regex_compile): Adjust for the change of CHAR_STRING. - * search.c (search_buffer): Adjusted for the change of CHAR_STRING. + * search.c (search_buffer): Adjust for the change of CHAR_STRING. * syntax.h (SYNTAX_ENTRY_INT): Delete codes for a composite character. @@ -570,19 +570,19 @@ (face_before_or_after_it_pos): For composition, check face of a character after the composition. (handle_composition_prop): New function. - (get_next_display_element): Adjusted for the change of + (get_next_display_element): Adjust for the change of CHAR_STRING. (set_iterator_to_next): Handle the case that it->method == next_element_from_composition. (next_element_from_composition): New function. - (message_dolog): Adjusted for the change of CHAR_STRING. + (message_dolog): Adjust for the change of CHAR_STRING. (set_message_1): Likewise. (check_point_in_composition): New function. (reconsider_clip_changes): If point moved into or out of composition, set b->clip_changed to 1 to force updating of the screen. (disp_char_vector): Delete codes for a composite character. - (decode_mode_spec_coding): Adjusted for the change of CHAR_STRING. + (decode_mode_spec_coding): Adjust for the change of CHAR_STRING. * xfaces.c (choose_face_fontset_font): Delete codes for a composite character. @@ -592,7 +592,7 @@ * xfns.c: Include intervals.h. (syms_of_xfns): Make `display' property nonsticky by default. - * xselect.c (lisp_data_to_selection_data): Adjusted for the change + * xselect.c (lisp_data_to_selection_data): Adjust for the change for find_charset_in_str. * xterm.h (struct x_output): Change member font_baseline to @@ -618,9 +618,9 @@ (x_draw_composite_glyph_string_foreground): New function. (x_draw_glyph_string_box): Check s->cmp, not s->cmpcharp. (x_draw_glyph_string): Handle the case of COMPOSITE_GLYPH. - (struct work): Deleted. - (x_fill_composite_glyph_string): Argument changed. Mostly - rewritten for that. + (struct work): Delete. + (x_fill_composite_glyph_string): Argument changed. + Mostly rewritten for that. (x_fill_glyph_string): Don't check CHARSET_COMPOSITION. (BUILD_CHAR_GLYPH_STRINGS): Don't handle composition here. (BUILD_COMPOSITE_GLYPH_STRING): New macro. @@ -656,8 +656,8 @@ * frame.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL) [!MSDOS && !WINDOWSNT && !macintosh]: Moved here from xterm.h. - * xterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Moved - to frame.h. + * xterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): + Move to frame.h. 1999-12-09 Stefan Monnier @@ -668,11 +668,11 @@ * xterm.c (#includes): Allow compilation with only Xaw. (xaw3d_arrow_scroll, xaw3d_pick_top): New variables. (xt_action_hook): Replace XAW3D by XAW. - (xaw3d_jump_callback): Renamed to xaw_jump_callback. - (xaw_jump_callback): Renamed from xaw3d_jump_callback. + (xaw3d_jump_callback): Rename to xaw_jump_callback. + (xaw_jump_callback): Rename from xaw3d_jump_callback. Determine epsilon dynamically and don't try to be too clever. - (xaw3d_scroll_callback): Renamed to xaw_scroll_callback. - (xaw_scroll_callback): Renamed from xaw3d_scroll_callback. + (xaw3d_scroll_callback): Rename to xaw_scroll_callback. + (xaw_scroll_callback): Rename from xaw3d_scroll_callback. Handle both Xaw3d with arrow-scrollbars and with Xaw-style scrollbar (using `ratio'). (x_create_toolkit_scroll_bar): Try to detect which style of Xaw3d @@ -710,9 +710,9 @@ 1999-12-07 Alexandre Oliva - * unexelf.c: Include , not on IRIX. Removed - duplicate definition of ElfW. - (find_section): Copied from unexsgi.c. + * unexelf.c: Include , not on IRIX. + Removed duplicate definition of ElfW. + (find_section): Copy from unexsgi.c. (unexec): Use find_section. Adjust whitespace. Initialize new_data2_offset based on old_data, not sbss (this fixes a bug on IRIX6). Change #ifdef __mips to __sgi, since it's IRIX-specific. @@ -798,8 +798,8 @@ (FRAME_PARAM_FACES, FRAME_N_PARAM_FACES, FRAME_DEFAULT_PARAM_FACE) (FRAME_MODE_LINE_PARAM_FACE, FRAME_COMPUTED_FACES) (FRAME_N_COMPUTED_FACES, FRAME_SIZE_COMPUTED_FACES) - (FRAME_DEFAULT_FACE, FRAME_MODE_LINE_FACE, unload_color): Remove - unused macro definitions. + (FRAME_DEFAULT_FACE, FRAME_MODE_LINE_FACE, unload_color): + Remove unused macro definitions. * msdos.c (IT_set_frame_parameters): Don't call recompute_basic_faces, the next redisplay will, anyway. @@ -818,13 +818,13 @@ * Makefile.in (lisp, shortlisp): Add lisp/term/tty-colors.elc. - * xfns.c (x_defined_color): Rename from defined_color. All - callers changed. - (Fxw_color_defined_p): Renamed from Fx_color_defined_p; + * xfns.c (x_defined_color): Rename from defined_color. + All callers changed. + (Fxw_color_defined_p): Rename from Fx_color_defined_p; all callers changed. - (Fxw_color_values): Renamed from Fx_color_values; all callers + (Fxw_color_values): Rename from Fx_color_values; all callers changed. - (Fxw_display_color_p): Renamed from Fx_display_color_p; all + (Fxw_display_color_p): Rename from Fx_display_color_p; all callers changed. (x_window_to_frame, x_any_window_to_frame) (x_non_menubar_window_to_frame, x_menubar_window_to_frame) @@ -834,11 +834,11 @@ * w32fns.c (x_window_to_frame): Use FRAME_W32_P instead of f->output_data.nothing. - (Fxw_color_defined_p): Renamed from Fx_color_defined_p; + (Fxw_color_defined_p): Rename from Fx_color_defined_p; all callers changed. - (Fxw_color_values): Renamed from Fx_color_values; all callers + (Fxw_color_values): Rename from Fx_color_values; all callers changed. - (Fxw_display_color_p): Renamed from Fx_display_color_p; all + (Fxw_display_color_p): Rename from Fx_display_color_p; all callers changed. * dispextern.h (tty_color_name): Add prototype. @@ -856,7 +856,7 @@ 1999-12-06 Kenichi Handa - * fileio.c (decide_coding_unwind): Renamed from + * fileio.c (decide_coding_unwind): Rename from set_auto_coding_unwind. (Finsert_file_contents): Make single unwind protect to call both Vset_auto_coding_function and Ffind_operation_coding_system. @@ -868,7 +868,7 @@ * regex.c (regex_compile): Recognize *?, +? and ?? as non-greedy operators and handle them properly. * regex.h (RE_ALL_GREEDY): New option. - (RE_UNMATCHED_RIGHT_PAREN_ORD): Moved to the end where alphabetic + (RE_UNMATCHED_RIGHT_PAREN_ORD): Move to the end where alphabetic sorting would put it. (RE_SYNTAX_AWK, RE_SYNTAX_GREP, RE_SYNTAX_EGREP) (_RE_SYNTAX_POSIX_COMMON): Use the new option to keep old behavior. @@ -898,8 +898,8 @@ 1999-11-28 Gerd Moellmann * systime.h (EMACS_TIME_CMP, EMACS_TIME_EQ, EMACS_TIME_NE) - (EMACS_TIME_GT, EMACS_TIME_GE, EMACS_TIME_LT, EMACS_TIME_LE): New - macros. + (EMACS_TIME_GT, EMACS_TIME_GE, EMACS_TIME_LT, EMACS_TIME_LE): + New macros. * config.in (HAVE_SETITIMER, HAVE_UALARM): New. @@ -932,8 +932,8 @@ * puresize.h (BASE_PURESIZE): Increase to 550000. - * textprop.c (set_text_properties): New function. Like - Fset_text_properties, but with additional parameter + * textprop.c (set_text_properties): New function. + Like Fset_text_properties, but with additional parameter SIGNAL_AFTER_CHANGE_P. If that is nil, don't signal after changes. (Fset_text_properties): Use it. @@ -1018,7 +1018,7 @@ * fileio.c (strerror): Likewise. * process.c (strerror): Likewise. * emacs.c (strerror): Likewise. - (Vsystem_messages_locale): Renamed from Vmessages_locale. + (Vsystem_messages_locale): Rename from Vmessages_locale. All uses changed. (Vprevious_system_messages_locale): Likewise, from Vprevious_messages_locale. @@ -1041,7 +1041,7 @@ (FREE_RETURN_TYPE): New macro. (free): Return type is now FREE_RETURN_TYPE. - * lisp.h (synchronize_system_time_locale): Renamed from + * lisp.h (synchronize_system_time_locale): Rename from synchronize_time_locale. All uses changed. (synchronize_system_messages_locale): Likewise, from synchronize_messages_locale. @@ -1135,13 +1135,13 @@ 1999-11-10 Gerd Moellmann - * xfns.c (QCuser_data): Removed. + * xfns.c (QCuser_data): Remove. (syms_of_xfns): Initialization of QCuser_data removed. - (parse_image_spec): Don't handle :user-data specially. Allow - unknown keys. Remove parameter ALLOW_OTHER_KEYS. + (parse_image_spec): Don't handle :user-data specially. + Allow unknown keys. Remove parameter ALLOW_OTHER_KEYS. (xbm_image_p, xbm_load, xpm_image_p, pbm_image_p, png_image_p) - (tiff_image_p, jpeg_image_p, gif_image_p, gs_image_p): Call - parse_image_spec accordingly. + (tiff_image_p, jpeg_image_p, gif_image_p, gs_image_p): + Call parse_image_spec accordingly. 1999-11-09 Richard M. Stallman @@ -1178,8 +1178,8 @@ * lisp.h: Add prototype for unmark_byte_stack. * bytecode.c (mark_byte_stack): Use XMARKBIT and XMARK. - (unmark_byte_stack): Renamed from relocate_byte_pcs. Use - XUNMARK. + (unmark_byte_stack): Rename from relocate_byte_pcs. + Use XUNMARK. * xdisp.c (resize_mini_window): Fix computation of needed mini-window height. @@ -1214,7 +1214,7 @@ (byte_stack_list, mark_byte_stack, relocate_byte_pcs): New. (BEFORE_POTENTIAL_GC, AFTER_POTENTIAL_GC): New. (FETCH, PUSH, POP, DISCARD, TOP, MAYBE_GC): Rewritten. - (HANDLE_RELOCATION): Removed. + (HANDLE_RELOCATION): Remove. (Fbyte_code): Use byte_stack structures. * filelock.c (Ffile_locked_p): Make FILENAME a required argument. @@ -1224,10 +1224,10 @@ 1999-11-04 Gerd Moellmann - * editfns.c (Fdelete_field): Renamed from Ferase_field. + * editfns.c (Fdelete_field): Rename from Ferase_field. - * minibuf.c (do_completion, Fminibuffer_complete_word): Use - Ferase_field instead of Fdelete_field. + * minibuf.c (do_completion, Fminibuffer_complete_word): + Use Ferase_field instead of Fdelete_field. 1999-11-03 Gerd Moellmann @@ -1279,7 +1279,7 @@ * xfns.c (png_load) [PNG_READ_sRGB_SUPPORTED]: Put code using png_get_sRGB in #ifdef. - * dispnew.c (Finternal_show_cursor): Renamed from Fshow_cursor. + * dispnew.c (Finternal_show_cursor): Rename from Fshow_cursor. (syms_of_display): Use the new name. * textprop.c (verify_interval_modification): Signal text-read-only @@ -1346,7 +1346,7 @@ 1999-10-27 Richard M. Stallman - * data.c (Qad_activate_internal): Renamed from Qad_activate. + * data.c (Qad_activate_internal): Rename from Qad_activate. (Ffset): Call Qad_activate_internal. (syms_of_data): Initialize Qad_activate_internal. @@ -1493,12 +1493,12 @@ * editfns.c: Include coding.h. (emacs_strftime): Remove decl. (emacs_strftimeu): New decl. - (emacs_memftimeu): Renamed from emacs_memftime; new arg UT. + (emacs_memftimeu): Rename from emacs_memftime; new arg UT. Use emacs_strftimeu instead of emacs_strftime. (Fformat_time_string): Convert format string using Vlocale_coding_system, and convert result back. Synchronize time - locale before invoking lower level function. Invoke - emacs_memftimeu, passing ut, instead of emacs_memftime. + locale before invoking lower level function. + Invoke emacs_memftimeu, passing ut, instead of emacs_memftime. * emacs.c: Include if HAVE_SETLOCALE is defined. (Vmessages_locale, Vprevious_messages_locale, Vtime_locale) @@ -1506,7 +1506,7 @@ (main): Invoke setlocale early, so that initial error messages are localized properly. But skip locale-setting if LC_ALL is "C". Fix up locale when it's safe to do so. - (fixup_locale): Moved here from xterm.c. + (fixup_locale): Move here from xterm.c. (synchronize_locale, synchronize_time_locale) (synchronize_messages_locale): New functions. (syms_of_emacs): Accommodate above changes. @@ -1534,8 +1534,8 @@ * lread.c (file_offset, file_tell): New macros. All uses of ftell changed to file_tell. - (saved_doc_string_position, prev_saved_doc_string_position): Now - of type file_offset. + (saved_doc_string_position, prev_saved_doc_string_position): + Now of type file_offset. (init_lread): Do not fix locale here; fixup_locale now does this. * m/amdahl.h, s/usg5-4.h: @@ -1589,10 +1589,10 @@ (emacs_open, emacs_close, emacs_read, emacs_write): Always define; the old INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, and INTERRUPTIBLE_IO macros are no longer used. - (emacs_open): Renamed from sys_open. Merge BSD4_1 version. - (emacs_close): Renamed from sys_close. - (emacs_read): Renamed from sys_read. - (emacs_write): Renamed from sys_write. + (emacs_open): Rename from sys_open. Merge BSD4_1 version. + (emacs_close): Rename from sys_close. + (emacs_read): Rename from sys_read. + (emacs_write): Rename from sys_write. (sys_siglist): Do not declare if HAVE_STRSIGNAL. (dup2): Do not print error on failure; the real dup2 doesn't. (strsignal): New function, defined if !HAVE_STRSIGNAL. @@ -1638,8 +1638,8 @@ 1999-10-18 Kenichi Handa * coding.c (code_convert_string): Add record_unwind_protect to - assure setting inhibit_pre_post_conversion back to zero. Take - care of the multibyteness of the working buffer. + assure setting inhibit_pre_post_conversion back to zero. + Take care of the multibyteness of the working buffer. * coding.c (inhibit_pre_post_conversion): New variable. (setup_coding_system): If inhibit_pre_post_conversion is nonzero, @@ -1666,13 +1666,13 @@ * minibuf.c (Fminibuffer_complete_and_exit): Supply value for new ESCAPE_FROM_EDGE parameter to Ffield_beginning. - * editfns.c (text_property_eq, text_property_stickiness): Don't - use initializers for auto variables of type Lisp_Object. + * editfns.c (text_property_eq, text_property_stickiness): + Don't use initializers for auto variables of type Lisp_Object. (find_field): Likewise. Use braces around nested ifs. (Fline_end_position): Store the raw eol in a variable, so that the final expression doesn't look so ugly. (Fconstrain_to_field): Doc fix. - (preceding_pos): Renamed from `preceeding_pos'. + (preceding_pos): Rename from `preceeding_pos'. (text_property_stickiness, find_field): Call preceding_pos, not preceeding_pos. @@ -1696,8 +1696,8 @@ * syntax.c (Fforward_word): Supply new ESCAPE_FROM_EDGE parameter to Fconstrain_to_field. - * minibuf.c (Fminibuffer_complete_word): Use - Ffield_beginning to find the prompt end. + * minibuf.c (Fminibuffer_complete_word): + Use Ffield_beginning to find the prompt end. 1999-10-17 Miles Bader @@ -1746,8 +1746,8 @@ 1999-10-16 Gerd Moellmann * window.c (enum save_restore_action): New. - (save_restore_orig_size): Change parameter list. Add - functionality to check for valid orig_top and orig_height members + (save_restore_orig_size): Change parameter list. + Add functionality to check for valid orig_top and orig_height members in a window tree. (grow_mini_window): Call save_restore_orig_size with new parameter list. @@ -1848,8 +1848,8 @@ (Finternal_set_lisp_face_attribute): Ditto. (Fpixmap_spec_p): Rewritten. Extend doc string. - * xmenu.c (set_frame_menubar, xmenu_show): Call - x_set_menu_resources_from_menu_face. + * xmenu.c (set_frame_menubar, xmenu_show): + Call x_set_menu_resources_from_menu_face. * dispextern.h (enum face_id): Add MENU_FACE_ID. (toplevel): Include X11/Intrinsic.h. @@ -1869,7 +1869,7 @@ 1999-09-29 Gerd Moellmann - * editfns.c (Fpropertize): Renamed from Fproperties. + * editfns.c (Fpropertize): Rename from Fproperties. 1999-09-29 Gerd Moellmann @@ -1897,8 +1897,8 @@ * textprop.c (next_single_char_property_change): New. - * xdisp.c (display_prop_end, invisible_text_between_p): Use - next_single_char_property_change. + * xdisp.c (display_prop_end, invisible_text_between_p): + Use next_single_char_property_change. 1999-09-25 Gerd Moellmann @@ -1928,7 +1928,7 @@ * xfaces.c (add_to_log): Move to xdisp.c. - * xdisp.c (add_to_log): Moved from xfaces.c. Remove frame + * xdisp.c (add_to_log): Move from xfaces.c. Remove frame parameter. 1999-09-23 Gerd Moellmann @@ -1945,10 +1945,10 @@ (grow_mini_window, shrink_mini_window): New. (make_window, replace_window): Initialize orig_top and orig_height. - (enlarge_window): Renamed from change_window_height. Make it + (enlarge_window): Rename from change_window_height. Make it static. - (Fdisplay_buffer, Fenlage_window, Fshrink_window): Call - enlarge_window instead of change_window_height. + (Fdisplay_buffer, Fenlage_window, Fshrink_window): + Call enlarge_window instead of change_window_height. * window.h (struct window): New members orig_top, orig_height. (toplevel): Add prototypes for grow_mini_window and @@ -2003,8 +2003,8 @@ * xdisp.c (compute_window_start_on_continuation_line): Handle case that window start is out of range. - (handle_display_prop, handle_single_display_prop): Replace - marginal area specifications like `left-margin' with `(margin + (handle_display_prop, handle_single_display_prop): + Replace marginal area specifications like `left-margin' with `(margin left-margin)'. (Qmargin): New. (syms_of_xdisp): Initialize Qmargin. @@ -2020,7 +2020,7 @@ (Fopen_network_stream, create_process): Add parentheses to conditional expressions. (create_process): Put declaration of sigchld in #if 0. - (Fopen_network_stream): Removed unused variables. + (Fopen_network_stream): Remove unused variables. (Fopen_network_stream, wait_reading_process_input) (wait_reading_process_input, send_process, send_process): Ditto. (toplevel): Add prototypes for set_waiting_for_input and @@ -2057,7 +2057,7 @@ * buffer.h: Add prototype for r_re_alloc. - * insdel.c (copy_text): Removed unused variables. + * insdel.c (copy_text): Remove unused variables. (count_combining_after, count_combining_after, insert_1_both) (insert_from_string_1, insert_from_buffer_1, check_markers): Ditto. (adjust_after_replace, replace_range): Add parentheses to logical @@ -2177,8 +2177,8 @@ * xdisp.c (resize_mini_window): Don't report changed window height if it actually hasn't changed. - * widget.c (set_frame_size, EmacsFrameSetCharSize): Remove - unused variables. + * widget.c (set_frame_size, EmacsFrameSetCharSize): + Remove unused variables. (mark_shell_size_user_specified): Put in #if 0 because not used. (create_frame_gcs): Put in #if 0 because currently unused. (first_frame_p): Ditto. @@ -2188,7 +2188,7 @@ (free_frame_menubar, xmenu_show, xdialog_show): Remove unused variables. - * print.c (PRINTFULLP): Removed because it is no longer used and + * print.c (PRINTFULLP): Remove because it is no longer used and is misleading. (Ferror_message_string): Remove unused variables. (print_object): Cast argument of sprintf to long for `%ld' @@ -2297,7 +2297,7 @@ * xterm.c (XTcursor_to): Change for Lisp_Object selected_frame. (x_clear_frame, XTring_bell, XTmouse_position, XTread_socket): Ditto. - (XRINGBELL): Removed. + (XRINGBELL): Remove. 1999-09-13 Dave Love @@ -2307,7 +2307,7 @@ 1999-09-13 Gerd Moellmann - * xfns.c (QCfile): Moved to xdisp.c. + * xfns.c (QCfile): Move to xdisp.c. (syms_of_xfns): Don't initialize QCfile. (check_x_frame): Change for Lisp_Object selected_frame. (check_x_display_info, x_get_resource_string): Ditto. @@ -2317,7 +2317,7 @@ * minibuf.c (choose_minibuf_frame): Don't try to set the mini-buffer window's buffer, if the buffer is invalid. - * xfns.c (QCfile): Moved to xdisp.c. + * xfns.c (QCfile): Move to xdisp.c. (syms_of_xfns): Don't initialize QCfile. * xdisp.c (QCfile): Move here from xfns.c. @@ -2401,7 +2401,7 @@ * xterm.c (XTcursor_to): Change for Lisp_Object selected_frame. (x_clear_frame, XTring_bell, XTmouse_position, XTread_socket): Ditto. - (XRINGBELL): Removed. + (XRINGBELL): Remove. * window.c (Fminibuffer_window): Change for Lisp_Object selected_frame. @@ -2456,8 +2456,8 @@ * keyboard.c (command_loop_1): Resize mini-window to the exact size of a message displayed, if any. - * xdisp.c (resize_mini_window): Add parameter exact_p. Resize - to exact size if exact_p is non-zero. + * xdisp.c (resize_mini_window): Add parameter exact_p. + Resize to exact size if exact_p is non-zero. (display_echo_area_1): Call resize_mini_window with new parameter. (redisplay_internal): Ditto. @@ -2498,8 +2498,8 @@ (Fkill_buffer): Ditto. (Ferase_buffer): Ditto. - * buffer.h (prompt_end_charpos): Replaces - minibuffer_prompt_length. + * buffer.h (prompt_end_charpos): + Replaces minibuffer_prompt_length. * minibuf.c (read_minibuf): Return mini-buffer contents without the prompt. @@ -2582,8 +2582,8 @@ (x_load_font, x_find_ccl_program, x_term_init, x_delete_display): Likewise. - * alloc.c (make_float, make_pure_float, Fpurecopy): Use - XFLOAT_DATA. + * alloc.c (make_float, make_pure_float, Fpurecopy): + Use XFLOAT_DATA. * bytecode.c (Fbyte_code): Likewise. * floatfns.c (extract_float, Fexpt, Fabs, rounding_driver) (fmod_float): Likewise. @@ -2614,7 +2614,7 @@ 1999-09-10 Keisuke Nishida * print.c: Support print-circle and related features. - (Vprint_gensym_alist): Removed. + (Vprint_gensym_alist): Remove. (Vprint_circle, Vprint_continuous_numbering, print_number_index) (Vprint_number_table): New variables. (PRINT_NUMBER_OBJECT, PRINT_NUMBER_STATUS): New macros. @@ -2703,8 +2703,8 @@ 1999-09-07 Gerd Moellmann - * xfns.c (x_set_foreground_color): Call - update_face_from_frame_parameter. + * xfns.c (x_set_foreground_color): + Call update_face_from_frame_parameter. (x_set_background_color): Ditto. (x_set_mouse_color): Ditto. (x_set_cursor_color): Ditto. @@ -2926,7 +2926,7 @@ (Fset_window_start): Ditto. * xdisp.c (Vresize_mini_config, resize_mini_frame) - (resize_mini_initial_height): Removed. + (resize_mini_initial_height): Remove. (syms_of_xdisp): Remove references to these variables. (resize_mini_window): Don't save window configuration, freeze window starts instead. Enlarge window until displaying an empty @@ -2952,16 +2952,16 @@ * xterm.c (x_scroll_bar_create): Don't clear under scroll bar here. - (XTset_vertical_scroll_bar): Clarify position computations. Clear - under newly created scroll bar. Put toolkit scroll bars in the + (XTset_vertical_scroll_bar): Clarify position computations. + Clear under newly created scroll bar. Put toolkit scroll bars in the middle of the area reserved for the scroll bar. 1999-09-03 Kenichi Handa The following changes are for the new handling of multibyte sequence. Now, except for a composite character, no multibyte - character in string/buffer has trailing garbage bytes. For - instance, the length of string "\201\300\300" is now 2, the first + character in string/buffer has trailing garbage bytes. + For instance, the length of string "\201\300\300" is now 2, the first character is Latin-1 A-grave, the second is raw \300. * charset.h (MAKE_NON_ASCII_CHAR): Handle the case that C1 or C2 @@ -2972,7 +2972,7 @@ (PARSE_CHARACTER_SEQ): New macro. (PARSE_MULTIBYTE_SEQ): New macro. (CHAR_PRINTABLE_P): New macro. - (STRING_CHAR): Adjusted for the change of string_to_non_ascii_char. + (STRING_CHAR): Adjust for the change of string_to_non_ascii_char. (STRING_CHAR_AND_LENGTH): Likewise. (STRING_CHAR_AND_CHAR_LENGTH): Define it as STRING_CHAR_AND_LENGTH. (INC_POS): Use the macro PARSE_MULTIBYTE_SEQ. @@ -3016,8 +3016,8 @@ * insdel.c (count_combining_composition): New function. (count_combining_before): Adjust the way to check byte-combining - possibility for the new handling of multibyte sequence. Call - count_combining_composition for a composite character. + possibility for the new handling of multibyte sequence. + Call count_combining_composition for a composite character. (count_combining_after): Likewise. * print.c (print_string): Use the macro STRING_CHAR_AND_LENGTH. @@ -3093,8 +3093,8 @@ (window_box_left): Use FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH. - * window.c (coordinates_in_window): Use - FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH. + * window.c (coordinates_in_window): + Use FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH. (window_internal_width): Subtract FRAME_FLAGS_AREA_WIDTH once instead of twice. @@ -3105,14 +3105,14 @@ * dispnew.c (mode_line_string): Add FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH. - * dispextern.h (WINDOW_DISPLAY_PIXEL_WIDTH): Subtract - FRAME_FLAGS_AREA_COLS once. - (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X): Add - FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH. + * dispextern.h (WINDOW_DISPLAY_PIXEL_WIDTH): + Subtract FRAME_FLAGS_AREA_COLS once. + (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X): + Add FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH. 1999-08-30 Gerd Moellmann - * s/freebsd.h (C_SWITCH_SYSTEM): Added to let configure find headers + * s/freebsd.h (C_SWITCH_SYSTEM): Add to let configure find headers in /usr/X11R6/include which are checked for with AC_CHECK_HEADER. 1999-08-30 Gerd Moellmann @@ -3139,8 +3139,8 @@ 1999-08-28 Ken Raeburn - * lisp.h (struct Lisp_Cons, XCAR, XCDR, struct Lisp_Float): Change - names of structure elements if HIDE_LISP_IMPLEMENTATION is + * lisp.h (struct Lisp_Cons, XCAR, XCDR, struct Lisp_Float): + Change names of structure elements if HIDE_LISP_IMPLEMENTATION is defined, to help detect code that uses knowledge of the Lisp internals that it shouldn't have. (XFLOAT_DATA): New macro. @@ -3226,8 +3226,8 @@ 1999-08-22 Gerd Moellmann - * xdisp.c (unwind_with_echo_area_buffer): Use - set_buffer_internal_1 instead of set_buffer_internal. + * xdisp.c (unwind_with_echo_area_buffer): + Use set_buffer_internal_1 instead of set_buffer_internal. (with_echo_area_buffer): Ditto. * buffer.c (set_buffer_internal): Set windows_or_buffers_changed @@ -3255,8 +3255,8 @@ (mark_window_display_accurate, redisplay_internal): Set current matrix' buffer, begv, zv. - * window.c (Fset_window_hscroll): Set - prevent_redisplay_optimizations_p instead of clip_changed. + * window.c (Fset_window_hscroll): + Set prevent_redisplay_optimizations_p instead of clip_changed. (Fset_window_hscroll): Ditto. (temp_output_buffer_show): Ditto. (Fset_window_vscroll): Ditto. @@ -3273,7 +3273,7 @@ unchanged_modified, overlay_unchanged_modified. * window.h (beg_unchanged, end_unchanged, unchanged_modified) - (overlay_unchanged_modified): Removed. + (overlay_unchanged_modified): Remove. (with_echo_area_unwind_data): Don't save beg/end_unchanged. (unwind_with_echo_area_buffer): Don't restore them. (debug_beg_unchanged, debug_end_unchanged) [GLYPH_DEBUG]: Removed. @@ -3310,8 +3310,8 @@ * lisp.h: Add prototype for copy_hash_table and Fcopy_hash_table. - * fns.c (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak. - (Qkey_value_weak): Removed. + * fns.c (Qkey, Qvalue): Rename from Qkey_weak, and Qvalue_weak. + (Qkey_value_weak): Remove. (make_hash_table): Use nil, `key', `value', t for weakness. (Fmake_hash_table): Ditto. (copy_hash_table): New. @@ -3336,7 +3336,7 @@ * fns.c (hash_lookup): Test with EQ before calling key comparison function. (hash_remove): Ditto. - (cmpfn_eq): Removed. + (cmpfn_eq): Remove. (cmpfn_eql): Don't test with EQ. (cmpfn_equal): Ditto. (make_hash_table): Set comparison function for `eq' to null. @@ -3344,7 +3344,7 @@ * buffer.c, cmds.c, editfns.c, indent.c, insdel.c, buffer.h: Remove conditional compilation on NO_PROMPT_IN_BUFFER. - * dispextern.h (NO_PROMPT_IN_BUFFER): Removed. + * dispextern.h (NO_PROMPT_IN_BUFFER): Remove. * window.c, widget.c, process.c, keyboard.c, frame.c, xdisp.c, xterm.c: Call change_frame_size and do_pending_window_change with @@ -3369,8 +3369,8 @@ NO_PROMPT_IN_BUFFER. * minibuf.c (Fminibuffer_prompt_end): New. - (syms_of_minibuf): Defsubr it. Remove - minibuffer-prompt-in-buffer. + (syms_of_minibuf): Defsubr it. + Remove minibuffer-prompt-in-buffer. (Fminibuffer_prompt_width): Return 0 if not in mini-buffer. Extend documentation. @@ -3381,7 +3381,7 @@ 1999-08-21 Gerd Moellmann - * xdisp.c (minibuffer_scroll_overlap): Removed because not used + * xdisp.c (minibuffer_scroll_overlap): Remove because not used anywhere. (unwind_redisplay): Return nil. (clear_garbaged_frames): New. @@ -3400,7 +3400,7 @@ * xdisp.c (echo_area_glyphs, echo_area_message) (echo_area_glyphs_length, previous_echo_glyphs) (previous_echo_area_message, previous_echo_area_glyphs_length): - Removed. + Remove. (Vmessage_stack, echo_area_buffer, echo_buffer) (display_last_displayed_message_p, Vwith_echo_area_save_vector): New. (message2_nolog): Use set_message and clear_message. @@ -3426,7 +3426,7 @@ Remove initialization of removed variables. (init_xdisp): Remove references to removed variables. - * dispnew.c (adjust_frame_message_buffer): Removed references + * dispnew.c (adjust_frame_message_buffer): Remove references to echo_area_glyphs and previous_echo_glyphs. (direct_output_for_insert): Check for mini-window displaying echo area message differently. @@ -3440,7 +3440,7 @@ longer used in that way. (PRINTDECLARE): Add multibyte. (PRINTPREPARE, PRINTFINISH): Handle printcharfun t differently. - (printbufidx): Removed. + (printbufidx): Remove. (printchar, strout): Rewritten. * keyboard.c (ok_to_echo_at_next_pause): Make it a pointer to @@ -3493,8 +3493,8 @@ 1999-08-19 Gerd Moellmann - * xterm.c (XTset_vertical_scroll_bar): Fix previous change. Clear - under scroll bar with width FRAME_SCROLL_BAR_COLS. + * xterm.c (XTset_vertical_scroll_bar): Fix previous change. + Clear under scroll bar with width FRAME_SCROLL_BAR_COLS. 1999-08-18 Dave Love @@ -3511,8 +3511,8 @@ * xfns.c (x_window) [USE_X_TOOLKIT]: Remove test for FRAME_X_WINDOW (f) being null at the of the function. If widgets - cannot be created we will already have crashed earlier. Call - lw_set_main_areas with a null menu-bar widget, so that we have + cannot be created we will already have crashed earlier. + Call lw_set_main_areas with a null menu-bar widget, so that we have a reasonable default. (Fx_create_frame): Rearranged so that Lisp errors during frame initialization cause less damage. Initialize menu bar widget @@ -3526,8 +3526,8 @@ 1999-08-17 Gerd Moellmann * window.c (Fcoordinates_in_window_p): Return `left-bitmap-area' - and `right-bitmap-area' if position is in the bitmap areas. This - avoids an error when clicking on the bitmap areas. Instead, they + and `right-bitmap-area' if position is in the bitmap areas. + This avoids an error when clicking on the bitmap areas. Instead, they are currently treated like clicks inside the window. (coordinates_in_window): Return 5 and 6 for bitmap areas. (Qleft_bitmap_area, Qright_bitmap_area): New. @@ -3553,14 +3553,14 @@ * dispextern.h (struct it): Remove member show_trailing_whitespace_p. - * dispnew.c (direct_output_for_insert): Use - Vshow_trailing_whitespace instead of former iterator member + * dispnew.c (direct_output_for_insert): + Use Vshow_trailing_whitespace instead of former iterator member show_trailing_whitespace_p. (direct_output_forward_char): Don't do it if highlighting trailing whitespace. - * xdisp.c (Qshow_trailing_whitespace): Removed. - (Vshow_trailing_whitespace): Added. + * xdisp.c (Qshow_trailing_whitespace): Remove. + (Vshow_trailing_whitespace): Add. (init_iterator): Remove initialization code for show_trailing_whitespace_p. (redisplay_internal): Don't try cursor movement in this_line @@ -3578,7 +3578,7 @@ * window.c (Fpos_visible_in_window_p): Rewritten. - * xfaces.c (add_to_log): Renamed from display_message. + * xfaces.c (add_to_log): Rename from display_message. Don't display messages in echo area. * xterm.c (x_draw_glyph_string_box): Use the background width @@ -3650,7 +3650,7 @@ 1999-08-13 Gerd Moellmann - * window.c (MINSIZE): Removed. + * window.c (MINSIZE): Remove. (window_min_size): New. (set_window_height): Use window_min_size. (change_window_height): Ditto. @@ -3819,8 +3819,8 @@ * dispextern.h (MATRIX_ROW_OVERLAPPING_P): New. - * dispextern.h (struct redisplay_interface): Add - fix_overlapping_area. + * dispextern.h (struct redisplay_interface): + Add fix_overlapping_area. * xterm.c (x_append_glyph): Set glyph flag overlaps_vertically_p. @@ -3869,7 +3869,7 @@ 1999-08-03 Tom Breton - * lread.c (read1): Added circular reading code to #N=. + * lread.c (read1): Add circular reading code to #N=. (SUBSTITUTE): New macro. (seen_list): New variable. (substitute_object_in_subtree): New function. @@ -4068,7 +4068,7 @@ * ccl.c (ccl_driver) : Now CCL program ID to call may be stored in the following CCL code. Adjusted for the change of Vccl_program_table. - (resolve_symbol_ccl_program): Adjusted for the new style of + (resolve_symbol_ccl_program): Adjust for the new style of embedded symbols (SYMBOL . PROP) in CCL compiled code. Return Qt is resolving failed. (ccl_get_compiled_code): New function. @@ -4078,7 +4078,7 @@ (Fccl_execute): Get compiled CCL code by just calling setup_ccl_program. (Fccl_execute_on_string): Likewise. - (Fregister_ccl_program): Adjusted for the change of + (Fregister_ccl_program): Adjust for the change of Vccl_program_table. * coding.c (setup_coding_system): Get compiled CCL code by just @@ -4125,7 +4125,7 @@ * xrdb.c (x_load_resources): Set double-click time defaults for Motif list boxes from double-click-time. - * fns.c (Vhash_table_tests): Removed. + * fns.c (Vhash_table_tests): Remove. (Qhash_table_test): New. (syms_of_fns): Initialize Qhash_table_test. (Fmake_hash_table): Look up user-defined tests in symbol prop @@ -4152,7 +4152,7 @@ 1999-07-16 Gerd Moellmann - * frame.h (FRAME_WINDOW_REDISPLAY_P): Removed. Use FRAME_WINDOW_P + * frame.h (FRAME_WINDOW_REDISPLAY_P): Remove. Use FRAME_WINDOW_P instead. * fns.c (cmpfn_eq): Add hash code parameters. @@ -4162,7 +4162,7 @@ 1999-07-15 Gerd Moellmann - * lisp.h (DEFAULT_REHASH_THRESHOLD): Changed to 0.8. + * lisp.h (DEFAULT_REHASH_THRESHOLD): Change to 0.8. * fns.c (maybe_resize_hash_table): Correct computation of index vector size. @@ -4175,19 +4175,19 @@ (survives_gc_p): Make it externally visible. (mark_object): Ditto. - * fns.c (remove_hash_entry): Removed. + * fns.c (remove_hash_entry): Remove. (sweep_weak_hash_tables): New. * print.c (print): Print more information about hash tables. - * xfns.c (image_spec_hash): Removed. + * xfns.c (image_spec_hash): Remove. (lookup_image): Use sxhash instead of image_spec_hash. - (image_spec_equal_p): Removed. + (image_spec_equal_p): Remove. (lookup_image): Use Fequal instead of image_spec_equal_p. 1999-07-14 Gerd Moellmann - * lisp.h (P_): Moved to top of file. + * lisp.h (P_): Move to top of file. * fns.c (make_hash_table): Set new members. @@ -4197,8 +4197,8 @@ * lisp.h (struct Lisp_Hash_Table): Add user_cmp_function, user_hash_function, cmpfn, and hashfn. - * fns.c (build_hash): Removed. - (hash_test): Removed. + * fns.c (build_hash): Remove. + (hash_test): Remove. (cmpfn_eq, cmpfn_eql, cmpfn_equal, cmpfn_user_defined): New. (hashfn_eq, hashfn_eql, hashfn_equal, hashfn_user_defined): New. @@ -4261,7 +4261,7 @@ properties. (handle_single_display_prop): Handle some display property forms for terminal frames. - (Qimage): Moved here from xfns.c. + (Qimage): Move here from xfns.c. * dispextern.h (struct it): New field string_from_display_prop_p. @@ -4331,8 +4331,8 @@ 1999-07-05 Gerd Moellmann - * term.c (TS_cursor_visible): Renamed from TS_visual_mode. - (TS_cursor_normal): Renamed from TS_end_visual_mode. + * term.c (TS_cursor_visible): Rename from TS_visual_mode. + (TS_cursor_normal): Rename from TS_end_visual_mode. (TS_cursor_invisible): New. (term_init): Initialize TS_cursor_invisible. (tty_hide_cursor): New. @@ -4364,7 +4364,7 @@ 1999-07-02 Gerd Moellmann - * dispextern.h (HSCROLL_WINDOWS): Removed. + * dispextern.h (HSCROLL_WINDOWS): Remove. * xdisp.c (mark_window_display_accurate): Don't set w->region_showing. @@ -4378,12 +4378,12 @@ up when cursor is partially visible, make it fully visible. (mark_window_display_accurate): Some cleanup. Record window's last cursor information. - (debug_method_add): Improved. + (debug_method_add): Improve. (redisplay_internal): Record last cursor info only if not consider_all_windows_p. * dispnew.c (update_window): Update top line after scrolling. - (blank_row): Renamed from make_empty_enabled_row. + (blank_row): Rename from make_empty_enabled_row. (increment_glyph_row_buffer_positions): Increment positions in buffers, only. @@ -4406,7 +4406,7 @@ * dispextern.h (struct glyph_matrix): Add member window_vscroll. * xdisp.c (debug_method_add): New. - (debug_redisplay_method): Removed. + (debug_redisplay_method): Remove. (try_window_reusing_current_matrix): Handle case where old window start is the same as new window start. @@ -4550,8 +4550,8 @@ (CURRENT_TOP_LINE_HEIGHT): New. (DESIRED_TOP_LINE_HEIGHT): New. (WINDOW_DISPLAY_TOP_LINE_HEIGHT): New. - (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE): Replaces - WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT. + (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE): + Replaces WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT. (WINDOW_DISPLAY_TEXT_HEIGHT): New. * xterm.c (x_after_update_window_line): Don't draw bitmaps for top @@ -4562,8 +4562,8 @@ x_frame_mode_line_height. (x_get_glyph_string_clip_rect): Take top line into account. (x_clear_end_of_line): Ditto. - (note_mode_line_highlight): Add parameter mode_line_p. Handle - top lines. + (note_mode_line_highlight): Add parameter mode_line_p. + Handle top lines. (note_mouse_highlight): Call note_mode_line_highlight for top lines. (x_erase_phys_cursor): Take top line into account. @@ -4578,12 +4578,12 @@ * xterm.c (x_frame_mode_line_height): Add parameter face_id. - * term.c (estimate_mode_line_height): Renamed from + * term.c (estimate_mode_line_height): Rename from frame_mode_line_height. Add parameter face_id. - (estimate_mode_line_height_hook): Renamed from + (estimate_mode_line_height_hook): Rename from frame_mode_line_height_hook. - (produce_special_glyphs_hook): Removed. - (produce_glyphs_hook): Removed. + (produce_special_glyphs_hook): Remove. + (produce_glyphs_hook): Remove. 1999-06-23 Gerd Moellmann @@ -4604,7 +4604,7 @@ * buffer.h: Add top_line_format. - * xdisp.c (overlay_arrow_changed_p): Removed because not used. + * xdisp.c (overlay_arrow_changed_p): Remove because not used. 1999-06-17 Dave Love @@ -4629,8 +4629,8 @@ * Makefile.in (LIBGIF): Use libungif. - * xdisp.c (compute_window_start_on_continuation_line): Don't - do it if line start is too far away from window start. + * xdisp.c (compute_window_start_on_continuation_line): + Don't do it if line start is too far away from window start. 1999-06-14 Gerd Moellmann @@ -4714,8 +4714,8 @@ * xfaces.c (SCALABLE_FONTS): Define this to enable scalable font support. (Vscalable_fonts_allowed) [SCALABLE_FONTS]: New. - (x_face_list_fonts): Add parameter scalable_fonts_p. Handle - scalable fonts depending on the setting of SCALABLE_FONTS. + (x_face_list_fonts): Add parameter scalable_fonts_p. + Handle scalable fonts depending on the setting of SCALABLE_FONTS. (first_font_matching): List more than one font to find the first non-scalable matching font. (sorted_font_list): Let x_face_list_fonts return scalable fonts @@ -4730,8 +4730,8 @@ 1999-05-26 Gerd Moellmann - * xfns.c (png_load): Let PNG lib handle gamma. Construct - mask only if image contains simple transparency information. + * xfns.c (png_load): Let PNG lib handle gamma. + Construct mask only if image contains simple transparency information. Otherwise, combine image with frame background color. * configure.in (--with-png, HAVE_PNG): New. @@ -4829,7 +4829,7 @@ 1999-03-29 Gerd Moellmann - * xfaces.c (Qraised, Qsunken, QCshadow): Removed. + * xfaces.c (Qraised, Qsunken, QCshadow): Remove. (QCline_width, QCstyle, Qpressed_button, Qreleased_button): New. Use these symbols for the box face attribute instead of the removed ones. @@ -4852,7 +4852,7 @@ * xfaces.c (x_face_list_fonts): New parameter try_alternatives_p. (first_font_matching): New. (set_lface_from_font_name): Use it if font name is a pattern. - (font_field_wildcard_p): Removed. + (font_field_wildcard_p): Remove. * dispnew.c (shift_glyph_matrix): Add `window' parameter. Recompute visible height of rows. @@ -4881,12 +4881,12 @@ (update_window_line): Call after_update_window_line_hook if visible row height has changed. - * dispextern.h (MATRIX_ROW_VISIBLE_HEIGHT): Removed. + * dispextern.h (MATRIX_ROW_VISIBLE_HEIGHT): Remove. (struct glyph_row): New member visible_height. * xfaces.c (font_field_wildcard_p): New. - (set_lface_from_font_name): Remove parameter force_p. Accept - font names containing wildcards. + (set_lface_from_font_name): Remove parameter force_p. + Accept font names containing wildcards. 1999-03-04 Gerd Moellmann @@ -4906,7 +4906,7 @@ * dispextern.h (struct face): Add use_box_color_for_shadows_p. * xterm.c (x_draw_box_rect): New. - (x_draw_glyph_string_box): Renamed from + (x_draw_glyph_string_box): Rename from x_draw_glyph_string_relief. Call x_draw_box_rect. * xfns.c (QCrelief): New. @@ -4914,20 +4914,20 @@ * dispextern.h (struct glyph): Rename left_shadow_p to left_box_line_p, right_shadow_p to right_box_line_p. - (MAX_RELIEF_THICKNESS): Removed. + (MAX_RELIEF_THICKNESS): Remove. (struct it): Rename members having `relief' in their names to contain `box' instead. * xfaces.c (realize_x_face): Handle new box attribute values. - (QCrelief, Qbox): Removed. + (QCrelief, Qbox): Remove. (QCshadow, QCcolor, Qraised, Qsunken): New. (syms_of_xfaces): Initialize new symbols. 1999-03-02 Gerd Moellmann - * dispextern.h (LFACE_RELIEF_INDEX): Removed. + * dispextern.h (LFACE_RELIEF_INDEX): Remove. - * xfaces.c (LFACE_RELIEF): Removed. + * xfaces.c (LFACE_RELIEF): Remove. (merge_face_vector_with_property): Remove handling of `:relief'. (Finternal_set_lisp_face_attribute): Ditto. (Finternal_set_lisp_face_attribute_from_resource): Ditto. @@ -4946,7 +4946,7 @@ * xterm.c (x_draw_glyph_string): Draw underline, overline, strike-through, and boxes. - (x_draw_glyph_string_underline): Removed. + (x_draw_glyph_string_underline): Remove. * xfaces.c (QCoverline, QCstrike_through, QCbox): New. (Qoverline, Qstrike_through, Qbox): New. @@ -5019,7 +5019,7 @@ 1999-01-03 Masatake Yamato * dispextern.h (UNDERLINE_COLOR): Defined. - (struct face): Added two new members. + (struct face): Add two new members. underline_color, underline_defaulted_p. * xfaces.c (merge_face_vector_with_property): @@ -5032,7 +5032,7 @@ 1999-02-12 Gerd Moellmann - * xfns.c (Fx_image_header): Removed. + * xfns.c (Fx_image_header): Remove. 1999-02-07 Gerd Moellmann @@ -5073,16 +5073,16 @@ * xdisp.c (handle_single_display_prop): New. (handle_display_prop): Call it. - (handle_raise_prop): Removed. - (handle_height_prop): Removed. - (handle_space_width_prop): Removed. + (handle_raise_prop): Remove. + (handle_height_prop): Remove. + (handle_space_width_prop): Remove. (handle_face_prop): Remove handling of raised text. (handle_display_prop): Do it here. * dispextern.h (DISPLAY_PROP_IDX): Replaces GLYPH_PROP_IDX. - (RAISE_PROP_IDX): Removed. - (HEIGHT_PROP_IDX): Removed. - (SPACE_WIDTH_PROP_IDX): Removed. + (RAISE_PROP_IDX): Remove. + (HEIGHT_PROP_IDX): Remove. + (SPACE_WIDTH_PROP_IDX): Remove. * xdisp.c (Qdisplay): Replaces Qglyph. (handle_display_prop): Formerly handle_glyph_prop. @@ -5090,8 +5090,8 @@ 1999-01-11 Gerd Moellmann * xdisp.c (reseat_to_string): Set position in display vector to -1. - (handle_stop): Set position in display vector to -1. Don't - check overlay strings when set up to deliver characters from a + (handle_stop): Set position in display vector to -1. + Don't check overlay strings when set up to deliver characters from a display vector. (set_iterator_to_next): At the end of a run of characters from a display vector, check whether the display vector display replaces @@ -5124,7 +5124,7 @@ * buffer.h (struct buffer): indicate_empty_lines renamed from indicate_zv_lines. - * buffer.c (indicate-empty-lines): Renamed from indicate_zv_lines. + * buffer.c (indicate-empty-lines): Rename from indicate_zv_lines. (default-indicate-zv-lines): Likewise. * dispextern.h (struct glyph_row): Rename indicate_zv_line_p @@ -5139,7 +5139,7 @@ and `N-'. * xfns.c (xbm_scan): New. - (xbm_read_hexint): Removed. + (xbm_read_hexint): Remove. (xbm_read_bitmap_file_data): Use xbm_scan. * fileio.c (Finsert_file_contents): Prevent redisplay optimizations. @@ -5155,8 +5155,8 @@ * xfaces.c (face_with_height): New. - * xdisp.c (eval_handler): Renamed from eval_mode_handler. - (eval_form): Renamed from eval_mode_element. + * xdisp.c (eval_handler): Rename from eval_mode_handler. + (eval_form): Rename from eval_mode_element. (handle_face_prop): Use it. (Qheight): Replaces Qsmaller. (handle_height_prop): Replaces handle_smaller_prop. @@ -5183,7 +5183,7 @@ 1998-11-28 Gerd Moellmann - * config.in (PROTO): Removed. + * config.in (PROTO): Remove. * xterm.h: Change PROTO to P_. @@ -5225,7 +5225,7 @@ * xterm.c (x_scroll_bar_move): Clear to the left and right of toolkit scroll bars differently. - (x_scroll_bar_move): Removed. + (x_scroll_bar_move): Remove. (XTset_vertical_scroll_bar): Move code from x_scroll_bar_move here. * dispextern.h: Make it compilable --with-x=no. @@ -5256,8 +5256,8 @@ 1998-11-23 Gerd Moellmann - * xdisp.c (restore_overlay_strings): Removed. - (restore_dpvec): Removed. + * xdisp.c (restore_overlay_strings): Remove. + (restore_dpvec): Remove. (init_from_display_pos): Inline both functions above. * xfns.c (IMAGE_NON_NEGATIVE_INTEGER_VALUE): New. @@ -5270,7 +5270,7 @@ (gif_format): Ditto. (gs_format): Ditto. - * xdisp.c (set_window_cursor): Removed. + * xdisp.c (set_window_cursor): Remove. (redisplay_internal): Case cursor motion in cursor line of selected window; use set_cursor_from_row. @@ -5641,7 +5641,7 @@ * xdisp.c (redisplay_window): Always resize toolbar window if auto_resize_toolbar_p is non-zero. - (auto_resize_toolbar_p): Renamed from auto_resize_toolbar. + (auto_resize_toolbar_p): Rename from auto_resize_toolbar. (window_box): New. (window_box_height): New. (window_box_width): New. @@ -5735,12 +5735,12 @@ * xfns.c (x_laplace): New. (x_laplace_read_row): New. (x_laplace_write_row): New. - (lookup_image): Handle common image attributes here. New - attribute `:algorithm'. + (lookup_image): Handle common image attributes here. + New attribute `:algorithm'. * xfaces.c (clear_face_cache): Call clear_image_cache. - * xterm.c (x_inverted_image_mask): Removed. + * xterm.c (x_inverted_image_mask): Remove. (x_draw_image_foreground_1): New. (x_draw_image_glyph_string): Draw images with mask to a temporary pixmap to reduce flickering. @@ -5755,7 +5755,7 @@ * xfns.c (cache_image): Correct call to xrealloc. - * dispnew.c (Fset_toolbar_height): Removed. + * dispnew.c (Fset_toolbar_height): Remove. * xdisp.c (init_xdisp): Use FRAME_TOP_MARGIN instead of FRAME_MENU_BAR_LINES. @@ -5838,8 +5838,8 @@ (clear_image_cache): Additional parameter force_p. (Fclear_image_cache): New. (x_find_image_file): New. - (xbm_load): Handle `:margin' and `:relief'. Use - x_find_image_file. + (xbm_load): Handle `:margin' and `:relief'. + Use x_find_image_file. (xpm_load): Likewise. (pbm_load): Likewise. (jpeg_load): Likewise. @@ -5939,8 +5939,8 @@ * frame.h (struct frame): Add toolbar-related members toolbar_window, desired_toolbar_items, current_toolbar_items, desired_toolbar_string, current_toolbar_string, - n_desired_toolbar_items, n_current_toolbar_items. Add - window_height. + n_desired_toolbar_items, n_current_toolbar_items. + Add window_height. * xterm.c (x_after_update_window_line): Don't draw bitmap areas for pseudo-windows. @@ -6024,17 +6024,17 @@ 1998-09-06 Gerd Moellmann - * lisp.h (HAVE_FACES): Removed. - - * dispextern.h (HAVE_FACES): Removed. - - * config.in (HAVE_FACES): Removed. - - * dispnew.c (HAVE_FACES): Removed. - - * xdisp.c (HAVE_FACES): Removed. - - * xfaces.c (HAVE_FACES): Removed. + * lisp.h (HAVE_FACES): Remove. + + * dispextern.h (HAVE_FACES): Remove. + + * config.in (HAVE_FACES): Remove. + + * dispnew.c (HAVE_FACES): Remove. + + * xdisp.c (HAVE_FACES): Remove. + + * xfaces.c (HAVE_FACES): Remove. 1998-09-05 Gerd Moellmann @@ -6042,8 +6042,8 @@ free realized faces. * xfaces.c (free_all_realized_faces): Make it externally visible. - (Finternal_set_lisp_face_attribute): Increment - windows_or_buffers_changed. + (Finternal_set_lisp_face_attribute): + Increment windows_or_buffers_changed. * dispnew.c (direct_output_for_insert): Give up if face_change_count is non-zero. @@ -6076,9 +6076,9 @@ * term.c (OUTPUT_IF): Make replacement text have statement form. (OUTPUT1_IF): Ditto. - (TS_italic_mode, TS_end_italic_mode): Removed. - (TS_bold_mode): Removed. - (TS_underscore_mode, TS_end_underscore_mode): Removed. + (TS_italic_mode, TS_end_italic_mode): Remove. + (TS_bold_mode): Remove. + (TS_underscore_mode, TS_end_underscore_mode): Remove. (TS_enter_bold_mode, TS_enter_dim_mode, TS_enter_blink_mode): New. (TS_enter_reverse_mode): New. (TS_enter_underline_mode, TS_exit_underline_mode): New. @@ -6187,8 +6187,8 @@ * frame.h (FRAME_WINDOW_WIDTH_ARG): Add bitmap area widths. - * dispnew.c (allocate_matrices_for_window_redisplay): Compute - total pixel width of window differently. + * dispnew.c (allocate_matrices_for_window_redisplay): + Compute total pixel width of window differently. * xdisp.c (init_iterator): Compute width of mode line differently. @@ -6209,7 +6209,7 @@ (update_window_tree): Parameter no_scrolling_p removed. (update_single_window): Ditto. - * xterm.c (x_get_char_font_and_encoding): Renamed to + * xterm.c (x_get_char_font_and_encoding): Rename to x_get_char_face_and_encoding. * dispnew.c (update_text_area): Don't call get_glyph_overhangs @@ -6254,8 +6254,8 @@ * xterm.c (note_mouse_highlight): Set BEGV_BYTE, ZV_BYTE. - * xfaces.c (Vx_unibyte_registry_and_encoding): Removed. Use - face_default_registry instead. + * xfaces.c (Vx_unibyte_registry_and_encoding): Remove. + Use face_default_registry instead. * syntax.c (scan_sexps_forward): Set up syntax table before jumping to initial state label. @@ -6372,13 +6372,13 @@ (struct iterator_stack_entry): Add multibyte_p. * xdisp.c (string_pos): Use string_char_to_byte. - (char_charset): Removed. + (char_charset): Remove. 1998-08-03 Gerd Moellmann * xterm.c (x_draw_image_glyph_string_foreground): Draw a rectangle for a block cursor over an image without a mask. - (x_stretch_block_cursor): Added. Non-zero means don't draw + (x_stretch_block_cursor): Add. Non-zero means don't draw a block cursor over a stretch as wide as that stretch. (x_draw_stretch_glyph_string): Use it. (x_draw_hollow_cursor): Ditto. @@ -6389,7 +6389,7 @@ * xdisp.c (char_charset): Return charset of a character, depending on whether or not multi-byte characters are enabled. - * xfaces.c (Fset_face_charset_registry): Removed. + * xfaces.c (Fset_face_charset_registry): Remove. (x_charset_registry): Determine registry from charset plist. 1998-08-02 Gerd Moellmann @@ -6401,7 +6401,7 @@ redisplay interface. * keyboard.c (detect_input_pending_run_timers): Likewise. - * dispextern.h (produce_*glyphs_hook): Removed. + * dispextern.h (produce_*glyphs_hook): Remove. * term.c (produce_*glyphs): Ditto. (cursor_to): Remove pixel position parameters. @@ -6457,7 +6457,7 @@ * xterm.c (x_flush): Flush X output buffer. (XTflash): Use it. - * xfaces.c (lface_from_face_name): Renamed from lface_from_symbol. + * xfaces.c (lface_from_face_name): Rename from lface_from_symbol. Allow strings as face names. * xfns.c (forall_images_in_image_cache): Check that frame is @@ -6493,7 +6493,7 @@ (Finternal_lisp_face_attribute_values): Ditto. (syms_of_xfaces): Define the symbol `:reverse-video'. - * xdisp.c (get_glyph_property): Renamed from + * xdisp.c (get_glyph_property): Rename from fill_iterator_from_glyph_property. (next_element_from_buffer): Handle case that no `glyph' property was found correctly. @@ -6501,28 +6501,28 @@ 1998-07-29 Gerd Moellmann - * dispnew.c (Fshow_cursor): Renamed from blink_cursor. Take - additional window argument. + * dispnew.c (Fshow_cursor): Rename from blink_cursor. + Take additional window argument. - * xdisp.c (reseat_at_previous_visible_line_start): Renamed from + * xdisp.c (reseat_at_previous_visible_line_start): Rename from set_iterator_to_previous_visible_line_start. (reseat_at_next_visible_line_start): Likewise. - (compute_stop_pos): Renamed from set_iterator_stop_pos. - (face_before_or_after_it_pos): Renamed from get_face_at_it_pos. - (compute_face_in_buffer): Renamed from + (compute_stop_pos): Rename from set_iterator_stop_pos. + (face_before_or_after_it_pos): Rename from get_face_at_it_pos. + (compute_face_in_buffer): Rename from compute_face_at_iterator_position. - (compute_face_in_string): Renamed from + (compute_face_in_string): Rename from compute_face_at_iterator_string_position. - (get_space_width): Renamed from get_iterator_space_width. - (next_overlay_string): Renamed from + (get_space_width): Rename from get_iterator_space_width. + (next_overlay_string): Rename from set_iterator_to_next_overlay_string. - (get_overlay_strings): Renamed from + (get_overlay_strings): Rename from get_overlay_strings_at_iterator_position. - (restore_overlay_strings): Renamed from + (restore_overlay_strings): Rename from setup_overlay_strings_from_glyph_pos. - (restore_dpvec): Renamed from setup_iterator_dpvec_from_glyph_pos. - (init_from_display_pos): Renamed from init_iterator_from_glyph_pos. - (init_to_row_start): Renamed from init_iterator_to_row_start. + (restore_dpvec): Rename from setup_iterator_dpvec_from_glyph_pos. + (init_from_display_pos): Rename from init_iterator_from_glyph_pos. + (init_to_row_start): Rename from init_iterator_to_row_start. (init_to_row_end): Formerly init_iterator_to_next_row_start. * xterm.c: Merge with 20.2.97. @@ -6532,26 +6532,26 @@ simple charpos. * xdisp.c (this_line_start_pos): Use struct text_pos. - (this_line_end_pos): Renamed from .*endpos; use struct text_pos. - (enum move_it_result): Renamed from move_iterator_result. + (this_line_end_pos): Rename from .*endpos; use struct text_pos. + (enum move_it_result): Rename from move_iterator_result. (string_pos_nchars_ahead): Compute text_pos in a string from a known text_pos plus a character delta. (string_pos): Compute text_pos in string from charpos. (c_string_pos): Likewise for a C string. (number_of_chars): Return number of characters in a possibly multi-byte C string. - (check_it): Renamed from check_iterator. Check that charpos and + (check_it): Rename from check_iterator. Check that charpos and bytepos are in sync. - (push_it): Renamed from save_iterator_settings. - (pop_it): Renamed from restore_iterator_settings. - (move_it_.*): Renamed from move_iterator_.*. + (push_it): Rename from save_iterator_settings. + (pop_it): Rename from restore_iterator_settings. + (move_it_.*): Rename from move_iterator_.*. (charset_at_position): Take charpos/bytepos into account. (back_to_previous_line_start): Set iterator to previous line start. (forward_to_next_line_start): Set iterator to next line start. - (back_to_previous_visible_line_start): Renamed from + (back_to_previous_visible_line_start): Rename from move_iterator_previous_visible_line_start. (set_iterator_to_next_visible_line_start): Handle charpos/bytepos. - (get_face_at_it_pos): Renamed from get_face_from_cursor_pos. + (get_face_at_it_pos): Rename from get_face_from_cursor_pos. Handle charpos/bytepos. (compute_face_at_iterator_position): Handle charpos/bytepos. (compute_face_at_iterator_string_position): Likewise. @@ -6593,7 +6593,7 @@ (copy_glyph_row_contents): Ditto. (check_matrix_invariants): Add additional checks for charpos/ bytepos consistency. - (direct_output_for_insert): Changed for charpos/bytepos. + (direct_output_for_insert): Change for charpos/bytepos. (buffer_posn_from_coords): Likewise. Put code dealing with `direction-reversed' in #if 0. @@ -6630,10 +6630,10 @@ (SET_TEXT_POS_FROM_MARKER): Set a text_pos from a marker. (SET_MARKER_FROM_TEXT_POS): Set a marker from a text_pos. (TEXT_POS_EQUAL_P): Compare two text_pos structures for equality. - (struct display_pos): Renamed from glyph_pos. Use struct text_pos + (struct display_pos): Rename from glyph_pos. Use struct text_pos for buffer and string positions. (struct glyph): Use text_pos. - (struct it): Renamed from display_iterator. Use text_pos. + (struct it): Rename from display_iterator. Use text_pos. 1998-07-23 Gerd Moellmann @@ -6650,7 +6650,7 @@ * xfns.c (prepare_image_for_display): Don't set loading_failed_p flag of images. - * dispextern.h (struct image): Removed member loading_failed_p. + * dispextern.h (struct image): Remove member loading_failed_p. It's probably better to have the chance to try to load an image again. @@ -6703,28 +6703,28 @@ * xfns.c (tiff_image_p, tiff_load): Support TIFF images via libtiff34. - * configure.in (--with-tiff, HAVE_TIFF): Added. - - * config.in (HAVE_TIFF): Added. - - * Makefile.in (LIBTIFF): Added. + * configure.in (--with-tiff, HAVE_TIFF): Add. + + * config.in (HAVE_TIFF): Add. + + * Makefile.in (LIBTIFF): Add. * xfns.c (jpeg_image_p, jpeg_load): Support JPEG images. - * Makefile.in (LIBJPEG): Added. + * Makefile.in (LIBJPEG): Add. * xfns.c (resource_types): Enumerators renamed to RES_TYPE_NUMBER, RES_TYPE_BOOLEAN etc. because of conflict of `boolean' with jpeglib.h. - * configure.in (HAVE_JPEG, --with-jpeg): Added. On systems + * configure.in (HAVE_JPEG, --with-jpeg): Add. On systems where the library is installed in /usr/local/lib, e.g. FreeBSD, configure must be run with `--x-includes=/usr/X11R6/include: /usr/local/include --x-libraries=/usr/X11R6/lib:/usr/local/lib'. 1998-07-18 Gerd Moellmann - * config.in (HAVE_JPEG): Added. + * config.in (HAVE_JPEG): Add. * xfns.c (ct_init): Initialize color table used to map RGB colors from images to X pixel colors. @@ -6837,20 +6837,20 @@ (redisplay_window): Case cursor movement. Don't try it if last_cursor.vpos is out of range. - * xdisp.c (set_cursor_from_row): Set this_line_.* variables. This - way, the display optimization for the line containing the cursor + * xdisp.c (set_cursor_from_row): Set this_line_.* variables. + This way, the display optimization for the line containing the cursor is used more frequently, esp. when we have a blinking cursor. (display_line): Don't set this_line_.* variables. - * xterm.c (x_redraw_cursor): Removed. + * xterm.c (x_redraw_cursor): Remove. (x_display_and_set_cursor): Set cursor type depending on cursor_off_p flag of window. - * dispnew.c (redraw_cursor_hook): Removed. + * dispnew.c (redraw_cursor_hook): Remove. (Fblink_cursor): Additional parameter on_p to set the cursor_off_p member of the selected window. - * xfaces.c (Fface_font): Added for compatibility with 20.2. + * xfaces.c (Fface_font): Add for compatibility with 20.2. * xterm.c (x_y_to_hpos_vpos): Return null if not over text. Return glyph area under x/y. @@ -6880,8 +6880,8 @@ 1998-06-29 Gerd Moellmann - * xfaces.c (Finternal_make_lisp_face): Increment - lface_id_to_name_size when lface_id_to_name is reallocated. + * xfaces.c (Finternal_make_lisp_face): + Increment lface_id_to_name_size when lface_id_to_name is reallocated. 1998-06-27 Gerd Moellmann @@ -6892,12 +6892,12 @@ 1998-05-09 Gerd Moellmann - * xdisp.c (set_iterator_to_next_visible_line_start): Don't - do anything if iterator is at ZV because scan_buffer doesn't + * xdisp.c (set_iterator_to_next_visible_line_start): + Don't do anything if iterator is at ZV because scan_buffer doesn't work otherwise. * xterm.c (x_encode_char): Inline it. - (x_get_char_font_and_encoding): Simplified. + (x_get_char_font_and_encoding): Simplify. (x_per_char_metric): Inline it. * xterm.c (x_draw_glyph_string_relief): Use clipping. @@ -6926,15 +6926,15 @@ * xdisp.c (display_line): Compute row height from glyphs in marginal areas. - * xterm.c (x_draw_image_glyph_string_background): Draw - background of an image glyph string. + * xterm.c (x_draw_image_glyph_string_background): + Draw background of an image glyph string. (x_draw_glyph_string_bg_rect): Draw a rectangular region of the background of a glyph string. (x_draw_image_glyph_string_foreground): Draw the foreground of an image glyph string. (x_inverted_image_mask): Return the inverted mask of an image. - * xfns.c (x_draw_image): Removed. + * xfns.c (x_draw_image): Remove. * dispextern.h (struct image_type): Remove drawing function. @@ -6966,8 +6966,8 @@ image drawing function. * xdisp.c (fill_iterator_from_glyph_property): Use position of - first character with `glyph' property as image position. Set - iterator back to that position as long as the image hasn't been + first character with `glyph' property as image position. + Set iterator back to that position as long as the image hasn't been consumed with set_iterator_to_next. (set_cursor_from_row): Accept when glyph with given position is not found in the row. Set cursor x to end of line in that case, @@ -6993,7 +6993,7 @@ * dispextern.h (struct glyph_row): Use unsigned hash value. - * xdisp.c (display_line): Simplified and made faster by setting + * xdisp.c (display_line): Simplify and made faster by setting the cursor with set_cursor_from_row. (set_cursor_from_row): Handle rows of desired matrix. @@ -7001,8 +7001,8 @@ * xdisp.c (set_cursor_from_row): Don't put cursor on glyphs with type != CHAR_GLYPH. - (fill_iterator_from_glyph_property): Return void. Set - method to next_element_from_image. + (fill_iterator_from_glyph_property): Return void. + Set method to next_element_from_image. (next_element_from_image): Dummy function for delivering a single image id. (set_iterator_to_next): Add method next_element_from_image. @@ -7037,7 +7037,7 @@ * xterm.c (x_produce_glyphs): Use ASCII face for spaces of a TAB. - * xdisp.c (fill_iterator_from_glyph_property): Renamed from + * xdisp.c (fill_iterator_from_glyph_property): Rename from setup_iterator_from_glyph_property. Don't do it for terminal frames. @@ -7073,12 +7073,12 @@ * config.in: Add HAVE_XPM. - * xfns.c (xbm_draw): Removed. + * xfns.c (xbm_draw): Remove. (x_draw_image): Default implementation for drawing images. (xbm_keyword_index): Remove XBM_DEPTH. (xbm_format): Remove `:depth'. - (xbm_image_spec_from_file): Removed to reduce consing. - (xbm_load_image_from_file): Added for the same reason. + (xbm_image_spec_from_file): Remove to reduce consing. + (xbm_load_image_from_file): Add for the same reason. * xterm.c (x_fill_image_glyph_string): Don't set ybase of glyph string. @@ -7148,8 +7148,8 @@ * widget.c (widget_store_internal_border): Return void. - * xfns.c (x_destroy_bitmap): Use xfree instead of free. Return - void. + * xfns.c (x_destroy_bitmap): Use xfree instead of free. + Return void. (init_x_parm_symbols): Return void. (x_report_frame_params): Ditto. (x_set_border_pixel): Ditto. @@ -7220,7 +7220,7 @@ * dispnew.c (adjust_frame_glyphs_for_window_redisplay): Use these macros. - * xterm.c (x_font_min_bounds): Moved here from xfaces.c. + * xterm.c (x_font_min_bounds): Move here from xfaces.c. (x_compute_min_char_bounds): Formerly min_char_bounds in xfaces.c. (x_load_font): Use x_compute_min_char_bounds. @@ -7238,7 +7238,7 @@ for characters < 0177 in default face. Prepare face for display before returning it. (x_produce_glyphs): Use it->charset. - (x_get_char_font_and_encoding): Simplified. + (x_get_char_font_and_encoding): Simplify. (x_encode_char): Remove parameter `font'. * xfaces.c (choose_face_font): If registry from charset symbol @@ -7309,8 +7309,8 @@ * dispextern.h (FACE_FOR_CHARSET): Replacement for function lookup_face_for_charset. - * xfaces.c (free_font_names): Renamed from free_split_font_names. - (free_all_realized_faces): Renamed from remove_all_realized_faces. + * xfaces.c (free_font_names): Rename from free_split_font_names. + (free_all_realized_faces): Rename from remove_all_realized_faces. 1998-04-25 Gerd Moellmann @@ -7329,8 +7329,8 @@ 1998-04-24 Gerd Moellmann - * dispextern.h (struct face): Member - fontset_chosen_for_realization_p removed. + * dispextern.h (struct face): + Member fontset_chosen_for_realization_p removed. * xfaces.c (cache_face): If face->fontset >= 0, add face to the end of the collision list, so that we find more specific faces @@ -7365,8 +7365,8 @@ (xlfd_point_size): Return -1 if resolution or point size of font unknown. - * xfaces.c (free_font): Removed. - (load_face_font_or_fontset): Renamed from load_font. + * xfaces.c (free_font): Remove. + (load_face_font_or_fontset): Rename from load_font. (load_face_font_or_fontset): Use message2 instead of signaling. (load_color): Likewise. (load_pixmap): Likewise. @@ -7408,8 +7408,8 @@ to -1 so that it will compute the right face for the truncation glyphs. - * xfaces.c (realize_face): Set - face->fontset_chosen_for_realization_p. + * xfaces.c (realize_face): + Set face->fontset_chosen_for_realization_p. (lookup_face_for_charset): If fontset wasn't specified originally and new charset != CHARSET_COMPOSITION, get a new face for that charset. @@ -7461,9 +7461,9 @@ (lface_hash): Add weight, slant, swidth and relief to hash value. (lface_equal_p): Make it faster. (lface_from_symbol): Use assq_no_quit. - (Fnote_default_face_changed): Removed. + (Fnote_default_face_changed): Remove. (cmp_font_names): Use strcmp instead of xstricmp. - (face_charset_registries): Removed. + (face_charset_registries): Remove. 1998-04-20 Gerd Moellmann @@ -7487,8 +7487,8 @@ * xfaces.c (Finternal_set_lisp_face_attribute): Add :bold and :italic for compatibility. - (Finternal_set_lisp_face_attribute_from_resource): Handle - :bold and :italic. Handle boolean resource values for + (Finternal_set_lisp_face_attribute_from_resource): + Handle :bold and :italic. Handle boolean resource values for :underline and :italic. * xfns.c (display_x_get_resource): Make it externally visible. @@ -7500,7 +7500,7 @@ definitions. (Finternal_lisp_face_equal_p): Additional frame argument. (merge_lisp_face_vector_with_property): Ditto. - (Frealize_basic_faces): Removed. + (Frealize_basic_faces): Remove. (Finternal_get_lisp_face_attribute): Additional frame argument. (Finternal_lisp_face_p): Ditto. (load_color) [MSDOS]: Removed because it isn't clear how @@ -7531,8 +7531,8 @@ * xdisp.c (redisplay_internal, echo_area-display): If realized faces have been cleared, call recompute_basic_faces. - * xfaces.c (recompute_basic_faces): Free realized faces. Reset - face_attributes_changed_p. + * xfaces.c (recompute_basic_faces): Free realized faces. + Reset face_attributes_changed_p. (remove_all_realized_faces): Remove all realized faces on all frames. (Finternal_set_lisp_face_attribute): Call remove_all_realized_faces. @@ -7541,7 +7541,7 @@ changed since the last redisplay, recompute basic faces. (echo_area_display): Ditto. - * xfaces.c (clear_face_gcs): Renamed from clear_realized_face_cache. + * xfaces.c (clear_face_gcs): Rename from clear_realized_face_cache. * xfaces.c (min_char_bounds): If face cache not yet present, don't try to get font dimensions from faces. @@ -7549,11 +7549,11 @@ * xterm.c (x_frame_mode_line_height): If face cache not present set, return default height. - * alloc.c (mark_face_cache): Check for null faces. Correct - index bug. + * alloc.c (mark_face_cache): Check for null faces. + Correct index bug. - * dispextern.h (struct face): Renamed from struct rface. Member - underline renamed underline_p. Make it a bit-field. + * dispextern.h (struct face): Rename from struct rface. + Member underline renamed underline_p. Make it a bit-field. * xfaces.c (init_frame_faces): Allocate face cache. (free_frame_faces): Free face cache. @@ -7562,7 +7562,7 @@ * frame.c (make_frame): Initialze face cache with null. - * xfaces.c (same_size_fonts): Removed. + * xfaces.c (same_size_fonts): Remove. * xterm.c (x_set_glyph_string_gc): Add post-condition s->gc != 0. @@ -7584,56 +7584,56 @@ * xfaces.c (syms_of_xfaces): Correct calls to defsubr. - * xfns.c (Fx_face_fixed_p): Removed. - (Fx_list_fonts): Moved to xfaces.c. + * xfns.c (Fx_face_fixed_p): Remove. + (Fx_list_fonts): Move to xfaces.c. - * xfaces.c (compute_face_at_buffer_pos): Renamed to + * xfaces.c (compute_face_at_buffer_pos): Rename to face_at_buffer_position. Parameter charset removed; always compute face for CHARSET_ASCII. - (face_at_string_position): Renamed from + (face_at_string_position): Rename from compute_face_at_string_pos. Parameter charset removed; always compute for CHARSET_ASCII. (lookup_face_for_charset): Take frame parameter instead of face_cache. (lookup_face): Ditto. - (compute_char_face): Renamed from compute_glyph_face. + (compute_char_face): Rename from compute_glyph_face. * xdisp.c (init_iterator): Initialize charset member. (reseat_iterator_to_string): Ditto. (get_charset_at_buffer_position): Determine charset at buffer position in current_buffer. (reseat_iterator): Call above function. - (compute_face_at_iterator_position): Call - compute_face_at_buffer_pos. - (compute_face_at_iterator_string_position): Call - compute_face_at_string_pos. - (get_face_from_id): Removed. + (compute_face_at_iterator_position): + Call compute_face_at_buffer_pos. + (compute_face_at_iterator_string_position): + Call compute_face_at_string_pos. + (get_face_from_id): Remove. (get_face_from_cursor_pos): Call compute_face_at_buffer_pos. Call get_charset_at_buffer_position. (reseat_iterator): Determine face if charset at pos differs from iterator's charset. - (reseat_iterator_to_glyph_pos): Removed. + (reseat_iterator_to_glyph_pos): Remove. * xfaces.c (compute_face_at_bufpos): Remove parameter charset. Determine charset from buffer position. - (compute_string_char_face): Renamed to compute_face_at_string_pos. - (compute_face_at_bufpos): Renamed to compute_face_at_buffer_pos. + (compute_string_char_face): Rename to compute_face_at_string_pos. + (compute_face_at_bufpos): Rename to compute_face_at_buffer_pos. * dispextern.h (struct display_iterator): Add member charset. 1998-04-15 Gerd Moellmann - * xfaces.c (compute_char_face): Removed. + * xfaces.c (compute_char_face): Remove. * xdisp.c (get_overlay_arrow_glyph_row): Use compute_glyph_face with new parameter list. - * xfaces.c (region_face): Removed. - (allocate_face): Removed. + * xfaces.c (region_face): Remove. + (allocate_face): Remove. (copy_face): Ditto. - (face_eql): Removed. - (intern_face): Removed. - (clear_face_cache): Removed. + (face_eql): Remove. + (intern_face): Remove. + (clear_face_cache): Remove. (load_font): Ditto. (unload_font): Ditto. (load_color): Ditto. @@ -7644,9 +7644,9 @@ (merge_faces): Ditto. (compute_base_face): Ditto. (merge_face_list): Ditto. - (Fmake_face_internal): Removed. + (Fmake_face_internal): Remove. (Fset_face_attribute_internal): Ditto. - (face_name_id_number): Removed. + (face_name_id_number): Remove. (Fframe_face_alist): Ditto. (Fset_frame_face_alist): Ditto. (Finternal_next_face_id): Ditto. @@ -7693,7 +7693,7 @@ * fontset.h: Add external declarations for Vfontset_alias_alist and Vglobal_fontset_alist. - * xfaces.c (merge_lisp_face_vector_with_property): Simplified. + * xfaces.c (merge_lisp_face_vector_with_property): Simplify. (realize_default_face): If frame parameters contain an artificial font name naming a fontset, set the family of the default face to the fontset name given by the registry. @@ -7741,11 +7741,11 @@ * xdisp.c (set_cursor_from_row): If PT is not found in the row, display the cursor at the start of the row. - * dispnew.c (direct_output_forward_char): Call - set_cursor_from_row. + * dispnew.c (direct_output_forward_char): + Call set_cursor_from_row. - * xdisp.c (setup_iterator_overlay_strings_from_glyph_pos): If - position is not in an overlay string, set iterator's position and + * xdisp.c (setup_iterator_overlay_strings_from_glyph_pos): + If position is not in an overlay string, set iterator's position and method explicitly so. (set_cursor_from_row): Correct cursor position calculation. Make it externally visible. @@ -7907,7 +7907,7 @@ * dispnew.c: Make compilable with -Wall. * term.c: Ditto. - * charset.h (CHAR_LEN): Moved here from dispextern.h. + * charset.h (CHAR_LEN): Move here from dispextern.h. 1998-03-14 Gerd Moellmann @@ -7939,8 +7939,8 @@ * xdisp.c (init_iterator): Increase last_visible_x by vertical scroll bar width for mode lines. - * dispnew.c (allocate_matrices_for_window_redisplay): Include - vertical scroll bar width in width calculation so that we can + * dispnew.c (allocate_matrices_for_window_redisplay): + Include vertical scroll bar width in width calculation so that we can display mode lines wider. * xdisp.c (redisplay_window): Restore buffers before returning @@ -7958,7 +7958,7 @@ * dispextern.h (struct glyph_row): Member max_ascent renamed ascent. Member max_descent replaced by height. (struct display_iterator): Member max_descent replaced by height. - (MATRIX_ROW_PIXEL_HEIGHT): Removed. + (MATRIX_ROW_PIXEL_HEIGHT): Remove. * xterm.c (x_alloc_lighter_color): Don't free colors if visual class makes it unnecessary or dangerous. @@ -7999,10 +7999,10 @@ * xterm.c (x_scroll_run): Don't set updated_window to null. This resets updated_window when called from scrolling_window. - * dispextern.h (scroll_run_hook): Renamed from line_dance_hook. + * dispextern.h (scroll_run_hook): Rename from line_dance_hook. - * xterm.c (x_scroll_run): Additional window parameter. Set - and reset updated_window. + * xterm.c (x_scroll_run): Additional window parameter. + Set and reset updated_window. * dispnew.c (line_dance_hook): Additional window parameter. @@ -8016,7 +8016,7 @@ * dispnew.c (Fblink_cursor): Remove call to detect_input_pending. Don't redraw cursor during redisplay. - * xterm.c (x_scroll_run): Renamed from do_line_dance. + * xterm.c (x_scroll_run): Rename from do_line_dance. * xdisp.c (redisplay_window): For window-based redisplay, always try try_window_id. @@ -8080,8 +8080,8 @@ * xdisp.c (set_next_iterator_stop_pos): No longer static. - * dispnew.c (direct_output_for_insert): Call - set_next_iterator_stop_pos after having changed it2.endpos. + * dispnew.c (direct_output_for_insert): + Call set_next_iterator_stop_pos after having changed it2.endpos. 1998-02-17 Gerd Moellmann @@ -8102,22 +8102,22 @@ enough glyphs to display a mode line or menu line which draws over flags areas. - * xterm.c (XTset_vertical_scroll_bar): Use - WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT instead of + * xterm.c (XTset_vertical_scroll_bar): + Use WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT instead of VERTICAL_SCROLL_BAR_PIXEL_HEIGHT. (x_draw_glyphs): Draw over flags areas when drawing a mode line or menu. (x_set_glyph_string_clipping): Set clipping differently if drawing a mode line or menu line. - * xterm.h (VERTICAL_SCROLL_BAR_PIXEL_HEIGHT): Removed. + * xterm.h (VERTICAL_SCROLL_BAR_PIXEL_HEIGHT): Remove. * xterm.c (expose_line): Don't draw bitmaps for mode lines and menu lines. (x_scroll_bar_create): Don't clear flags areas. (x_draw_row_bitmaps): Clear visible row height, only. - * dispnew.c (Fblink_cursor): Moved here from xdisp.c. + * dispnew.c (Fblink_cursor): Move here from xdisp.c. 1998-02-15 Gerd Moellmann @@ -8137,21 +8137,21 @@ * dispnew.c (update_window_line): Special handling of inverse lines in #if 0 removed. - * xterm.c (x_write_glyphs): Renamed from XTwrite_glyphs. - (x_insert_glyphs): Renamed from XTinsert_glyphs. - (x_clear_frame): Renamed from XTclear_frame. - (x_clear_end_of_line): Renamed from XTclear_end_of_line. - (x_ins_del_lines): Renamed from XTins_del_lines. - (x_change_line_height): Renamed from XTchange_line_height. - (x_delete_glyphs): Renamed from XTdelete_glyphs. - (x_clear_cursor): Renamed from clear_cursor. - (x_update_begin): Renamed from XTupdate_begin. - (x_update_end): Renamed from XTupdate_end. - (x_update_window_begin): Renamed from XTupdate_window_begin. - (x_update_window_end): Renamed from XTupdate_window_end. - (x_frame_mode_line_height): Renamed from XTframe_mode_line_height. - (x_produce_glyphs): Renamed from XTproduce_glyphs. - (x_produce_special_glyphs): Renamed from XTproduce_special_glyphs. + * xterm.c (x_write_glyphs): Rename from XTwrite_glyphs. + (x_insert_glyphs): Rename from XTinsert_glyphs. + (x_clear_frame): Rename from XTclear_frame. + (x_clear_end_of_line): Rename from XTclear_end_of_line. + (x_ins_del_lines): Rename from XTins_del_lines. + (x_change_line_height): Rename from XTchange_line_height. + (x_delete_glyphs): Rename from XTdelete_glyphs. + (x_clear_cursor): Rename from clear_cursor. + (x_update_begin): Rename from XTupdate_begin. + (x_update_end): Rename from XTupdate_end. + (x_update_window_begin): Rename from XTupdate_window_begin. + (x_update_window_end): Rename from XTupdate_window_end. + (x_frame_mode_line_height): Rename from XTframe_mode_line_height. + (x_produce_glyphs): Rename from XTproduce_glyphs. + (x_produce_special_glyphs): Rename from XTproduce_special_glyphs. (x_produce_special_glyphs): Implementation in #if 0 removed. * xdisp.c (Fdump_redisplay_state): Display row's fill_line_p @@ -8232,14 +8232,14 @@ * dispextern.h (struct glyph_matrix): New member window_width. - * dispnew.c (adjust_glyph_matrix): Set window_width. Optimize - case of changing window height. + * dispnew.c (adjust_glyph_matrix): Set window_width. + Optimize case of changing window height. * xterm.c (x_draw_row_bitmaps): Don't clear vertical window border to the left. - * dispextern.h (struct glyph_row): Remove right_to_left_p. RMS - says this aspect of Emacs is currently redesigned. + * dispextern.h (struct glyph_row): Remove right_to_left_p. + RMS says this aspect of Emacs is currently redesigned. * xterm.c (x_clip_to_row): Subtract 1 from clip width if we have to draw a vertical border. @@ -8268,8 +8268,8 @@ removed. (struct glyph): Ditto. - * xterm.c (x_draw_relief): Removed. - (x_draw_bitmap): Renamed from draw_bitmap. + * xterm.c (x_draw_relief): Remove. + (x_draw_bitmap): Rename from draw_bitmap. (x_draw_glyphs): Completely new implementation of draw_glyphs capable of handling arbitrary lbearing and rbearing values. Several sub-functions not mentioned here. @@ -8347,11 +8347,11 @@ 1998-01-25 Gerd Moellmann - * dispextern.h (DEFAULT_FACE_ID, MODE_LINE_FACE_ID): Symbolic - names for face ids of frame default face and mode line face. + * dispextern.h (DEFAULT_FACE_ID, MODE_LINE_FACE_ID): + Symbolic names for face ids of frame default face and mode line face. - * xdisp.c (compute_face_at_iterator_string_position): If - displaying a mode line use MODE_LINE_FACE_ID instead of + * xdisp.c (compute_face_at_iterator_string_position): + If displaying a mode line use MODE_LINE_FACE_ID instead of DEFAULT_FACE_ID. * xdisp.c (reseat_iterator_to_string): Additional parameter start. @@ -8405,8 +8405,8 @@ (move_iterator_in_display_line_to): If to_pos specified, move over before-strings. - * dispextern.h (MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Test - start.string_index > 0. + * dispextern.h (MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): + Test start.string_index > 0. * xdisp.c (redisplay_internal): Adjust glyphs if fonts_changed_p is set. Retry redisplay if fonts_changed_p is set before update. @@ -8415,7 +8415,7 @@ * xfaces.c (Fset_face_attribute_internal): Set fonts_changed_p. - * dispnew.c (adjust_glyphs_for_font_change): Removed. + * dispnew.c (adjust_glyphs_for_font_change): Remove. * xdisp.c (try_window): Check fonts_changed_p. (try_window_reusing_current_matrix): Ditto. @@ -8468,8 +8468,8 @@ * editfns.c (make_buffer_string): If PROMPT_IN_BUFFER, add prompt length to start position. - * buffer.c (Fget_buffer_create): Initialize - minibuffer_prompt_length. + * buffer.c (Fget_buffer_create): + Initialize minibuffer_prompt_length. (Fmake_indirect_buffer): Ditto. (Fkill_buffer): Ditto. @@ -8489,15 +8489,15 @@ * xfaces.c (compute_string_char_face): Compute face for arbitrary Lisp string. Renamed from compute_overlay_string_char_face. - * xdisp.c (next_element_from_string): Renamed from + * xdisp.c (next_element_from_string): Rename from next_element_from_overlay_string. - (compute_face_at_iterator_string_position): Renamed from + (compute_face_at_iterator_string_position): Rename from compute_face_at_iterator_overlay_string_position. * dispextern.h (struct display_iterator): Member overlay_string renamed string. - * xdisp.c (next_element_from_c_string): Renamed from + * xdisp.c (next_element_from_c_string): Rename from next_element_from_string. * dispextern.h (struct glyph_pos): Reversed meaning of @@ -8535,8 +8535,8 @@ 1998-01-17 Gerd Moellmann - * xdisp.c (move_iterator_vertically): Check post-condition. Move - to start of line if ending at ZV and no newline in front. + * xdisp.c (move_iterator_vertically): Check post-condition. + Move to start of line if ending at ZV and no newline in front. (move_iterator_to): If to_y specified, always first move to x = 0, so that move stops at line start instead of line end. This is probably what callers would expect to happen. @@ -8561,19 +8561,19 @@ try_window_reusing_current_matrix if window scroll functions exist. - * dispextern.h (struct display_iterator): Member - redisplay_end_trigger_p removed. + * dispextern.h (struct display_iterator): + Member redisplay_end_trigger_p removed. * dispextern.h (WINDOW_DISPLAY_PIXEL_HEIGHT_WITHOUT_MODE_LINE): - Renamed to WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT. + Rename to WINDOW_DISPLAY_TEXT_AREA_PIXEL_HEIGHT. 1998-01-16 Gerd Moellmann * xdisp.c (move_iterator_by_lines): Optimize for truncate-lines nil. Optimize truncate-lines t and moving backward. (move_iterator_to_previous_visible_line_start): Contains the heart - of the previous set_iterator_to_previous_visible_line_end. Don't - reseat the iterator. Used by move_iterator_by_lines. + of the previous set_iterator_to_previous_visible_line_end. + Don't reseat the iterator. Used by move_iterator_by_lines. (set_iterator_to_previous_visible_line_start): Call function above. (move_iterator_in_display_line_to): Check TO_POS before doing @@ -8608,8 +8608,8 @@ (Fset_face_attribute_internal): Use XINT instead of XFASTINT to get a relief because they can be negative. - * xterm.c (x_draw_relief): Correct line drawing positions. Pixel - positions are for the middle of lines under X. + * xterm.c (x_draw_relief): Correct line drawing positions. + Pixel positions are for the middle of lines under X. * xdisp.c (try_window_id): Always search for the cursor by setting w->cursor.vpos = -1. Search in unchanged rows at the top and @@ -8642,16 +8642,16 @@ * xdisp.c (display_line): Bug fix cursor positioning. - * xfns.c (x-list-fonts): Copied from x-list-fonts.c; #include + * xfns.c (x-list-fonts): Copy from x-list-fonts.c; #include removed. x-list-fonts.c is now obsolete. - (Qfixed, Qvariable): Moved here from xfaces.c. + (Qfixed, Qvariable): Move here from xfaces.c. 1998-01-14 Gerd Moellmann * xdisp.c (display_line): Set row->ends_at_zv_p based on FETCH_BYTE for truncated lines. (display_line): Set cursor differently. - (display_line): Fixed bug setting last_pos_on_this_line wrong + (display_line): Fix bug setting last_pos_on_this_line wrong for truncated lines. * dispnew.c (adjust_glyph_matrix): Always adjust for frame-based @@ -8659,8 +8659,8 @@ * window.c (Fsplit_window): Adjust glyphs before setting buffer. - * dispnew.c (adjust_frame_glyphs_for_window_redisplay): Add - assertion that character dimensions are not zero. + * dispnew.c (adjust_frame_glyphs_for_window_redisplay): + Add assertion that character dimensions are not zero. * xterm.c (x_load_font): adjust_glyphs_for_font_change while input is blocked. @@ -8680,7 +8680,7 @@ * xterm.h (FRAME_FLAGS_BITMAP_WIDTH): Macro giving the width in pixels of a flags area of a frame. - (FRAME_X_FLAGS_AREA_WIDTH): Removed. + (FRAME_X_FLAGS_AREA_WIDTH): Remove. (FRAME_X_FLAGS_AREA_COLS): Macro giving the number of columns occupied by a flags area. @@ -8694,7 +8694,7 @@ * xdisp.c (display_line): Correct wrong calculation of row->x for the case of nglyphs == 1. - (hscroll_window_tree): Renamed from hscroll_windows. + (hscroll_window_tree): Rename from hscroll_windows. (hscroll_windows): New function calling hscroll_window_tree that clears desired matrices on a frame when hscroll has been changed. (redisplay_p): Global flag set during redisplay. @@ -8725,8 +8725,8 @@ * xfaces.c (Qfixed, Qvariable): Symbols for use by x-list-fonts. (syms_of_xfaces): Initialize them. - * xterm.c (x_list_fonts): Include auto-scaled fonts. Extend - cached information. + * xterm.c (x_list_fonts): Include auto-scaled fonts. + Extend cached information. 1998-01-11 Gerd Moellmann @@ -8742,7 +8742,7 @@ 1998-01-05 Gerd Moellmann - * xdisp.c (get_row_start_continuation_line_width): Removed. + * xdisp.c (get_row_start_continuation_line_width): Remove. (init_iterator_to_row_start): Set it.current_x from row. (try_window_id): Set it.continuation_lines_width directly from row. @@ -8768,7 +8768,7 @@ 1998-01-02 Gerd Moellmann - * xterm.c (x_get_mode_line_face_gc): Renamed from + * xterm.c (x_get_mode_line_face_gc): Rename from x_get_modeline_face_gc. * xdisp.c (TEXT_PROP_DISTANCE_LIMIT): Max. distance from current @@ -8820,22 +8820,22 @@ * xterm.c (x_get_cursor_gc): Don't return cursor_gc for font == frame font if line height differs from font height. - * xdisp.c (set_iterator_to_next): Renamed from + * xdisp.c (set_iterator_to_next): Rename from move_iterator_forward to avoid confusion with other move_.* functions. - * dispextern.h (FACE_RELIEF_P): Renamed from FACE_3D_P. + * dispextern.h (FACE_RELIEF_P): Rename from FACE_3D_P. 1997-12-31 Gerd Moellmann - * xterm.c (x_get_cursor_gc): Renamed from x_cursor_gc to use the + * xterm.c (x_get_cursor_gc): Rename from x_cursor_gc to use the same naming convention as for other GC functions. (draw_glyphs): Don't fill background when drawing a cursor and font height is less than line height. 1997-12-30 Gerd Moellmann - * xdisp.c (init_display_iterator.*): Renamed to shorter names + * xdisp.c (init_display_iterator.*): Rename to shorter names init_iterator_.*. * xdisp.c (move_iterator_forward): Restore it->len from @@ -8918,8 +8918,8 @@ (x_get_char_font_and_encoding): Return null if font could not be loaded. Reset font to null if fontset could not be loaded. (draw_glyphs): Fill background if font not found. - (draw_glyphs): Unused parameter just_foreground_p removed. New - parameter composite_glyph. + (draw_glyphs): Unused parameter just_foreground_p removed. + New parameter composite_glyph. (draw_glyphs): Use enumeration for parameter hl. (draw_glyphs): Pass a display area relative x-position to draw_glyphs when calling it recursively for composite chars. @@ -8961,8 +8961,8 @@ * xterm.c (x_after_update_window_line): Draw continuation line bitmap. - * dispnew.c (update_window_line): Call - after_update_window_line_hook when row's continuation_line_p + * dispnew.c (update_window_line): + Call after_update_window_line_hook when row's continuation_line_p changes. * xterm.c (draw_bitmap): Draw new bitmap CONTINUATION_LINE_BITMAP. @@ -8999,27 +8999,27 @@ 1997-12-14 Gerd Moellmann - * frame.h (FRAME_MODE_LINE_PIXEL_HEIGHT): Removed. + * frame.h (FRAME_MODE_LINE_PIXEL_HEIGHT): Remove. * window.c (coordinates_in_window): Call frame_mode_line_height. - * xterm.c (x_draw_3d_border): Removed. - (x_draw_row_borders): Removed. + * xterm.c (x_draw_3d_border): Remove. + (x_draw_row_borders): Remove. * dispnew.c (update_window): References to FRAME_MODE_LINE_BORDER_WIDTH removed. - * xterm.h (FRAME_MODE_LINE_BORDER_WIDTH): Removed. - (FRAME_MODE_LINE_HEIGHT): Removed. + * xterm.h (FRAME_MODE_LINE_BORDER_WIDTH): Remove. + (FRAME_MODE_LINE_HEIGHT): Remove. - * xterm.c (draw_3d_borders_p): Removed. + * xterm.c (draw_3d_borders_p): Remove. (draw_glyphs): Ditto. (XTwrite_glyphs): Ditto. (expose_line): Ditto. (x_initialize): Ditto. - * dispextern.h (WINDOW_DISPLAY_MODE_LINE_HEIGHT): Call - frame_mode_line_height. + * dispextern.h (WINDOW_DISPLAY_MODE_LINE_HEIGHT): + Call frame_mode_line_height. * term.c (frame_mode_line_height): Get the pixel height of a frame's mode line. @@ -9047,8 +9047,8 @@ * xdisp.c (compute_face_at_iterator_overlay_string_position): Use it. - * xdisp.c (set_iterator_to_next_overlay_string): Formerly - set_iterator_to_next_overlay. + * xdisp.c (set_iterator_to_next_overlay_string): + Formerly set_iterator_to_next_overlay. (struct overlay_entry): Structure used to sort overlay strings. (compare_overlay_entries): Compare overlay strings. (load_iterator_with_overlay_strings): Load a chunk of overlay @@ -9056,11 +9056,11 @@ (get_overlay_strings_at_iterator_position): Call it. (next_element_from_overlay_string): Set it->object to the overlay string. Prepare for setting it->position to a string position. - (get_overlay_strings_at_iterator_position): Renamed from + (get_overlay_strings_at_iterator_position): Rename from get_overlays_at_iterator_position. - (setup_iterator_overlay_strings_from_glyph_pos): Changed to load + (setup_iterator_overlay_strings_from_glyph_pos): Change to load chunks of overlay strings. - (load_overlay_strings): Renamed from load_iterator_overlay_strings. + (load_overlay_strings): Rename from load_iterator_overlay_strings. * dispextern.h (struct display_iterator): New vector overlay_strings and new member n_overlay_strings---formerly @@ -9072,9 +9072,9 @@ * xdisp.c (copy_iterator): Increment n_iterator_overlay_vectors when allocating a vector. - (release_iterator): Removed. - (restore_iterator): Removed. - (copy_iterator): Removed. + (release_iterator): Remove. + (restore_iterator): Remove. + (copy_iterator): Remove. 1997-12-08 Gerd Moellmann @@ -9087,10 +9087,10 @@ * xterm.h (struct x_output): trunc_area_extra renamed flags_areas_extra. - (FRAME_X_FLAGS_AREA_WIDTH): Renamed from FRAME_X_TRUNC_WIDTH. + (FRAME_X_FLAGS_AREA_WIDTH): Rename from FRAME_X_TRUNC_WIDTH. - * dispnew.c (update_window_line): Call - after_update_window_line_hook when current row is not enabled + * dispnew.c (update_window_line): + Call after_update_window_line_hook when current row is not enabled which is the case after a frame has been cleared. * xdisp.c (display_mode_line): Reset row flags for truncation @@ -9129,8 +9129,8 @@ face changes and changes in invisible text property. (struct glyph_pos): Former ovlen now overlay_string_index. - * xdisp.c (setup_iterator_overlays_from_glyph_pos): Set - overlay_string. + * xdisp.c (setup_iterator_overlays_from_glyph_pos): + Set overlay_string. (set_iterator_to_next_overlay_string): Set overlay_string and pos.overlay_string_index. (get_overlays_at_iterator_position): Use overlay_string and @@ -9167,7 +9167,7 @@ * buffer.h (overlays_at): Function prototype. * xdisp.c (reseat_iterator_to_string): Clear iterator position. - * dispextern.h (GET_NEXT_DISPLAY_ELEMENT): Removed. + * dispextern.h (GET_NEXT_DISPLAY_ELEMENT): Remove. * xdisp.c (release_iterator): Release dynamically allocated memory of a display_iterator. @@ -9187,23 +9187,23 @@ * buffer.c (overlays_at): Make it work when extending vectors and an initial vector of zero size. - * xdisp.c (set_iterator_to_previous_visible_line_end): Renamed - from set_cursor_to_previous_visible_line_end. - (set_iterator_to_next_visible_line_start): Renamed from + * xdisp.c (set_iterator_to_previous_visible_line_end): + Rename from set_cursor_to_previous_visible_line_end. + (set_iterator_to_next_visible_line_start): Rename from set_cursor_to_next_visible_line_end. - (set_next_iterator_stop_pos): Renamed from set_next_stop_pos. - (compute_face_at_iterator_position): Renamed from + (set_next_iterator_stop_pos): Rename from set_next_stop_pos. + (compute_face_at_iterator_position): Rename from compute_cursor_face. - (set_iterator_to_next_overlay_string): Renamed from + (set_iterator_to_next_overlay_string): Rename from cursor_to_next_overlay_string. - (get_overlays_at_iterator_position): Renamed from + (get_overlays_at_iterator_position): Rename from get_overlays_for_cursor. - (reseat_iterator): Renamed from reseat_cursor. - (setup_iterator_overlays_from_glyph_pos): Renamed from + (reseat_iterator): Rename from reseat_cursor. + (setup_iterator_overlays_from_glyph_pos): Rename from setup_overlays_from_pos. - (init_string_iterator): Renamed from init_string_cursor. - (get_next_display_element): Renamed from next_display_element. - (move_iterator_forward): Renamed from advance_display_cursor. + (init_string_iterator): Rename from init_string_cursor. + (get_next_display_element): Rename from next_display_element. + (move_iterator_forward): Rename from advance_display_cursor. (get_overlays_at_iterator_position): Allocate overlays vector dynamically. @@ -9214,7 +9214,7 @@ 1997-12-01 Gerd Moellmann * window.c (mark_window_cursors_off): Function comment added. - (window_topmost_p, window_rightmost_p): Removed because not used. + (window_topmost_p, window_rightmost_p): Remove because not used. 1997-11-30 Gerd Moellmann @@ -9229,7 +9229,7 @@ frame_title_buf. (init_xdisp): Initialize frame_title_.* variables to null. - * dispnew.c (quit_error_check): Removed. + * dispnew.c (quit_error_check): Remove. * eval.c (Fsignal): Call to quit_error_check removed. * keyboard.c (quit_throw_to_read_char): Ditto. @@ -9275,8 +9275,8 @@ * xterm.c (XTupdate_window_end): Don't display cursor if pseudo_window_p. - * dispnew.c (adjust_frame_glyphs_for_window_redisplay): Don't - set mini_p. + * dispnew.c (adjust_frame_glyphs_for_window_redisplay): + Don't set mini_p. (update_window): Don't set cursor if pseudo_window_p. * dispextern.h (WINDOW_WANTS_MODELINE_P): Test pseudo_window_p. @@ -9307,8 +9307,8 @@ f->menu_bar_window if appropriate. (display_mode_line): Use MATRIX_MODE_LINE_ROW. - * dispnew.c (adjust_frame_glyphs_for_window_redisplay): Allocate - dummy window and window matrices for f->menu_bar_window. + * dispnew.c (adjust_frame_glyphs_for_window_redisplay): + Allocate dummy window and window matrices for f->menu_bar_window. (free_glyphs): Free the dummy window and its glyph matrices. * frame.h (struct frame): New member menu_bar_window. @@ -9323,8 +9323,8 @@ first_row_to_display. The previous scheme failed if the last row was fully visible. - * dispnew.c (update_window): Remove cost calculations. Remove - redundant preempt_count calculations. + * dispnew.c (update_window): Remove cost calculations. + Remove redundant preempt_count calculations. * xterm.c (x_clip_to_row): Set clipping for non-text rows differently. @@ -9345,7 +9345,7 @@ try_window_id. (try_window_reusing_current_matrix): Give up for terminal frames if window is not full width or we cannot insert/delete lines. - (try_window_reusing_current_matrix): Fixed scrolling for terminal + (try_window_reusing_current_matrix): Fix scrolling for terminal frames. * alloc.c (mark_glyph_matrix): Bug fix - pass pointer to @@ -9407,8 +9407,8 @@ (update_window_line): Set it. (update_marginal_area): Clear to end of line if not in text area. - * window.c (Fset_window_margins): Increment - windows_or_buffer_changed. Adjust glyphs. + * window.c (Fset_window_margins): + Increment windows_or_buffer_changed. Adjust glyphs. * dispextern.h (WINDOW_TEXT_TO_FRAME_PIXEL_X): Convert text area X coordinates to frame coordinates. @@ -9496,8 +9496,8 @@ 1997-10-27 Gerd Moellmann - * dispnew.c (update_window_line): Call - after_update_window_line_hook only for interesting constellations. + * dispnew.c (update_window_line): + Call after_update_window_line_hook only for interesting constellations. (free_glyph_matrix): Fix memory leak. * window.h: Include blocker WINDOW_H_INCLUDED, include @@ -9507,7 +9507,7 @@ (replace_window): Ditto. * dispnew.c (free_window_matrices): Remove freeing of phys_cursor_glyph. - (check_matrix_invariants): Renamed from check_current_matrix_... + (check_matrix_invariants): Rename from check_current_matrix_... * xterm.c: All references to phys_cursor_glyph changed. * dispextern.h (DISPEXTERN_H_INCLUDED): New include blocker. @@ -9665,8 +9665,8 @@ * dispextern.h (MATRIX_ROW_FIRST_POS): Use row start. - * dispnew.c (increment_glyph_row_buffer_positions): Adjust - start and end positions in rows. + * dispnew.c (increment_glyph_row_buffer_positions): + Adjust start and end positions in rows. (increment_glyph_row_buffer_positions): Stop adjusting at glyphs with positions <= 0. @@ -9682,8 +9682,8 @@ 1997-10-21 Gerd Moellmann - * dispnew.c (update_window): Add scrolling_window again. It's - necessary for scroll_step != 0. + * dispnew.c (update_window): Add scrolling_window again. + It's necessary for scroll_step != 0. * xdisp.c (redisplay_window): Use vmotion for scroll_step scrolling. @@ -9745,7 +9745,7 @@ 1997-10-19 Gerd Moellmann * dispnew.c (update_window): Remove unused variable. - (update_window_line): Simplified. + (update_window_line): Simplify. * xterm.c (x_get_char_font_and_encoding): Handle most common case at the beginning. @@ -9756,8 +9756,8 @@ * xdisp.c (try_window_id): New implementation. - * dispnew.c (increment_glyph_row_buffer_positions): Capture - rows displaying a line end, only. + * dispnew.c (increment_glyph_row_buffer_positions): + Capture rows displaying a line end, only. 1997-10-18 Gerd Moellmann @@ -9850,8 +9850,8 @@ * term.c: Some hooks with function prototypes. - * xdisp.c (reseat_cursor): Additional argument force_p. Avoid - computing face if possible. + * xdisp.c (reseat_cursor): Additional argument force_p. + Avoid computing face if possible. * xdisp.c (next_display_element): Use face from glyph from display table only if != 0. @@ -9883,7 +9883,7 @@ (init_display_info): Subtract vertical border glyph from last_visible_x. - * scroll.c (scrolling_window_1): Removed. + * scroll.c (scrolling_window_1): Remove. * dispnew.c (adjust_frame_glyphs): Split into two functions, based on redisplay method used. @@ -9892,7 +9892,7 @@ (adjust_frame_glyphs_for_window_redisplay): Part for purely window based redisplay. - * frame.h (FRAME_WINDOW_REDISPLAY_P): Changed to not depend + * frame.h (FRAME_WINDOW_REDISPLAY_P): Change to not depend on data structures. * dispnew.c (adjust_glyph_matrix): Additional parameter W. @@ -9904,8 +9904,8 @@ * dispextern.h (struct glyph_matrix): window_top_y, window_height. - * dispnew.c (allocate_matrices_for_window_redisplay): Detect - and optimize some common cases of window changes. + * dispnew.c (allocate_matrices_for_window_redisplay): + Detect and optimize some common cases of window changes. * emacs.c (main): Remove own profiling code because 0.95 now has it in. @@ -9965,9 +9965,9 @@ * xterm.c (x_draw_row_borders): Use FRAME_MODE_LINE_HEIGHT height value. (x_clip_to_row): Use MATRIX_ROW_VISIBLE_HEIGHT. Simplified. - (do_line_dance): Simplified and pixel corrected. + (do_line_dance): Simplify and pixel corrected. - * dispnew.c (scrolling_window): Simplified. + * dispnew.c (scrolling_window): Simplify. * xterm.c (x_draw_3d_border): Insert rectangle by line width. @@ -10049,15 +10049,15 @@ * xterm.h (WINDOW_COL_PIXEL_X etc.) Removed. - * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c. + * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Move to dispnew.c. * xfns.c (x_contour_region): Use pixel coordinates from window cursor instead of WINDOW_TO_FRAME_H/VPOS. * dispextern.h (FRAME_TO_WINDOW_HPOS, FRAME_TO_WINDOW_VPOS): - Removed. + Remove. - * dispnew.c (frame_to_window_hpos, frame_to_window_vpos): Removed. + * dispnew.c (frame_to_window_hpos, frame_to_window_vpos): Remove. * xterm.c (x_y_to_hpos_vpos): Get hpos/vpos from window relative pixel coordinates. @@ -10541,16 +10541,16 @@ * xfns.c (Fx_create_frame): Don't set PHYS_CURSOR_X to -1. I don't believe this is really necessary. - * dispnew.c (build_frame_matrix_from_leaf_window): Determine - border glyph once. + * dispnew.c (build_frame_matrix_from_leaf_window): + Determine border glyph once. 1997-07-15 Gerd Moellmann * window.c (mark_window_cursors_off): Mark all cursors in window tree off. - * xterm.c (x_display_box_cursor): Window parameter. Use - window matrix. + * xterm.c (x_display_box_cursor): Window parameter. + Use window matrix. (glyph_to_pixel_pos): Convert matrix pos -> pixels. (pixel_to_glyph_pos): Convert pixel pos -> matrix pos. (x_update_cursor): Work on windows. @@ -10576,7 +10576,7 @@ * frame.h (struct frame): Cursor information removed. - * frame.h (FRAME_SCROLL_BAR_WIDTH): Removed because unused. + * frame.h (FRAME_SCROLL_BAR_WIDTH): Remove because unused. (FRAME_WINDOW_WIDTH_ARG): Don't add scroll bar width. * window.h (WINDOW_LEFT_MARGIN): Remove FRAME_LEFT_SCROLL_BAR. @@ -10650,7 +10650,7 @@ * window.h: CURSOR_VPOS/HPOS added. * frame.h (struct frame): CURSOR_X/Y removed. - (FRAME_CURSOR_X): Removed. + (FRAME_CURSOR_X): Remove. (FRAME_CURSOR_Y): Ditto. * dispnew.c (direct_output_for_insert): LAST_POINT_X removed. @@ -10687,10 +10687,10 @@ * minibuf.c (read_minibuf): Build frame matrix. - * xdisp.c (this_line_start_hpos): Renamed to + * xdisp.c (this_line_start_hpos): Rename to THIS_LINE_START_WINDOW_HPOS to make it clear that this is window relative. - (this_line_vpos): Renamed to THIS_LINE_WINDOW_VPOS for the same + (this_line_vpos): Rename to THIS_LINE_WINDOW_VPOS for the same reason. * dispnew.c (build_frame_matrix): Don't clear rows of the @@ -10717,7 +10717,7 @@ * lisp.h: Prototype for SCAN_BUFFER. - * xdisp.c (redisplay_windows): Simplified. + * xdisp.c (redisplay_windows): Simplify. * dispnew.c (window_to_frame_vpos): Convert window to frame vpos with debug checks. @@ -10739,8 +10739,8 @@ * xdisp.c (try_window_id): Use CANCEL_WINDOW_LINE. (redisplay_internal): Ditto. - * dispnew.c (cancel_window_line): Use window matrix. Changed - name to CANCEL_WINDOW_LINE. + * dispnew.c (cancel_window_line): Use window matrix. + Changed name to CANCEL_WINDOW_LINE. * xdisp.c (try_window_id): Use DISPLAY_TEXT_LINE with window relative VPOS. @@ -10790,7 +10790,7 @@ (allocate_leaf_matrix): Add FRAME_MENU_BAR_LINES to the height of top-most windows. - * window.h (WINDOW_TOPMOST_P): Added. + * window.h (WINDOW_TOPMOST_P): Add. * xdisp.c (echo_area_display): Use PREPARE_DESIRED_ROW. (redisplay_window): Ditto. @@ -10860,25 +10860,25 @@ * dispnew.c (check_matrix_pointer_lossage): Check against pointer lossage in matrices. - (get_glyph_matrix_row): Removed. + (get_glyph_matrix_row): Remove. - * scroll.c (do_scrolling): Simplified. - (do_direct_scrolling): Simplified. + * scroll.c (do_scrolling): Simplify. + (do_direct_scrolling): Simplify. (scrolling_1): Pass CURRENT_MATRIX instead of FRAME to DO_.*SCROLLING. * dispnew.c (ins_del_glyph_rows): Insert/delete rows in a matrix. - (rotate_vector): Removed. - (rotate_pointers): Removed. - (scroll_frame_lines): Simplified. + (rotate_vector): Remove. + (rotate_pointers): Remove. + (scroll_frame_lines): Simplify. 1997-07-03 Gerd Moellmann - * dispextern.h (MATRIX_ROW_SWAP_CONTENTS): Removed. + * dispextern.h (MATRIX_ROW_SWAP_CONTENTS): Remove. - * dispnew.c (increment_glyph_matrix_buffer_positions): Does - what the name says. + * dispnew.c (increment_glyph_matrix_buffer_positions): + Does what the name says. (clear_glyph_row): Make a glyph row structure empty. (make_matrix_row_current): Make a glyph row current. (make_window_matrix_row_current): Perform analogous row swaps @@ -10895,11 +10895,11 @@ * All files: Use above new names. - * dispnew.c (scroll_frame_lines): Simplified. Use - SCROLL_GLYPH_MATRIX. + * dispnew.c (scroll_frame_lines): Simplify. + Use SCROLL_GLYPH_MATRIX. (make_glyph_row_empty): Mark a glyph row empty. - (increment_glyph_row_buffer_positions): Increment - buffer positions in a glyph row. + (increment_glyph_row_buffer_positions): + Increment buffer positions in a glyph row. (increment_glyph_matrix_buffer_positions): Increment buffer positions in a range of rows. (scroll_glyph_matrix): Scroll a glyph matrix. @@ -10942,7 +10942,7 @@ (MATRIX_ROW_USED): Ditto. (MATRIX_ROW_SET_USED): Ditto. - * dispnew.c (line_hash_code): Simplified. + * dispnew.c (line_hash_code): Simplify. 1997-06-30 Gerd Moellmann @@ -10966,8 +10966,8 @@ DO_PENDING_WINDOW_CHANGE, CHANGE_FRAME_SIZE, BITCH_AT_USER, SIT_FOR, INIT_DISPLAY, SYMS_OF_DISPLAY, - * dispnew.c (redraw_frame): FRAME_PTR -> struct frame. Return - void. + * dispnew.c (redraw_frame): FRAME_PTR -> struct frame. + Return void. (cancel_line): Return void. (clear_frame_records): Return void. @@ -11085,13 +11085,13 @@ WRITE_GLYPHS_HOOK, DELETE_GLYPHS_HOOK, * xdisp.c (redisplay_internal): Remove call to VERIFY_CHARSTARTS. - (do_verify_charstarts): Removed. + (do_verify_charstarts): Remove. * frame.c (Fmake_terminal_frame): Adjust glyphs. (Fdelete_frame): Free glyphs. (make_frame): Initialize matrix fields in frame. - * config.in (PROTO): Added. + * config.in (PROTO): Add. * emacs.c (shut_down_emacs): Check glyph memory. @@ -11261,7 +11261,7 @@ * emacs.c [DOUG_LEA_MALLOC] (malloc_initialize_hook): Move the handling of MALLOC_CHECK_ envvar here. - (main): Moved from here. + (main): Move from here. 1999-06-29 Wolfram Gloger @@ -11414,8 +11414,8 @@ * w32console.c (clear_frame): Remember that the window width might be smaller than the screen buffer width. - (write_glyphs): Remove redundant variable attrs. Use - FillConsoleOutputAttribute instead of WriteConsoleOutputAttribute. + (write_glyphs): Remove redundant variable attrs. + Use FillConsoleOutputAttribute instead of WriteConsoleOutputAttribute. 1999-05-20 Andrew Innes @@ -11423,8 +11423,8 @@ loses focus. * w32fns.c (w32_wnd_proc): Ensure mouse capture is released if - frame loses focus, and that mouse button state is reset. Ditto - when the menu bar is activated. + frame loses focus, and that mouse button state is reset. + Ditto when the menu bar is activated. 1999-05-18 Richard Stallman @@ -11599,7 +11599,7 @@ (w32_clear_frame, clear_cursor, x_display_bar_cursor) (x_display_box_cursor, x_set_window_size): Use phys_cursor_on field in frame. - (do_line_dance): Updated WRT xterm.c. Use macros where possible. + (do_line_dance): Update WRT xterm.c. Use macros where possible. (dumprectangle): Take into account the width of a left-side scroll bar. @@ -11617,8 +11617,8 @@ 1999-05-02 Kenichi HANDA - * coding.c (setup_raw_text_coding_system): Call - setup_coding_system to initialize the fields of struct + * coding.c (setup_raw_text_coding_system): + Call setup_coding_system to initialize the fields of struct coding_system correctly. 1999-04-26 Kenichi HANDA @@ -11773,11 +11773,11 @@ 1999-03-25 Andrew Innes * makefile.nt (PREPARED_HEADERS): Change name of paths.h to epaths.h. - (epaths.h): Renamed from paths.h. + (epaths.h): Rename from paths.h. (clean): ($(BLD)\filelock.obj): ($(BLD)\lread.obj): - ($(BLD)\w32fns.obj): Renamed paths.h to epaths.h. + ($(BLD)\w32fns.obj): Rename paths.h to epaths.h. 1999-03-23 Ken'ichi Handa @@ -11791,8 +11791,8 @@ 1999-03-20 Kenichi HANDA - * coding.c (ENCODE_ISO_CHARACTER): Check validity of CHARSET. If - invalid, produce the buffer internal byte sequence without encoding. + * coding.c (ENCODE_ISO_CHARACTER): Check validity of CHARSET. + If invalid, produce the buffer internal byte sequence without encoding. 1999-03-19 Karl Heuer @@ -11965,8 +11965,8 @@ 1999-02-24 Kenichi Handa * keymap.c (push_key_description): If enable-multibyte-characters - is non-nil, try to convert unibyte character to multibyte. For - invalid multibyte character, show all bits by octal form. + is non-nil, try to convert unibyte character to multibyte. + For invalid multibyte character, show all bits by octal form. (Fsingle_key_description): Check the validity of charset for a generic character. @@ -12083,8 +12083,8 @@ 1999-02-15 Kenichi Handa - * coding.c (Fdecode_sjis_char, Fencode_sjis_char): Handle - ASCII correctly. Signal error on invalid characters. + * coding.c (Fdecode_sjis_char, Fencode_sjis_char): + Handle ASCII correctly. Signal error on invalid characters. (Fdecode_big5_char, Fencode_big5_char): Likewise. 1999-02-15 Eli Zaretskii @@ -12146,8 +12146,8 @@ 1999-02-04 Eli Zaretskii - * w16select.c (last_clipboard_text, clipboard_storage_size): New - static variables. + * w16select.c (last_clipboard_text, clipboard_storage_size): + New static variables. (set_clipboard_data): Save a copy of the text we put into clipboard in last_clipboard_text. (get_clipboard_data): If the clipboard text is identical to what @@ -12305,8 +12305,8 @@ (x_destroy_bitmap): Returns void not int. (x_set_border_pixel): Returns void. (w32_load_bdf_font): New function. - (w32_load_system_font): New function, was w32_load_font. List - fonts before loading. Explicitly set encoding for SJIS fonts. + (w32_load_system_font): New function, was w32_load_font. + List fonts before loading. Explicitly set encoding for SJIS fonts. Set default_ascent to 0 as comment indicates. (w32_load_font): Call w32_load_system_font and w32_load_bdf_font. (w32_unload_font): Support BDF fonts. @@ -12350,7 +12350,7 @@ w32_codepage_for_charset. Add cast to int where float operation is assigned to int. (Vw32_charset_to_codepage_alist): New variable. - (w32_codepage_for_charset): Removed. + (w32_codepage_for_charset): Remove. (w32_codepage_for_font): New function, replacing w32_codepage_for_charset. (syms_of_w32term): Add and initialize @@ -12369,7 +12369,7 @@ * w32heap.h (ROUND_UP): (ROUND_DOWN): New macros. - (need_to_recreate_heap): Renamed to using_dynamic_heap. + (need_to_recreate_heap): Rename to using_dynamic_heap. (init_heap): New extern. (data_region_size): (recreate_heap): @@ -12384,11 +12384,11 @@ (round_to_next): Obsolete function removed. (preload_heap_section): New variable. (data_region_size): Obsolete variable removed. - (allocate_heap): Modified to determine end of static heap section + (allocate_heap): Modify to determine end of static heap section used during preload, and use that as initial base address for dynamic heap instead of hard-coded value. - (sbrk): Remove call to allocate_heap; handled by init_heap. Skip - calls to commit or decommit pages when allocating from static heap + (sbrk): Remove call to allocate_heap; handled by init_heap. + Skip calls to commit or decommit pages when allocating from static heap section during preload. (recreate_heap): Obsolete function removed. (init_heap): New function to initialize internal sbrk heap @@ -12399,10 +12399,10 @@ * unexw32.c: Major rewrite to support cleaner method of dumping; a static "bss" section is used for heap space during preload, and bss data is now written to the proper section area when dumping. - (need_to_recreate_heap): Renamed to using_dynamic_heap. + (need_to_recreate_heap): Rename to using_dynamic_heap. (heap_index_in_executable): Obsolete variable removed. (data_section): New variable. - (data_start_va): Renamed to data_start. + (data_start_va): Rename to data_start. (data_start_file): Obsolete variable removed. (bss_section): (extra_bss_size): @@ -12432,8 +12432,8 @@ sections where data will be dumped. Allows for static and global bss data to be in separate ranges. No longer relies on knowledge of section names. - (copy_executable_and_dump_data_section): Renamed - copy_executable_and_dump_data. Completely rewritten to copy + (copy_executable_and_dump_data_section): + Rename copy_executable_and_dump_data. Completely rewritten to copy executable section by section, so that raw data areas can be expanded to hold dumped data as necessary. Allows for bss data to be in same section as initialized data. Reduces size of static @@ -12511,8 +12511,8 @@ Return zero in case of success, 1 or 2 otherwise. (get_clipboard_data): Only bail out if the null character is in the last 32-byte chunk of clipboard data. - (Fw16_set_clipboard_data): Make ok and put_status be unsigned. If - they save binary data, print a message in the echo area saying the + (Fw16_set_clipboard_data): Make ok and put_status be unsigned. + If they save binary data, print a message in the echo area saying the text was not put into the clipboard. * msdos.c (IT_write_glyphs): Move constant expression out of the loop. @@ -12688,8 +12688,8 @@ based on VEC. * charset.c (Qunknown): New variable. - (init_charset_once): Intern and staticpro Qunknown. Initialize - all elements of Vcharset_symbol_table to Qunknown. + (init_charset_once): Intern and staticpro Qunknown. + Initialize all elements of Vcharset_symbol_table to Qunknown. (find_charset_in_str): New arg MULTIBYTE. If it is zero, check unibyte characters only. For an invalid composition sequence, set CHARSETS[1] to 1. @@ -12997,8 +12997,8 @@ (RIGHT_WIN_PRESSED): (APPS_PRESSED): New console keyboard modifier flags. - * w32term.c (convert_to_key_event): Removed. - (is_dead_key): Copied to w32fns.c. + * w32term.c (convert_to_key_event): Remove. + (is_dead_key): Copy to w32fns.c. (w32_read_socket): Generate language_change_event. Modify to work with keyboard handling changes in w32_wnd_proc. @@ -13037,10 +13037,10 @@ code. (is_dead_key): Copy from w32fns.c. (w32_kbd_patch_key): Comment attempt to improve handling of - dead-keys, and system bug relating to same on Windows NT. Work - around the bug by calling ToUnicode and then converting to the + dead-keys, and system bug relating to same on Windows NT. + Work around the bug by calling ToUnicode and then converting to the correct codepage. - (map_virt_key): Removed obsolete variable. + (map_virt_key): Remove obsolete variable. (lispy_function_keys): Add extern. (key_event): Major rework of keyboard input handling: optionally recognize Windows keys and Apps key as modifiers; optionally treat @@ -13066,7 +13066,7 @@ for given key. (w32_get_modifiers): Returns modifier flags for non-keyboard input events. - (construct_console_modifiers): Renamed from construct_modifiers; + (construct_console_modifiers): Rename from construct_modifiers; recognize Windows and Apps keys as modifiers. (w32_get_key_modifiers): New function. Returns modifier flags for keyboard input events. @@ -13098,12 +13098,12 @@ 1998-11-10 Kenichi Handa - * category.h (CATEGORY_SET): Adjusted for the change of + * category.h (CATEGORY_SET): Adjust for the change of cmpchar_component. (CATEGORY_SET): Likewise. - * charset.c (cmpchar_component): New arg NOERROR. Check - composition char ID more strictly. + * charset.c (cmpchar_component): New arg NOERROR. + Check composition char ID more strictly. (Fcmpchar_component): Call cmpchar_component with NOERROR arg zero. (Fcmpchar_cmp_rule): If CHARACTER should be composed relatively, return 255. @@ -13303,8 +13303,8 @@ (insert_from_buffer_1): Likewise. (adjust_after_replace): Inhibit bytes combined across region boundary. Update end_unchanged correctly. - (replace_range): Call CHECK_BYTE_COMBINING_FOR_INSERT. Update - end_unchanged correctly. + (replace_range): Call CHECK_BYTE_COMBINING_FOR_INSERT. + Update end_unchanged correctly. (del_range_2): Inhibit bytes combined across region boundary. Update end_unchanged correctly. @@ -13333,8 +13333,8 @@ 1998-10-27 Dave Love - * fns.c (Fbase64_decode_region, Fbase64_encode_region): Fix - newline in doc string. + * fns.c (Fbase64_decode_region, Fbase64_encode_region): + Fix newline in doc string. 1998-10-27 Kenichi Handa @@ -13415,28 +13415,28 @@ * w32fns.c (Vx_pixel_size_width): New global variable. (unibyte_display_via_language_environment): New global variable. (x_set_font): Add support for setting fontsets. - (Fx_create_frame): Add check_w32(). Initialize fontsets. Fix - font names to match xlfd-tight-regexp. + (Fx_create_frame): Add check_w32(). Initialize fontsets. + Fix font names to match xlfd-tight-regexp. (w32_load_font): Rewrite based on x_load_font. - (x_to_w32_charset, w32_to_x_charset): Add character sets. Use - `iso8859-1' rather than `ansi'. + (x_to_w32_charset, w32_to_x_charset): Add character sets. + Use `iso8859-1' rather than `ansi'. (w32_to_x_font): Remove `-' from font name. Remove the `-' off the end. Move charset into `charset registry' field. (enum_font_cb2): Check charsets match. Include width in font list. (w32_list_fonts): Rewrite based on x_list_fonts. Moved from w32term.c to have access to enumfont_t struct. - (Fx_list_fonts): w32 specific version eliminated. Include - `x-list-fonts.c'. - (w32_get_font_info, w32_query_font, w32_find_ccl_program): New - functions for fontset support - adapted from x_ equivalents. - (syms_of_w32fns): New lisp variables initialized. Function - pointers for fontset.c set up. + (Fx_list_fonts): w32 specific version eliminated. + Include `x-list-fonts.c'. + (w32_get_font_info, w32_query_font, w32_find_ccl_program): + New functions for fontset support - adapted from x_ equivalents. + (syms_of_w32fns): New lisp variables initialized. + Function pointers for fontset.c set up. * w32term.c: Include fontset.h. Define codepage macros. Add ENCODE_BIG5 macro from coding.c. (w32_no_unicode_output): New variable. - (w32_codepage_for_charset, w32_use_unicode_for_codepage): New - functions. + (w32_codepage_for_charset, w32_use_unicode_for_codepage): + New functions. (BUILD_WCHAR_T, BYTE1, BYTE2): New macros. (dumpglyphs): Rewrite based on xterm.c equivalent. (x_new_font): Use functionality provided in fontset.c. @@ -13552,8 +13552,8 @@ * lisp.h (clear_string_char_byte_cache): Extern it. - * xselect.c (lisp_data_to_selection_data): Call - find_charset_in_str with CMPCHARP arg 0. + * xselect.c (lisp_data_to_selection_data): + Call find_charset_in_str with CMPCHARP arg 0. * w16select.c (Fw16_set_clipboard_data): Likewise. * w32select.c (Fw32_set_clipboard_data): Likewise. @@ -13623,7 +13623,7 @@ * coding.c (check_composing_code): Fix previous change. Now it always returns 0 or -1. - (decode_coding_iso2022): Adjusted for the above change. + (decode_coding_iso2022): Adjust for the above change. (encode_coding_iso2022): When encoding the last block, flush out tailing garbage bytes. (setup_coding_system): Delete unnecessary code. @@ -13700,8 +13700,8 @@ * ccl.c (CCL_WRITE_CHAR): Don't use bcopy. (ccl_driver): If BUFFER-MAGNIFICATION of the CCL program is 0, - cause error if the program is going to output some bytes. When - outputting a string to notify an error, check the case that + cause error if the program is going to output some bytes. + When outputting a string to notify an error, check the case that DST_BYTES is zero. * coding.h (CODING_FINISH_INTERRUPT): New macro. @@ -13838,8 +13838,8 @@ * w16select.c (Vnext_selection_coding_system): New variable. (syms_of_win16select): DEFVAR_LISP it. No need to staticpro Vselection_coding_system. - (Fw16_set_clipboard_data): Always convert multibyte strings. Use - Vnext_selection_coding_system if non-nil. + (Fw16_set_clipboard_data): Always convert multibyte strings. + Use Vnext_selection_coding_system if non-nil. (Fw16_get_clipboard_data): Always convert a string that includes non-ASCII characters. Use Vnext_selection_coding_system if non-nil. @@ -13911,8 +13911,8 @@ 1998-08-28 Kenichi Handa * insdel.c (adjust_after_replace): Fix the code to record undo - information for the case that `before combining' happens. Remove - text properties which are added to the new text by + information for the case that `before combining' happens. + Remove text properties which are added to the new text by offset_intervals. * coding.c (code_convert_region1): Remove all text properties of ------------------------------------------------------------ revno: 117761 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2014-08-28 16:37:13 -0400 message: * lisp/progmodes/cc-defs.el: Expose c-lanf-defconst's expressions to the byte-compiler. (lookup-syntax-properties): Silence byte-compiler. (c-lang-defconst): Quote the code with `lambda' rather than with `quote'. (c-lang-const): Avoid unneeded setq. (c-lang-constants-under-evaluation): Add docstring. (c-lang--novalue): New constant. (c-find-assignment-for-mode): Use it instead of c-lang-constants. (c-get-lang-constant): Same here. Get the mode's value using `funcall' now that the code is quoted with `lambda'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-28 19:31:11 +0000 +++ lisp/ChangeLog 2014-08-28 20:37:13 +0000 @@ -1,3 +1,18 @@ +2014-08-28 Stefan Monnier + + * progmodes/cc-defs.el: Expose c-lanf-defconst's expressions to the + byte-compiler. + (lookup-syntax-properties): Silence byte-compiler. + (c-lang-defconst): Quote the code with `lambda' rather than with + `quote'. + (c-lang-const): Avoid unneeded setq. + (c-lang-constants-under-evaluation): Add docstring. + (c-lang--novalue): New constant. + (c-find-assignment-for-mode): Use it instead of c-lang-constants. + (c-get-lang-constant): Same here. + Get the mode's value using `funcall' now that the code is quoted + with `lambda'. + 2014-08-28 Michael Albinus * net/tramp.el (tramp-handle-shell-command): Use `display-buffer'. @@ -67,8 +82,8 @@ * progmodes/cc-fonts.el (c-font-lock-declarations): Handle the "decltype" keyword. (c-font-lock-c++-new): Handle "decltype" constructions. - * progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re): New - c-lang-defconsts/defvars. + * progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re): + New c-lang-defconsts/defvars. (c-haskell-op, c-haskell-op-re): New c-lang-defconsts/defvars. (c-typeof-kwds, c-typeof-key): New c-lang-defconsts/defvars. (c-typeless-decl-kwds): Append "auto" onto the C++ value. @@ -79,8 +94,8 @@ off from c->-op-cont-re. (c->-op-cont-tokens): Change to use the above. (c->-op-without->-cont-regexp): New lang-const. - * progmodes/cc-engine.el (c-forward-<>-arglist-recur): Use - c->-op-without->-cont-regexp in place of c->-op-cont-tokens. + * progmodes/cc-engine.el (c-forward-<>-arglist-recur): + Use c->-op-without->-cont-regexp in place of c->-op-cont-tokens. 2014-08-23 Alan Mackenzie @@ -90,8 +105,8 @@ 2014-08-21 Eli Zaretskii - * textmodes/texnfo-upd.el (texinfo-specific-section-type): Don't - recognize a Top node if there are other sectioning commands + * textmodes/texnfo-upd.el (texinfo-specific-section-type): + Don't recognize a Top node if there are other sectioning commands earlier in the Texinfo file. This fixes a bug in texinfo-make-menu and avoids inflooping in texinfo-all-menus-update when they are invoked on texinfo.texi. @@ -193,7 +208,7 @@ 2014-08-12 Stefan Monnier - * mpc.el (mpc-reorder): Don't bother splitting the "active"s elements + * mpc.el (mpc-reorder): Don't bother splitting the "active" elements to the first part if they're the same as the selection. 2014-08-12 Lars Magne Ingebrigtsen @@ -337,8 +352,8 @@ 2014-08-07 Leo Liu - * help.el (temp-buffer-setup-hook,temp-buffer-show-hook): Revert - change on 2014-03-22. + * help.el (temp-buffer-setup-hook,temp-buffer-show-hook): + Revert change on 2014-03-22. 2014-08-06 Ulf Jasper @@ -371,8 +386,8 @@ * progmodes/python.el: Fix completions inside (i)pdb. (python-shell-completion-pdb-string-code): Make obsolete. - (python-shell-completion-get-completions): Use - python-shell-completion-string-code resending setup code + (python-shell-completion-get-completions): + Use python-shell-completion-string-code resending setup code continuously for (i)pdb. 2014-08-04 Paul Eggert @@ -399,8 +414,8 @@ 2014-08-02 Alan Mackenzie - Fix confusion in C++ file caused by comma in "= {1,2},". Bug - #17756. + Fix confusion in C++ file caused by comma in "= {1,2},". + Bug #17756. * progmodes/cc-engine.el (c-beginning-of-statement-1): In checking for a statement boundary marked by "}", check there's no "=" before the "{". @@ -429,8 +444,8 @@ 2014-07-30 Christophe Deleuze (tiny change) - * calendar/icalendar.el (icalendar--decode-isodatetime): Use - actual current-time-zone when converting to local time. (Bug#15408) + * calendar/icalendar.el (icalendar--decode-isodatetime): + Use actual current-time-zone when converting to local time. (Bug#15408) 2014-07-29 Martin Rudalics @@ -541,17 +556,17 @@ 2014-07-28 Fabián Ezequiel Gallina Grab all Python process output before inferior-python-mode hooks. - * progmodes/python.el (inferior-python-mode): Call - accept-process-output and sit-for to ensure all output for process + * progmodes/python.el (inferior-python-mode): + Call accept-process-output and sit-for to ensure all output for process has been received before running hooks. - (python-shell-internal-get-or-create-process): Cleanup - accept-process-output and sit-for calls. + (python-shell-internal-get-or-create-process): + Cleanup accept-process-output and sit-for calls. 2014-07-28 Fabián Ezequiel Gallina More robust shell startup and code setup. - * progmodes/python.el (python-shell-make-comint): Remove - accept-process-output call. + * progmodes/python.el (python-shell-make-comint): + Remove accept-process-output call. (python-shell-get-buffer): Return current buffer if major-mode is inferior-python-mode. (python-shell-get-or-create-process): Use it. @@ -560,8 +575,8 @@ 2014-07-27 Eli Zaretskii - * scroll-bar.el (scroll-bar-toolkit-horizontal-scroll): Add - rudimentary support for bidirectional text. + * scroll-bar.el (scroll-bar-toolkit-horizontal-scroll): + Add rudimentary support for bidirectional text. 2014-07-27 Martin Rudalics @@ -935,8 +950,8 @@ (linum-update-window): Use it to adjust margin to linum's width. * leim/quail/sisheng.el (sisheng-list): Don't bother with-case-table. - * eshell/em-smart.el (eshell-smart-scroll-window): Use - with-selected-window. + * eshell/em-smart.el (eshell-smart-scroll-window): + Use with-selected-window. * xt-mouse.el (xterm-mouse-translate-1): Intern drag event (bug#17894). Remove also pointless window&mark manipulation. @@ -3968,7 +3983,7 @@ 2014-03-23 Lars Ingebrigtsen * calendar/parse-time.el (parse-time-iso8601-regexp) - (parse-iso8601-time-string): Copied from `url-dav' so that we can use + (parse-iso8601-time-string): Copy from `url-dav' so that we can use it more generally. 2014-03-23 Lars Ingebrigtsen @@ -5570,7 +5585,7 @@ * help-at-pt.el (help-at-pt-string, help-at-pt-maybe-display): Also try to display local help from just before point. -2014-02-02 Alan Mackenzie +2014-02-02 Alan Mackenzie c-parse-state. Don't "append-lower-brace-pair" in certain circumstances. Also fix an obscure bug where "\\s!" shouldn't be === modified file 'lisp/progmodes/cc-defs.el' --- lisp/progmodes/cc-defs.el 2014-07-14 23:58:52 +0000 +++ lisp/progmodes/cc-defs.el 2014-08-28 20:37:13 +0000 @@ -1556,6 +1556,8 @@ (cc-bytecomp-defvar open-paren-in-column-0-is-defun-start) +(defvar lookup-syntax-properties) ;XEmacs. + (defconst c-emacs-features (let (list) @@ -1801,18 +1803,18 @@ (error "Unknown base mode `%s'" base-mode)) (put mode 'c-fallback-mode base-mode)) -(defvar c-lang-constants (make-vector 151 0)) -;; This obarray is a cache to keep track of the language constants -;; defined by `c-lang-defconst' and the evaluated values returned by -;; `c-lang-const'. It's mostly used at compile time but it's not -;; stored in compiled files. -;; -;; The obarray contains all the language constants as symbols. The -;; value cells hold the evaluated values as alists where each car is -;; the mode name symbol and the corresponding cdr is the evaluated -;; value in that mode. The property lists hold the source definitions -;; and other miscellaneous data. The obarray might also contain -;; various other symbols, but those don't have any variable bindings. +(defvar c-lang-constants (make-vector 151 0) + "Obarray used as a cache to keep track of the language constants. +The constants stored are those defined by `c-lang-defconst' and the values +computed by `c-lang-const'. It's mostly used at compile time but it's not +stored in compiled files. + +The obarray contains all the language constants as symbols. The +value cells hold the evaluated values as alists where each car is +the mode name symbol and the corresponding cdr is the evaluated +value in that mode. The property lists hold the source definitions +and other miscellaneous data. The obarray might also contain +various other symbols, but those don't have any variable bindings.") (defvar c-lang-const-expansion nil) @@ -1897,7 +1899,7 @@ pre-files) (or (symbolp name) - (error "Not a symbol: %s" name)) + (error "Not a symbol: %S" name)) (when (stringp (car-safe args)) ;; The docstring is hardly used anywhere since there's no normal @@ -1907,7 +1909,7 @@ (setq args (cdr args))) (or args - (error "No assignments in `c-lang-defconst' for %s" name)) + (error "No assignments in `c-lang-defconst' for %S" name)) ;; Rework ARGS to an association list to make it easier to handle. ;; It's reversed at the same time to make it easier to implement @@ -1921,17 +1923,17 @@ ((listp (car args)) (mapcar (lambda (lang) (or (symbolp lang) - (error "Not a list of symbols: %s" + (error "Not a list of symbols: %S" (car args))) (intern (concat (symbol-name lang) "-mode"))) (car args))) - (t (error "Not a symbol or a list of symbols: %s" + (t (error "Not a symbol or a list of symbols: %S" (car args))))) val) (or (cdr args) - (error "No value for %s" (car args))) + (error "No value for %S" (car args))) (setq args (cdr args) val (car args)) @@ -1945,7 +1947,7 @@ ;; dependencies on the `c-lang-const's in VAL.) (setq val (macroexpand-all val)) - (setq bindings (cons (cons assigned-mode val) bindings) + (setq bindings `(cons (cons ',assigned-mode (lambda () ,val)) ,bindings) args (cdr args)))) ;; Compile in the other files that have provided source @@ -1957,7 +1959,7 @@ (mapcar 'car (get sym 'source)))) `(eval-and-compile - (c-define-lang-constant ',name ',bindings + (c-define-lang-constant ',name ,bindings ,@(and pre-files `(',pre-files)))))) (put 'c-lang-defconst 'lisp-indent-function 1) @@ -2022,19 +2024,16 @@ quoted." (or (symbolp name) - (error "Not a symbol: %s" name)) + (error "Not a symbol: %S" name)) (or (symbolp lang) - (error "Not a symbol: %s" lang)) + (error "Not a symbol: %S" lang)) (let ((sym (intern (symbol-name name) c-lang-constants)) - mode source-files args) + (mode (when lang (intern (concat (symbol-name lang) "-mode"))))) - (when lang - (setq mode (intern (concat (symbol-name lang) "-mode"))) - (unless (get mode 'c-mode-prefix) - (error - "Unknown language %S since it got no `c-mode-prefix' property" - (symbol-name lang)))) + (or (get mode 'c-mode-prefix) (null mode) + (error "Unknown language %S: no `c-mode-prefix' property" + lang)) (if (eq c-lang-const-expansion 'immediate) ;; No need to find out the source file(s) when we evaluate @@ -2042,49 +2041,56 @@ ;; `source' property. `',(c-get-lang-constant name nil mode) - (let ((file (c-get-current-file))) - (if file (setq file (intern file))) - ;; Get the source file(s) that must be loaded to get the value - ;; of the constant. If the symbol isn't defined yet we assume - ;; that its definition will come later in this file, and thus - ;; are no file dependencies needed. - (setq source-files (nreverse - ;; Reverse to get the right load order. - (apply 'nconc - (mapcar (lambda (elem) - (if (eq file (car elem)) - nil ; Exclude our own file. - (list (car elem)))) - (get sym 'source)))))) - - ;; Make some effort to do a compact call to - ;; `c-get-lang-constant' since it will be compiled in. - (setq args (and mode `(',mode))) - (if (or source-files args) - (setq args (cons (and source-files `',source-files) - args))) - - (if (or (eq c-lang-const-expansion 'call) - (and (not c-lang-const-expansion) - (not mode)) - load-in-progress - (not (boundp 'byte-compile-dest-file)) - (not (stringp byte-compile-dest-file))) - ;; Either a straight call is requested in the context, or - ;; we're in an "uncontrolled" context and got no language, - ;; or we're not being byte compiled so the compile time - ;; stuff below is unnecessary. - `(c-get-lang-constant ',name ,@args) - - ;; Being compiled. If the loading and compiling version is - ;; the same we use a value that is evaluated at compile time, - ;; otherwise it's evaluated at runtime. - `(if (eq c-version-sym ',c-version-sym) - (cc-eval-when-compile - (c-get-lang-constant ',name ,@args)) - (c-get-lang-constant ',name ,@args)))))) - -(defvar c-lang-constants-under-evaluation nil) + (let ((source-files + (let ((file (c-get-current-file))) + (if file (setq file (intern file))) + ;; Get the source file(s) that must be loaded to get the value + ;; of the constant. If the symbol isn't defined yet we assume + ;; that its definition will come later in this file, and thus + ;; are no file dependencies needed. + (nreverse + ;; Reverse to get the right load order. + (apply 'nconc + (mapcar (lambda (elem) + (if (eq file (car elem)) + nil ; Exclude our own file. + (list (car elem)))) + (get sym 'source)))))) + ;; Make some effort to do a compact call to + ;; `c-get-lang-constant' since it will be compiled in. + (args (and mode `(',mode)))) + + (if (or source-files args) + (push (and source-files `',source-files) args)) + + (if (or (eq c-lang-const-expansion 'call) + (and (not c-lang-const-expansion) + (not mode)) + load-in-progress + (not (boundp 'byte-compile-dest-file)) + (not (stringp byte-compile-dest-file))) + ;; Either a straight call is requested in the context, or + ;; we're in an "uncontrolled" context and got no language, + ;; or we're not being byte compiled so the compile time + ;; stuff below is unnecessary. + `(c-get-lang-constant ',name ,@args) + + ;; Being compiled. If the loading and compiling version is + ;; the same we use a value that is evaluated at compile time, + ;; otherwise it's evaluated at runtime. + `(if (eq c-version-sym ',c-version-sym) + (cc-eval-when-compile + (c-get-lang-constant ',name ,@args)) + (c-get-lang-constant ',name ,@args))))))) + +(defvar c-lang-constants-under-evaluation nil + "Alist of constants in the process of being evaluated. +The `cdr' of each entry indicates how far we've looked in the list +of definitions, so that the def for var FOO in c-mode can be defined in +terms of the def for that same var FOO (which will then rely on the +fallback definition for all modes, to break the cycle).") + +(defconst c-lang--novalue "novalue") (defun c-get-lang-constant (name &optional source-files mode) ;; Used by `c-lang-const'. @@ -2150,7 +2156,7 @@ ;; mode might have an explicit entry before that. (eq (setq value (c-find-assignment-for-mode (cdr source-pos) mode nil name)) - c-lang-constants) + c-lang--novalue) ;; Try again with the fallback mode from the ;; original position. Note that ;; `c-buffer-is-cc-mode' still is the real mode if @@ -2158,22 +2164,22 @@ (eq (setq value (c-find-assignment-for-mode (setcdr source-pos backup-source-pos) fallback t name)) - c-lang-constants))) + c-lang--novalue))) ;; A simple lookup with no fallback mode. (eq (setq value (c-find-assignment-for-mode (cdr source-pos) mode t name)) - c-lang-constants)) + c-lang--novalue)) (error - "`%s' got no (prior) value in %s (might be a cyclic reference)" + "`%s' got no (prior) value in %S (might be a cyclic reference)" name mode)) (condition-case err - (setq value (eval value)) + (setq value (funcall value)) (error ;; Print a message to aid in locating the error. We don't ;; print the error itself since that will be done later by ;; some caller higher up. - (message "Eval error in the `c-lang-defconst' for `%s' in %s:" + (message "Eval error in the `c-lang-defconst' for `%S' in %s:" sym mode) (makunbound sym) (signal (car err) (cdr err)))) @@ -2181,13 +2187,13 @@ (set sym (cons (cons mode value) (symbol-value sym))) value)))) -(defun c-find-assignment-for-mode (source-pos mode match-any-lang name) +(defun c-find-assignment-for-mode (source-pos mode match-any-lang _name) ;; Find the first assignment entry that applies to MODE at or after ;; SOURCE-POS. If MATCH-ANY-LANG is non-nil, entries with `t' as ;; the language list are considered to match, otherwise they don't. ;; On return SOURCE-POS is updated to point to the next assignment ;; after the returned one. If no assignment is found, - ;; `c-lang-constants' is returned as a magic value. + ;; `c-lang--novalue' is returned as a magic value. ;; ;; SOURCE-POS is a vector that points out a specific assignment in ;; the double alist that's used in the `source' property. The first @@ -2243,7 +2249,7 @@ match-any-lang) (throw 'found (cdr assignment)))) - c-lang-constants))) + c-lang--novalue))) (defun c-lang-major-mode-is (mode) ;; `c-major-mode-is' expands to a call to this function inside ------------------------------------------------------------ revno: 117760 fixes bug: http://debbugs.gnu.org/18326 committer: Michael Albinus branch nick: trunk timestamp: Thu 2014-08-28 21:31:11 +0200 message: * net/tramp.el (tramp-handle-shell-command): Use `display-buffer'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-28 06:46:58 +0000 +++ lisp/ChangeLog 2014-08-28 19:31:11 +0000 @@ -1,3 +1,8 @@ +2014-08-28 Michael Albinus + + * net/tramp.el (tramp-handle-shell-command): Use `display-buffer'. + (Bug#18326) + 2014-08-28 Martin Rudalics * scroll-bar.el (scroll-bar-horizontal-drag-1): Handle new === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2014-08-07 11:49:36 +0000 +++ lisp/net/tramp.el 2014-08-28 19:31:11 +0000 @@ -3289,11 +3289,12 @@ ;; Run the process. (setq p (apply 'start-file-process "*Async Shell*" buffer args)) ;; Display output. - (pop-to-buffer output-buffer) - (setq mode-line-process '(":%s")) - (shell-mode) - (set-process-sentinel p 'shell-command-sentinel) - (set-process-filter p 'comint-output-filter)) + (with-current-buffer output-buffer + (display-buffer output-buffer '(nil (allow-no-window . t))) + (setq mode-line-process '(":%s")) + (shell-mode) + (set-process-sentinel p 'shell-command-sentinel) + (set-process-filter p 'comint-output-filter))) (prog1 ;; Run the process. ------------------------------------------------------------ revno: 117759 committer: martin rudalics branch nick: trunk timestamp: Thu 2014-08-28 20:33:18 +0200 message: Revert x_scroll_bar_handle_click "typo fix". diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-28 14:48:02 +0000 +++ src/ChangeLog 2014-08-28 18:33:18 +0000 @@ -55,8 +55,6 @@ bar broken in change from 2014-07-27. (xaw_scroll_callback): Provide incremental scrolling with horizontal scroll bars. - (x_scroll_bar_handle_click): Fix typo introduced in change from - 2014-07-27. 2014-08-28 Eli Zaretskii === modified file 'src/xterm.c' --- src/xterm.c 2014-08-28 06:46:58 +0000 +++ src/xterm.c 2014-08-28 18:33:18 +0000 @@ -6184,7 +6184,7 @@ /* If the user has released the handle, set it to its final position. */ if (event->type == ButtonRelease && bar->dragging != -1) { - int new_start = y - bar->dragging; + int new_start = - bar->dragging; int new_end = new_start + bar->end - bar->start; x_scroll_bar_set_handle (bar, new_start, new_end, 0); ------------------------------------------------------------ revno: 117758 committer: Ken Brown branch nick: trunk timestamp: Thu 2014-08-28 10:48:02 -0400 message: Add support for HYBRID_MALLOC, allowing the use of gmalloc before dumping and the system malloc after dumping. (Bug#18222) * configure.ac (HYBRID_MALLOC): New macro; define to use gmalloc before dumping and the system malloc after dumping. Define on Cygwin. * src/conf_post.h (malloc, realloc, calloc, free) [HYBRID_MALLOC]: Define as macros, expanding to hybrid_malloc, etc. (HYBRID_GET_CURRENT_DIR_NAME): New macro. (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Define as macro. * src/gmalloc.c: Set up the infrastructure for HYBRID_MALLOC, with a full implementation on Cygwin. Remove Cygwin-specific code that is no longer needed. (malloc, realloc, calloc, free, aligned_alloc) [HYBRID_MALLOC]: Redefine as macros expanding to gmalloc, grealloc, etc. (DUMPED, ALLOCATED_BEFORE_DUMPING) [CYGWIN]: New macros. (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Undefine. (USE_PTHREAD, posix_memalign) [HYBRID_MALLOC]: Don't define. (hybrid_malloc, hybrid_calloc, hybrid_free, hybrid_realloc) [HYBRID_MALLOC]: (hybrid_get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: (hybrid_aligned_alloc) [HYBRID_MALLOC && (HAVE_ALIGNED_ALLOC || HAVE_POSIX_MEMALIGN)]: New functions. * src/alloc.c (aligned_alloc) [HYBRID_MALLOC && (ALIGNED_ALLOC || HAVE_POSIX_MEMALIGN)]: Define as macro expanding to hybrid_aligned_alloc; declare. (USE_ALIGNED_ALLOC) [HYBRID_MALLOC && (ALIGNED_ALLOC || HAVE_POSIX_MEMALIGN)]: Define. (refill_memory_reserve) [HYBRID_MALLOC]: Do nothing. * src/sysdep.c (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Define as macro, expanding to gget_current_dir_name, and define the latter. * src/emacs.c (main) [HYBRID_MALLOC]: Don't call memory_warnings() or malloc_enable_thread(). Don't initialize malloc. * src/lisp.h (NONPOINTER_BITS) [CYGWIN]: Define (because GNU_MALLOC is no longer defined on Cygwin). (refill_memory_reserve) [HYBRID_MALLOC]: Don't declare. * src/sheap.c (bss_sbrk_buffer_end): New variable. * src/unexcw.c (__malloc_initialized): Remove variable. * src/ralloc.c: Throughout, treat HYBRID_MALLOC the same as SYSTEM_MALLOC. * src/xdisp.c (decode_mode_spec) [HYBRID_MALLOC]: Don't check Vmemory_full. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-28 02:02:18 +0000 +++ ChangeLog 2014-08-28 14:48:02 +0000 @@ -1,3 +1,9 @@ +2014-08-28 Ken Brown + + * configure.ac (HYBRID_MALLOC): New macro; define to use gmalloc + before dumping and the system malloc after dumping. Define on + Cygwin. (Bug#18222) + 2014-08-28 Glenn Morris * Makefile.in (appdatadir): New variable. === modified file 'configure.ac' --- configure.ac 2014-08-28 01:59:29 +0000 +++ configure.ac 2014-08-28 14:48:02 +0000 @@ -2033,9 +2033,13 @@ doug_lea_malloc=$emacs_cv_var_doug_lea_malloc system_malloc=$emacs_cv_sanitize_address + +hybrid_malloc= + case "$opsys" in ## darwin ld insists on the use of malloc routines in the System framework. darwin|mingw32|sol2-10) system_malloc=yes ;; + cygwin) hybrid_malloc=yes;; esac GMALLOC_OBJ= @@ -2047,6 +2051,13 @@ GNU_MALLOC_reason=" (The GNU allocators don't work with this system configuration.)" VMLIMIT_OBJ= +elif test "$hybrid_malloc" = yes; then + AC_DEFINE(HYBRID_MALLOC, 1, + [Define to use gmalloc before dumping and the system malloc after.]) + GNU_MALLOC= + GNU_MALLOC_reason="only before dumping" + GMALLOC_OBJ=gmalloc.o + VMLIMIT_OBJ= else test "$doug_lea_malloc" != "yes" && GMALLOC_OBJ=gmalloc.o VMLIMIT_OBJ=vm-limit.o @@ -3568,9 +3579,11 @@ LIBS=$OLD_LIBS dnl No need to check for aligned_alloc and posix_memalign if using -dnl gmalloc.o, as it supplies them. Don't use these functions on -dnl Darwin as they are incompatible with unexmacosx.c. -if test -z "$GMALLOC_OBJ" && test "$opsys" != darwin; then +dnl gmalloc.o, as it supplies them, unless we're using hybrid_malloc. +dnl Don't use these functions on Darwin as they are incompatible with +dnl unexmacosx.c. +if (test -z "$GMALLOC_OBJ" || test "$hybrid_malloc" = yes) \ + && test "$opsys" != darwin; then AC_CHECK_FUNCS([aligned_alloc posix_memalign], [break]) fi === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-28 06:46:58 +0000 +++ src/ChangeLog 2014-08-28 14:48:02 +0000 @@ -1,3 +1,47 @@ +2014-08-28 Ken Brown + + Add support for HYBRID_MALLOC, allowing the use of gmalloc before + dumping and the system malloc after dumping. (Bug#18222) + + * conf_post.h (malloc, realloc, calloc, free) [HYBRID_MALLOC]: + Define as macros, expanding to hybrid_malloc, etc. + (HYBRID_GET_CURRENT_DIR_NAME): New macro. + (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Define as + macro. + * gmalloc.c: Set up the infrastructure for HYBRID_MALLOC, with a + full implementation on Cygwin. Remove Cygwin-specific code that + is no longer needed. + (malloc, realloc, calloc, free, aligned_alloc) [HYBRID_MALLOC]: + Redefine as macros expanding to gmalloc, grealloc, etc. + (DUMPED, ALLOCATED_BEFORE_DUMPING) [CYGWIN]: New macros. + (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: Undefine. + (USE_PTHREAD, posix_memalign) [HYBRID_MALLOC]: Don't define. + (hybrid_malloc, hybrid_calloc, hybrid_free, hybrid_realloc) + [HYBRID_MALLOC]: + (hybrid_get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: + (hybrid_aligned_alloc) [HYBRID_MALLOC && (HAVE_ALIGNED_ALLOC || + HAVE_POSIX_MEMALIGN)]: New functions. + * alloc.c (aligned_alloc) [HYBRID_MALLOC && (ALIGNED_ALLOC || + HAVE_POSIX_MEMALIGN)]: Define as macro expanding to + hybrid_aligned_alloc; declare. + (USE_ALIGNED_ALLOC) [HYBRID_MALLOC && (ALIGNED_ALLOC || + HAVE_POSIX_MEMALIGN)]: Define. + (refill_memory_reserve) [HYBRID_MALLOC]: Do nothing. + * sysdep.c (get_current_dir_name) [HYBRID_GET_CURRENT_DIR_NAME]: + Define as macro, expanding to gget_current_dir_name, and define + the latter. + * emacs.c (main) [HYBRID_MALLOC]: Don't call memory_warnings() or + malloc_enable_thread(). Don't initialize malloc. + * lisp.h (NONPOINTER_BITS) [CYGWIN]: Define (because GNU_MALLOC is + no longer defined on Cygwin). + (refill_memory_reserve) [HYBRID_MALLOC]: Don't declare. + * sheap.c (bss_sbrk_buffer_end): New variable. + * unexcw.c (__malloc_initialized): Remove variable. + * ralloc.c: Throughout, treat HYBRID_MALLOC the same as + SYSTEM_MALLOC. + * xdisp.c (decode_mode_spec) [HYBRID_MALLOC]: Don't check + Vmemory_full. + 2014-08-28 Martin Rudalics * w32term.c (w32_horizontal_scroll_bar_handle_click): In === modified file 'src/alloc.c' --- src/alloc.c 2014-08-09 21:50:14 +0000 +++ src/alloc.c 2014-08-28 14:48:02 +0000 @@ -80,7 +80,7 @@ marked objects. */ #if (defined SYSTEM_MALLOC || defined DOUG_LEA_MALLOC \ - || defined GC_CHECK_MARKED_OBJECTS) + || defined HYBRID_MALLOC || defined GC_CHECK_MARKED_OBJECTS) #undef GC_MALLOC_CHECK #endif @@ -285,7 +285,7 @@ static Lisp_Object make_pure_vector (ptrdiff_t); static void mark_buffer (struct buffer *); -#if !defined REL_ALLOC || defined SYSTEM_MALLOC +#if !defined REL_ALLOC || defined SYSTEM_MALLOC || defined HYBRID_MALLOC static void refill_memory_reserve (void); #endif static void compact_small_strings (void); @@ -1014,10 +1014,17 @@ clang 3.3 anyway. */ #if ! ADDRESS_SANITIZER -# if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC +# if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC && !defined HYBRID_MALLOC # define USE_ALIGNED_ALLOC 1 /* Defined in gmalloc.c. */ void *aligned_alloc (size_t, size_t); +# elif defined HYBRID_MALLOC +# if defined ALIGNED_ALLOC || defined HAVE_POSIX_MEMALIGN +# define USE_ALIGNED_ALLOC 1 +# define aligned_alloc hybrid_aligned_alloc +/* Defined in gmalloc.c. */ +void *aligned_alloc (size_t, size_t); +# endif # elif defined HAVE_ALIGNED_ALLOC # define USE_ALIGNED_ALLOC 1 # elif defined HAVE_POSIX_MEMALIGN @@ -3829,7 +3836,7 @@ void refill_memory_reserve (void) { -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC if (spare_memory[0] == 0) spare_memory[0] = malloc (SPARE_MEMORY); if (spare_memory[1] == 0) === modified file 'src/conf_post.h' --- src/conf_post.h 2014-08-28 01:59:29 +0000 +++ src/conf_post.h 2014-08-28 14:48:02 +0000 @@ -80,6 +80,23 @@ #define vfork fork #endif /* DARWIN_OS */ +/* If HYBRID_MALLOC is defined (e.g., on Cygwin), emacs will use + gmalloc before dumping and the system malloc after dumping. + hybrid_malloc and friends, defined in gmalloc.c, are wrappers that + accomplish this. */ +#ifdef HYBRID_MALLOC +#ifdef emacs +#define malloc hybrid_malloc +#define realloc hybrid_realloc +#define calloc hybrid_calloc +#define free hybrid_free +#if defined HAVE_GET_CURRENT_DIR_NAME && !defined BROKEN_GET_CURRENT_DIR_NAME +#define HYBRID_GET_CURRENT_DIR_NAME 1 +#define get_current_dir_name hybrid_get_current_dir_name +#endif +#endif +#endif /* HYBRID_MALLOC */ + /* We have to go this route, rather than the old hpux9 approach of renaming the functions via macros. The system's stdlib.h has fully prototyped declarations, which yields a conflicting definition of === modified file 'src/emacs.c' --- src/emacs.c 2014-08-25 20:49:52 +0000 +++ src/emacs.c 2014-08-28 14:48:02 +0000 @@ -145,7 +145,7 @@ /* True if the MALLOC_CHECK_ environment variable was set while dumping. Used to work around a bug in glibc's malloc. */ static bool malloc_using_checking; -#elif defined HAVE_PTHREAD && !defined SYSTEM_MALLOC +#elif defined HAVE_PTHREAD && !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC extern void malloc_enable_thread (void); #endif @@ -906,7 +906,7 @@ clearerr (stdin); -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC /* Arrange to get warning messages as memory fills up. */ memory_warnings (0, malloc_warning); @@ -914,7 +914,7 @@ Also call realloc and free for consistency. */ free (realloc (malloc (4), 4)); -#endif /* not SYSTEM_MALLOC */ +#endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */ #ifdef MSDOS SET_BINARY (fileno (stdin)); @@ -1139,12 +1139,13 @@ #endif /* DOS_NT */ } -#if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC +#if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC \ + && !defined DOUG_LEA_MALLOC && !defined HYBRID_MALLOC # ifndef CANNOT_DUMP /* Do not make gmalloc thread-safe when creating bootstrap-emacs, as - that causes an infinite recursive loop with FreeBSD. But do make - it thread-safe when creating emacs, otherwise bootstrap-emacs - fails on Cygwin. See Bug#14569. */ + that causes an infinite recursive loop with FreeBSD. See + Bug#14569. The part of this bug involving Cygwin is no longer + relevant, now that Cygwin defines HYBRID_MALLOC. */ if (!noninteractive || initialized) # endif malloc_enable_thread (); @@ -2131,7 +2132,7 @@ fflush (stdout); /* Tell malloc where start of impure now is. */ /* Also arrange for warnings when nearly out of space. */ -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC #ifndef WINDOWSNT /* On Windows, this was done before dumping, and that once suffices. Meanwhile, my_edata is not valid on Windows. */ @@ -2140,7 +2141,7 @@ memory_warnings (my_edata, malloc_warning); } #endif /* not WINDOWSNT */ -#endif /* not SYSTEM_MALLOC */ +#endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */ #ifdef DOUG_LEA_MALLOC malloc_state_ptr = malloc_get_state (); #endif === modified file 'src/gmalloc.c' --- src/gmalloc.c 2014-08-15 04:34:06 +0000 +++ src/gmalloc.c 2014-08-28 14:48:02 +0000 @@ -19,15 +19,27 @@ The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ +/* If HYBRID_MALLOC is defined in config.h, then conf_post.h #defines + malloc and friends as macros before including stdlib.h. In this + file we will need the prototypes for the system malloc, so we must + include stdlib.h before config.h. And we have to do this + unconditionally, since HYBRID_MALLOC hasn't been defined yet. */ +#include + #include -#ifdef HAVE_PTHREAD +#if defined HAVE_PTHREAD && !defined HYBRID_MALLOC #define USE_PTHREAD #endif #include #include #include + +#ifdef HYBRID_GET_CURRENT_DIR_NAME +#undef get_current_dir_name +#endif + #include #ifdef USE_PTHREAD @@ -42,6 +54,41 @@ extern void emacs_abort (void); #endif +/* If HYBRID_MALLOC is defined, then temacs will use malloc, + realloc... as defined in this file (and renamed gmalloc, + grealloc... via the macros that follow). The dumped emacs, + however, will use the system malloc, realloc.... In other source + files, malloc, realloc... are renamed hybrid_malloc, + hybrid_realloc... via macros in conf_post.h. hybrid_malloc and + friends are wrapper functions defined later in this file. + aligned_alloc is defined as a macro only in alloc.c. + + As of this writing (August 2014), Cygwin is the only platform on + which HYBRID_MACRO is defined. Any other platform that wants to + define it will have to define the macros DUMPED and + ALLOCATED_BEFORE_DUMPING, defined below for Cygwin. */ +#ifdef HYBRID_MALLOC +#undef malloc +#undef realloc +#undef calloc +#undef free +#define malloc gmalloc +#define realloc grealloc +#define calloc gcalloc +#define aligned_alloc galigned_alloc +#define free gfree +#endif /* HYBRID_MALLOC */ + +#ifdef CYGWIN +extern void *bss_sbrk (ptrdiff_t size); +extern int bss_sbrk_did_unexec; +extern char *bss_sbrk_buffer; +extern char *bss_sbrk_buffer_end; +#define DUMPED bss_sbrk_did_unexec +#define ALLOCATED_BEFORE_DUMPING(P) \ + ((char *) (P) < bss_sbrk_buffer_end && (char *) (P) >= bss_sbrk_buffer) +#endif + #ifdef __cplusplus extern "C" { @@ -306,22 +353,6 @@ #include -/* On Cygwin there are two heaps. temacs uses the static heap - (defined in sheap.c and managed with bss_sbrk), and the dumped - emacs uses the Cygwin heap (managed with sbrk). When emacs starts - on Cygwin, it reinitializes malloc, and we save the old info for - use by free and realloc if they're called with a pointer into the - static heap. - - Currently (2011-08-16) the Cygwin build doesn't use ralloc.c; if - this is changed in the future, we'll have to similarly deal with - reinitializing ralloc. */ -#ifdef CYGWIN -extern void *bss_sbrk (ptrdiff_t size); -extern int bss_sbrk_did_unexec; -char *bss_sbrk_heapbase; /* _heapbase for static heap */ -malloc_info *bss_sbrk_heapinfo; /* _heapinfo for static heap */ -#endif void *(*__morecore) (ptrdiff_t size) = __default_morecore; /* Debugging hook for `malloc'. */ @@ -490,18 +521,8 @@ } #ifdef USE_PTHREAD -/* On Cygwin prior to 1.7.31, pthread_mutexes were ERRORCHECK mutexes - by default. When the default changed to NORMAL in Cygwin-1.7.31, - deadlocks occurred (bug#18222). As a temporary workaround, we - explicitly set the mutexes to be of ERRORCHECK type, restoring the - previous behavior. */ -#ifdef CYGWIN -pthread_mutex_t _malloc_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; -pthread_mutex_t _aligned_blocks_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; -#else /* not CYGWIN */ pthread_mutex_t _malloc_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t _aligned_blocks_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* not CYGWIN */ int _malloc_thread_enabled_p; static void @@ -536,17 +557,8 @@ initialized mutexes when they are used first. To avoid such a situation, we initialize mutexes here while their use is disabled in malloc etc. */ -#ifdef CYGWIN - /* Use ERRORCHECK mutexes; see comment above. */ - pthread_mutexattr_t attr; - pthread_mutexattr_init (&attr); - pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ERRORCHECK); - pthread_mutex_init (&_malloc_mutex, &attr); - pthread_mutex_init (&_aligned_blocks_mutex, &attr); -#else /* not CYGWIN */ pthread_mutex_init (&_malloc_mutex, NULL); pthread_mutex_init (&_aligned_blocks_mutex, NULL); -#endif /* not CYGWIN */ pthread_atfork (malloc_atfork_handler_prepare, malloc_atfork_handler_parent, malloc_atfork_handler_child); @@ -561,16 +573,6 @@ mcheck (NULL); #endif -#ifdef CYGWIN - if (bss_sbrk_did_unexec) - /* we're reinitializing the dumped emacs */ - { - bss_sbrk_heapbase = _heapbase; - bss_sbrk_heapinfo = _heapinfo; - memset (_fraghead, 0, BLOCKLOG * sizeof (struct list)); - } -#endif - if (__malloc_initialize_hook) (*__malloc_initialize_hook) (); @@ -1027,12 +1029,6 @@ if (ptr == NULL) return; -#ifdef CYGWIN - if ((char *) ptr < _heapbase) - /* We're being asked to free something in the static heap. */ - return; -#endif - PROTECT_MALLOC_STATE (0); LOCK_ALIGNED_BLOCKS (); @@ -1317,29 +1313,6 @@ #define min(A, B) ((A) < (B) ? (A) : (B)) #endif -/* On Cygwin the dumped emacs may try to realloc storage allocated in - the static heap. We just malloc space in the new heap and copy the - data. */ -#ifdef CYGWIN -void * -special_realloc (void *ptr, size_t size) -{ - void *result; - int type; - size_t block, oldsize; - - block = ((char *) ptr - bss_sbrk_heapbase) / BLOCKSIZE + 1; - type = bss_sbrk_heapinfo[block].busy.type; - oldsize = - type == 0 ? bss_sbrk_heapinfo[block].busy.info.size * BLOCKSIZE - : (size_t) 1 << type; - result = _malloc_internal_nolock (size); - if (result) - return memcpy (result, ptr, min (oldsize, size)); - return result; -} -#endif - /* Debugging hook for realloc. */ void *(*__realloc_hook) (void *ptr, size_t size); @@ -1364,12 +1337,6 @@ else if (ptr == NULL) return _malloc_internal_nolock (size); -#ifdef CYGWIN - if ((char *) ptr < _heapbase) - /* ptr points into the static heap */ - return special_realloc (ptr, size); -#endif - block = BLOCK (ptr); PROTECT_MALLOC_STATE (0); @@ -1566,7 +1533,7 @@ { void *result; #if defined (CYGWIN) - if (!bss_sbrk_did_unexec) + if (!DUMPED) { return bss_sbrk (increment); } @@ -1689,6 +1656,9 @@ return aligned_alloc (alignment, size); } +/* If HYBRID_MALLOC is defined, we may want to use the system + posix_memalign below. */ +#ifndef HYBRID_MALLOC int posix_memalign (void **memptr, size_t alignment, size_t size) { @@ -1707,6 +1677,7 @@ return 0; } +#endif /* Allocate memory on a page boundary. Copyright (C) 1991, 92, 93, 94, 96 Free Software Foundation, Inc. @@ -1747,6 +1718,102 @@ return aligned_alloc (pagesize, size); } +#ifdef HYBRID_MALLOC +#undef malloc +#undef realloc +#undef calloc +#undef aligned_alloc +#undef free + +/* See the comments near the beginning of this file for explanations + of the following functions. */ + +void * +hybrid_malloc (size_t size) +{ + if (DUMPED) + return malloc (size); + return gmalloc (size); +} + +void * +hybrid_calloc (size_t nmemb, size_t size) +{ + if (DUMPED) + return calloc (nmemb, size); + return gcalloc (nmemb, size); +} + +void +hybrid_free (void *ptr) +{ + if (!DUMPED) + gfree (ptr); + else if (!ALLOCATED_BEFORE_DUMPING (ptr)) + free (ptr); + /* Otherwise the dumped emacs is trying to free something allocated + before dumping; do nothing. */ + return; +} + +#if defined HAVE_ALIGNED_ALLOC || defined HAVE_POSIX_MEMALIGN +void * +hybrid_aligned_alloc (size_t alignment, size_t size) +{ + if (!DUMPED) + return galigned_alloc (alignment, size); + /* The following is copied from alloc.c */ +#ifdef HAVE_ALIGNED_ALLOC + return aligned_alloc (alignment, size); +#else /* HAVE_POSIX_MEMALIGN */ + void *p; + return posix_memalign (&p, alignment, size) == 0 ? p : 0; +#endif +} +#endif + +void * +hybrid_realloc (void *ptr, size_t size) +{ + void *result; + int type; + size_t block, oldsize; + + if (!DUMPED) + return grealloc (ptr, size); + if (!ALLOCATED_BEFORE_DUMPING (ptr)) + return realloc (ptr, size); + + /* The dumped emacs is trying to realloc storage allocated before + dumping. We just malloc new space and copy the data. */ + if (size == 0 || ptr == NULL) + return malloc (size); + block = ((char *) ptr - _heapbase) / BLOCKSIZE + 1; + type = _heapinfo[block].busy.type; + oldsize = + type == 0 ? _heapinfo[block].busy.info.size * BLOCKSIZE + : (size_t) 1 << type; + result = malloc (size); + if (result) + return memcpy (result, ptr, min (oldsize, size)); + return result; +} + +#ifdef HYBRID_GET_CURRENT_DIR_NAME +/* Defined in sysdep.c. */ +char *gget_current_dir_name (void); + +char * +hybrid_get_current_dir_name (void) +{ + if (DUMPED) + return get_current_dir_name (); + return gget_current_dir_name (); +} +#endif + +#endif /* HYBRID_MALLOC */ + #ifdef GC_MCHECK /* Standard debugging hooks for `malloc'. === modified file 'src/lisp.h' --- src/lisp.h 2014-08-27 11:22:37 +0000 +++ src/lisp.h 2014-08-28 14:48:02 +0000 @@ -88,7 +88,8 @@ 2. We know malloc returns a multiple of 8. */ #if (defined alignas \ && (defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ \ - || defined DARWIN_OS || defined __sun || defined __MINGW32__)) + || defined DARWIN_OS || defined __sun || defined __MINGW32__ \ + || defined CYGWIN)) # define NONPOINTER_BITS 0 #else # define NONPOINTER_BITS GCTYPEBITS @@ -3629,7 +3630,7 @@ extern _Noreturn void buffer_memory_full (ptrdiff_t); extern bool survives_gc_p (Lisp_Object); extern void mark_object (Lisp_Object); -#if defined REL_ALLOC && !defined SYSTEM_MALLOC +#if defined REL_ALLOC && !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC extern void refill_memory_reserve (void); #endif extern const char *pending_malloc_warning; === modified file 'src/ralloc.c' --- src/ralloc.c 2014-01-01 07:43:34 +0000 +++ src/ralloc.c 2014-08-28 14:48:02 +0000 @@ -35,9 +35,9 @@ #define M_TOP_PAD -2 extern int mallopt (int, int); #else /* not DOUG_LEA_MALLOC */ -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC extern size_t __malloc_extra_blocks; -#endif /* SYSTEM_MALLOC */ +#endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */ #endif /* not DOUG_LEA_MALLOC */ #else /* not emacs */ @@ -95,7 +95,7 @@ /* The hook `malloc' uses for the function which gets more space from the system. */ -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC extern void *(*__morecore) (ptrdiff_t); #endif @@ -1179,7 +1179,7 @@ r_alloc_initialized = 1; page_size = PAGE; -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC real_morecore = __morecore; __morecore = r_alloc_sbrk; @@ -1198,7 +1198,7 @@ mallopt (M_TOP_PAD, 64 * 4096); unblock_input (); #else -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC /* Give GNU malloc's morecore some hysteresis so that we move all the relocatable blocks much less often. The number used to be 64, but alloc.c would override that with 32 in code that was @@ -1211,7 +1211,7 @@ #endif #endif -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC first_heap->end = (void *) PAGE_ROUNDUP (first_heap->start); /* The extra call to real_morecore guarantees that the end of the === modified file 'src/sheap.c' --- src/sheap.c 2014-01-01 07:43:34 +0000 +++ src/sheap.c 2014-08-28 14:48:02 +0000 @@ -44,6 +44,7 @@ #define BLOCKSIZE 4096 char bss_sbrk_buffer[STATIC_HEAP_SIZE]; +char *bss_sbrk_buffer_end = bss_sbrk_buffer + STATIC_HEAP_SIZE; char *bss_sbrk_ptr; char *max_bss_sbrk_ptr; int bss_sbrk_did_unexec; === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-28 00:50:36 +0000 +++ src/sysdep.c 2014-08-28 14:48:02 +0000 @@ -19,6 +19,14 @@ #include +/* If HYBRID_GET_CURRENT_DIR_NAME is defined in conf_post.h, then we + need the following before including unistd.h, in order to pick up + the right prototype for gget_current_dir_name. */ +#ifdef HYBRID_GET_CURRENT_DIR_NAME +#undef get_current_dir_name +#define get_current_dir_name gget_current_dir_name +#endif + #include #include "sysstdio.h" #ifdef HAVE_PWD_H @@ -121,9 +129,8 @@ 1800, 2400, 4800, 9600, 19200, 38400 }; - -#if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME) - +#if !defined HAVE_GET_CURRENT_DIR_NAME || defined BROKEN_GET_CURRENT_DIR_NAME \ + || (defined HYBRID_GET_CURRENT_DIR_NAME) /* Return the current working directory. Returns NULL on errors. Any other returned value must be freed with free. This is used only when get_current_dir_name is not defined on the system. */ === modified file 'src/unexcw.c' --- src/unexcw.c 2014-04-03 20:46:04 +0000 +++ src/unexcw.c 2014-08-28 14:48:02 +0000 @@ -34,8 +34,6 @@ extern int bss_sbrk_did_unexec; -extern int __malloc_initialized; - /* emacs symbols that indicate where bss and data end for emacs internals */ extern char my_endbss[]; extern char my_edata[]; @@ -233,12 +231,9 @@ lseek (fd, (long) (exe_header->section_header[i].s_scnptr), SEEK_SET); assert (ret != -1); - /* force the dumped emacs to reinitialize malloc */ - __malloc_initialized = 0; ret = write (fd, (char *) start_address, my_endbss - (char *) start_address); - __malloc_initialized = 1; assert (ret == (my_endbss - (char *) start_address)); if (debug_unexcw) printf (" .bss, mem start %#lx mem length %d\n", === modified file 'src/xdisp.c' --- src/xdisp.c 2014-08-28 01:59:29 +0000 +++ src/xdisp.c 2014-08-28 14:48:02 +0000 @@ -22826,7 +22826,7 @@ } case 'e': -#ifndef SYSTEM_MALLOC +#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC { if (NILP (Vmemory_full)) return ""; ------------------------------------------------------------ revno: 117757 committer: martin rudalics branch nick: trunk timestamp: Thu 2014-08-28 08:46:58 +0200 message: Some fixes for scroll bar code. * w32term.c (w32_horizontal_scroll_bar_handle_click): In `event->y' return entire range (the size of the scroll bar minus that of the thumb). * xterm.c (xm_scroll_callback, xaw_jump_callback): In `whole' return entire range (the scaled size of the scroll bar minus that of the slider). In `portion' return the scaled position of the slider. (xaw_jump_callback): Restore part of code for vertical scroll bar broken in change from 2014-07-27. (xaw_scroll_callback): Provide incremental scrolling with horizontal scroll bars. (x_scroll_bar_handle_click): Fix typo introduced in change from 2014-07-27. * scroll-bar.el (scroll-bar-horizontal-drag-1): Handle new interpretation of `portion-whole'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-28 01:59:29 +0000 +++ lisp/ChangeLog 2014-08-28 06:46:58 +0000 @@ -1,3 +1,8 @@ +2014-08-28 Martin Rudalics + + * scroll-bar.el (scroll-bar-horizontal-drag-1): Handle new + interpretation of `portion-whole'. + 2014-08-28 Michael Albinus * emacs-lisp/authors.el (authors-aliases): Addition. === modified file 'lisp/scroll-bar.el' --- lisp/scroll-bar.el 2014-08-18 14:39:26 +0000 +++ lisp/scroll-bar.el 2014-08-28 06:46:58 +0000 @@ -330,9 +330,11 @@ (if (eq (current-bidi-paragraph-direction (window-buffer window)) 'left-to-right) (set-window-hscroll - window (/ (1- (+ (car portion-whole) unit)) unit)) + window (/ (+ (car portion-whole) (1- unit)) unit)) (set-window-hscroll - window (/ (1- (+ (cdr portion-whole) unit)) unit))))) + window (/ (+ (- (cdr portion-whole) (car portion-whole)) + (1- unit)) + unit))))) (defun scroll-bar-horizontal-drag (event) "Scroll the window horizontally by dragging the scroll bar slider. === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-28 01:59:29 +0000 +++ src/ChangeLog 2014-08-28 06:46:58 +0000 @@ -1,3 +1,19 @@ +2014-08-28 Martin Rudalics + + * w32term.c (w32_horizontal_scroll_bar_handle_click): In + `event->y' return entire range (the size of the scroll bar minus + that of the thumb). + * xterm.c (xm_scroll_callback, xaw_jump_callback): In `whole' + return entire range (the scaled size of the scroll bar minus + that of the slider). In `portion' return the scaled position of + the slider. + (xaw_jump_callback): Restore part of code for vertical scroll + bar broken in change from 2014-07-27. + (xaw_scroll_callback): Provide incremental scrolling with + horizontal scroll bars. + (x_scroll_bar_handle_click): Fix typo introduced in change from + 2014-07-27. + 2014-08-28 Eli Zaretskii * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define. === modified file 'src/w32term.c' --- src/w32term.c 2014-08-20 14:41:15 +0000 +++ src/w32term.c 2014-08-28 06:46:58 +0000 @@ -4293,7 +4293,7 @@ x = si.nTrackPos; else x = si.nPos; - y = si.nMax - x - si.nPage; + y = si.nMax - si.nPage; bar->dragging = 0; FRAME_DISPLAY_INFO (f)->last_mouse_scroll_bar_pos = msg->msg.wParam; @@ -4350,12 +4350,9 @@ int end = bar->end; si.cbSize = sizeof (si); -/** si.fMask = SIF_PAGE | SIF_POS; **/ si.fMask = SIF_POS; -/** si.nPage = end - start + HORIZONTAL_SCROLL_BAR_MIN_HANDLE; **/ si.nPos = min (last_scroll_bar_drag_pos, XWINDOW (bar->window)->hscroll_whole - 1); -/** si.nPos = last_scroll_bar_drag_pos; **/ SetScrollInfo (SCROLL_BAR_W32_WINDOW (bar), SB_CTL, &si, TRUE); } /* fall through */ === modified file 'src/xterm.c' --- src/xterm.c 2014-08-07 14:17:03 +0000 +++ src/xterm.c 2014-08-28 06:46:58 +0000 @@ -4549,12 +4549,9 @@ if (horizontal) { - whole = bar->whole; - portion = (((float) cs->value - / (XM_SB_MAX - slider_size)) - * (whole - - ((float) slider_size / XM_SB_MAX) * whole)); - portion = max (0, portion); + portion = bar->whole * ((float)cs->value / XM_SB_MAX); + whole = bar->whole * ((float)(XM_SB_MAX - slider_size) / XM_SB_MAX); + portion = min (portion, whole); part = scroll_bar_horizontal_handle; } else @@ -4687,24 +4684,51 @@ float *top_addr = call_data; float top = *top_addr; float shown; - int whole, portion, height; + int whole, portion, height, width; enum scroll_bar_part part; int horizontal = bar->horizontal; - /* Get the size of the thumb, a value between 0 and 1. */ - block_input (); - XtVaGetValues (widget, XtNshown, &shown, XtNheight, &height, NULL); - unblock_input (); if (horizontal) { - whole = bar->whole; - portion = (top * (whole - (shown * whole))) / (1 - shown); - portion = max (0, portion); + /* Get the size of the thumb, a value between 0 and 1. */ + block_input (); + XtVaGetValues (widget, XtNshown, &shown, XtNwidth, &width, NULL); + unblock_input (); + + if (shown < 1) + { + whole = bar->whole - (shown * bar->whole); + portion = min (top * bar->whole, whole); + } + else + { + whole = bar->whole; + portion = 0; + } + part = scroll_bar_horizontal_handle; } else - part = scroll_bar_handle; + { + /* Get the size of the thumb, a value between 0 and 1. */ + block_input (); + XtVaGetValues (widget, XtNshown, &shown, XtNheight, &height, NULL); + unblock_input (); + + whole = 10000000; + portion = shown < 1 ? top * whole : 0; + + if (shown < 1 && (eabs (top + shown - 1) < 1.0f / height)) + /* Some derivatives of Xaw refuse to shrink the thumb when you reach + the bottom, so we force the scrolling whenever we see that we're + too close to the bottom (in x_set_toolkit_scroll_bar_thumb + we try to ensure that we always stay two pixels away from the + bottom). */ + part = scroll_bar_down_arrow; + else + part = scroll_bar_handle; + } window_being_scrolled = bar->window; bar->dragging = portion; @@ -4727,28 +4751,54 @@ struct scroll_bar *bar = client_data; /* The position really is stored cast to a pointer. */ int position = (intptr_t) call_data; - Dimension height; + Dimension height, width; enum scroll_bar_part part; - /* Get the height of the scroll bar. */ - block_input (); - XtVaGetValues (widget, XtNheight, &height, NULL); - unblock_input (); - - if (eabs (position) >= height) - part = (position < 0) ? scroll_bar_above_handle : scroll_bar_below_handle; - - /* If Xaw3d was compiled with ARROW_SCROLLBAR, - it maps line-movement to call_data = max(5, height/20). */ - else if (xaw3d_arrow_scroll && eabs (position) <= max (5, height / 20)) - part = (position < 0) ? scroll_bar_up_arrow : scroll_bar_down_arrow; + if (bar->horizontal) + { + /* Get the width of the scroll bar. */ + block_input (); + XtVaGetValues (widget, XtNwidth, &width, NULL); + unblock_input (); + + if (eabs (position) >= width) + part = (position < 0) ? scroll_bar_before_handle : scroll_bar_after_handle; + + /* If Xaw3d was compiled with ARROW_SCROLLBAR, + it maps line-movement to call_data = max(5, height/20). */ + else if (xaw3d_arrow_scroll && eabs (position) <= max (5, width / 20)) + part = (position < 0) ? scroll_bar_left_arrow : scroll_bar_right_arrow; + else + part = scroll_bar_move_ratio; + + window_being_scrolled = bar->window; + bar->dragging = -1; + bar->last_seen_part = part; + x_send_scroll_bar_event (bar->window, part, position, width, bar->horizontal); + } else - part = scroll_bar_move_ratio; - - window_being_scrolled = bar->window; - bar->dragging = -1; - bar->last_seen_part = part; - x_send_scroll_bar_event (bar->window, part, position, height, bar->horizontal); + { + + /* Get the height of the scroll bar. */ + block_input (); + XtVaGetValues (widget, XtNheight, &height, NULL); + unblock_input (); + + if (eabs (position) >= height) + part = (position < 0) ? scroll_bar_above_handle : scroll_bar_below_handle; + + /* If Xaw3d was compiled with ARROW_SCROLLBAR, + it maps line-movement to call_data = max(5, height/20). */ + else if (xaw3d_arrow_scroll && eabs (position) <= max (5, height / 20)) + part = (position < 0) ? scroll_bar_up_arrow : scroll_bar_down_arrow; + else + part = scroll_bar_move_ratio; + + window_being_scrolled = bar->window; + bar->dragging = -1; + bar->last_seen_part = part; + x_send_scroll_bar_event (bar->window, part, position, height, bar->horizontal); + } } #endif /* not USE_GTK and not USE_MOTIF */ @@ -6134,7 +6184,7 @@ /* If the user has released the handle, set it to its final position. */ if (event->type == ButtonRelease && bar->dragging != -1) { - int new_start = - bar->dragging; + int new_start = y - bar->dragging; int new_end = new_start + bar->end - bar->start; x_scroll_bar_set_handle (bar, new_start, new_end, 0); ------------------------------------------------------------ revno: 117756 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-08-27 19:02:18 -0700 message: Add install/uninstall rules for etc/emacs.appdata.xml * Makefile.in (appdatadir): New variable. (install-etc, uninstall, clean): Handle etc/emacs.appdata.xml. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-28 01:59:29 +0000 +++ ChangeLog 2014-08-28 02:02:18 +0000 @@ -1,3 +1,8 @@ +2014-08-28 Glenn Morris + + * Makefile.in (appdatadir): New variable. + (install-etc, uninstall, clean): Handle etc/emacs.appdata.xml. + 2014-08-27 Paul Eggert Improve robustness of new string-collation code (Bug#18051). === modified file 'Makefile.in' --- Makefile.in 2014-07-13 15:50:35 +0000 +++ Makefile.in 2014-08-28 02:02:18 +0000 @@ -179,6 +179,9 @@ # Where the etc/emacs.desktop file is to be installed. desktopdir=$(datarootdir)/applications +# Where the etc/emacs.appdata.xml file is to be installed. +appdatadir=$(datarootdir)/appdata + # Where the etc/images/icons/hicolor directory is to be installed. icondir=$(datarootdir)/icons @@ -687,6 +690,12 @@ ${srcdir}/etc/emacs.desktop > $${tmp}; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"; \ rm -f $${tmp} + umask 022; ${MKDIR_P} "$(DESTDIR)${appdatadir}" + tmp=etc/emacs.tmpappdata; rm -f $${tmp}; \ + sed -e "s/emacs\.desktop/${EMACS_NAME}.desktop/" \ + ${srcdir}/etc/emacs.appdata.xml > $${tmp}; \ + ${INSTALL_DATA} $${tmp} "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml"; \ + rm -f $${tmp} thisdir=`/bin/pwd`; \ cd ${iconsrcdir} || exit 1; umask 022 ; \ for dir in */*/apps */*/mimetypes; do \ @@ -751,6 +760,7 @@ hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \ fi) -rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop" + -rm -f "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml" for file in snake-scores tetris-scores; do \ file="$(DESTDIR)${gamedir}/$${file}"; \ [ -s "$${file}" ] || rm -f "$$file"; \ @@ -806,7 +816,7 @@ for dir in test/automated; do \ [ ! -d $$dir ] || $(MAKE) -C $$dir clean; \ done - -rm -f etc/emacs.tmpdesktop + -rm -f etc/emacs.tmpdesktop etc/emacs.tmpappdata ### `bootclean' ### Delete all files that need to be remade for a clean bootstrap. ------------------------------------------------------------ revno: 117755 [merge] committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-08-27 18:59:29 -0700 message: Merge from emacs-24; up to r117462 diff: === modified file 'admin/authors.el' --- admin/authors.el 2014-08-26 17:58:06 +0000 +++ admin/authors.el 2014-08-28 01:59:29 +0000 @@ -92,6 +92,7 @@ ("Joseph Arceneaux" "Joe Arceneaux") ("Joseph M. Kelsey" "Joe Kelsey") ; FIXME ? ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia") + ("Jürgen Hötzel" "Juergen Hoetzel") ("K. Shane Hartman" "Shane Hartman") ("Kai Großjohann" "Kai Grossjohann") ("Karl Berry" "K. Berry") === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-08-27 10:51:21 +0000 +++ doc/lispref/ChangeLog 2014-08-28 01:59:29 +0000 @@ -1,3 +1,8 @@ +2014-08-28 Eli Zaretskii + + * display.texi (Bidirectional Display): Update the Emacs's class + of bidirectional conformance. + 2014-08-27 Dmitry Antipov * eval.texi (Eval): Mention possible recovery from stack overflow. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2014-06-08 23:39:23 +0000 +++ doc/lispref/display.texi 2014-08-19 18:56:29 +0000 @@ -6551,8 +6551,10 @@ position. In performing this @dfn{bidirectional reordering}, Emacs follows the Unicode Bidirectional Algorithm (a.k.a.@: @acronym{UBA}), which is described in Annex #9 of the Unicode standard -(@url{http://www.unicode.org/reports/tr9/}). Emacs provides a ``Full -Bidirectionality'' class implementation of the @acronym{UBA}. +(@url{http://www.unicode.org/reports/tr9/}). Emacs currently provides +a ``Non-isolate Bidirectionality'' class implementation of the +@acronym{UBA}: it does not yet support the isolate directional +formatting characters introduced with Unicode Standard v6.3.0. @defvar bidi-display-reordering If the value of this buffer-local variable is non-@code{nil} (the === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-08-25 15:55:46 +0000 +++ etc/ChangeLog 2014-08-28 01:59:29 +0000 @@ -1,3 +1,7 @@ +2014-08-28 Glenn Morris + + * emacs.appdata.xml: New file; description from Emacs's homepage. + 2014-08-25 Eli Zaretskii * NEWS: Mention that string-collate-* functions are supported on === added file 'etc/emacs.appdata.xml' --- etc/emacs.appdata.xml 1970-01-01 00:00:00 +0000 +++ etc/emacs.appdata.xml 2014-08-28 01:53:26 +0000 @@ -0,0 +1,33 @@ + + + + emacs.desktop + GFDL-1.3 + + GPL-3.0+ and GFDL-1.3 + GNU Emacs + An extensible text editor + +

+ GNU Emacs is an extensible, customizable text editor - and more. + At its core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. +

+

The features of GNU Emacs include:

+
    +
  • Content-sensitive editing modes, including syntax coloring, for + a wide-range of file types
    • +
  • Complete built-in documentation, including a tutorial for new users
    • +
  • Full Unicode support for nearly all human languages and their scripts
    • +
  • Highly customizable, using Emacs Lisp code or a graphical interface
    • +
  • Includes a project planner, mail and news reader, debugger + interface, calendar, and more
    • +
+ + + http://www.gnu.org/software/emacs/images/appdata.png + + http://www.gnu.org/software/emacs + emacs-devel_at_gnu.org + GNU + === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-28 01:55:45 +0000 +++ lisp/ChangeLog 2014-08-28 01:59:29 +0000 @@ -1,3 +1,26 @@ +2014-08-28 Michael Albinus + + * emacs-lisp/authors.el (authors-aliases): Addition. + + * net/tramp-adb.el: Spell author name correctly. + +2014-08-28 João Távora + + * net/shr.el (shr-expand-url): Plain expand-file-name is not enough; + use url-expand-file-name. (Bug#18310) + +2014-08-28 Glenn Morris + + * emulation/cua-rect.el (cua--highlight-rectangle): + Avoid error at point-min. (Bug#18309) + +2014-08-28 Stefan Monnier + + * progmodes/python.el (python-shell-prompt-detect): Remove redundant + executable-find (bug#18244). + + * simple.el (self-insert-uses-region-functions): Defvar. + 2014-08-28 Glenn Morris * subr.el (remq): Revert 2014-08-25 doc change (not always true). === modified file 'lisp/emulation/cua-rect.el' --- lisp/emulation/cua-rect.el 2014-07-06 23:58:52 +0000 +++ lisp/emulation/cua-rect.el 2014-08-25 16:40:53 +0000 @@ -794,7 +794,7 @@ (make-string (- l cl0 (if (and (= le pl) (/= le lb)) 1 0)) (if cua--virtual-edges-debug ?. ?\s)) - 'face (or (get-text-property (1- s) 'face) 'default))) + 'face (or (get-text-property (max (1- s) (point-min)) 'face) 'default))) (if (/= pl le) (setq s (1- s)))) (cond === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2014-08-25 16:04:39 +0000 +++ lisp/net/shr.el 2014-08-28 01:59:29 +0000 @@ -589,6 +589,10 @@ (url-type parsed) url))) +(autoload 'url-expand-file-name "url-expand") + +;; FIXME This needs some tests writing. +;; Does it even need to exist, given that url-expand-file-name does? (defun shr-expand-url (url &optional base) (setq base (if base @@ -614,7 +618,7 @@ (concat (nth 3 base) url)) (t ;; Totally relative. - (concat (car base) (expand-file-name url (cadr base)))))) + (url-expand-file-name url (concat (car base) (cadr base)))))) (defun shr-ensure-newline () (unless (zerop (current-column)) === modified file 'lisp/net/tramp-adb.el' --- lisp/net/tramp-adb.el 2014-07-03 09:27:02 +0000 +++ lisp/net/tramp-adb.el 2014-08-28 01:59:29 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 2011-2014 Free Software Foundation, Inc. -;; Author: Juergen Hoetzel +;; Author: Jürgen Hötzel ;; Keywords: comm, processes ;; Package: tramp === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2014-08-20 15:33:10 +0000 +++ lisp/progmodes/python.el 2014-08-28 01:59:29 +0000 @@ -1905,7 +1905,7 @@ (let ((code-file (python-shell--save-temp-file code))) ;; Use `process-file' as it is remote-host friendly. (process-file - (executable-find python-shell-interpreter) + python-shell-interpreter code-file '(t nil) nil @@ -2061,11 +2061,14 @@ (or python-shell-virtualenv-path "") (mapconcat #'identity python-shell-exec-path ""))))) -(defun python-shell-parse-command () +(defun python-shell-parse-command () ;FIXME: why name it "parse"? "Calculate the string used to execute the inferior Python process." + ;; FIXME: process-environment doesn't seem to be used anywhere within + ;; this let. (let ((process-environment (python-shell-calculate-process-environment)) (exec-path (python-shell-calculate-exec-path))) (format "%s %s" + ;; FIXME: Why executable-find? (executable-find python-shell-interpreter) python-shell-interpreter-args))) @@ -2101,11 +2104,10 @@ (defun python-shell-calculate-exec-path () "Calculate exec path given `python-shell-virtualenv-path'." (let ((path (append python-shell-exec-path - exec-path nil))) + exec-path nil))) ;FIXME: Why nil? (if (not python-shell-virtualenv-path) path - (cons (format "%s/bin" - (directory-file-name python-shell-virtualenv-path)) + (cons (expand-file-name "bin" python-shell-virtualenv-path) path)))) (defvar python-shell--package-depth 10) === modified file 'lisp/simple.el' --- lisp/simple.el 2014-08-11 00:59:34 +0000 +++ lisp/simple.el 2014-08-28 01:59:29 +0000 @@ -374,6 +374,13 @@ ;; Making and deleting lines. +(defvar self-insert-uses-region-functions nil + "Special hook to tell if `self-insert-command' will use the region. +It must be called via `run-hook-with-args-until-success' with no arguments. +Any `post-self-insert-command' which consumes the region should +register a function on this hook so that things like `delete-selection-mode' +can refrain from consuming the region.") + (defvar hard-newline (propertize "\n" 'hard t 'rear-nonsticky '(hard)) "Propertized string representing a hard newline character.") === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2014-08-26 17:55:07 +0000 +++ msdos/ChangeLog 2014-08-28 01:59:29 +0000 @@ -1,3 +1,13 @@ +2014-08-28 Eli Zaretskii + + * sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan + Manuel Guerrero . + + * sed2v2.inp [DJGPP <= 2.03]: Add a prototype for snprintf, to + avoid compilation warning from newer GCC versions that have + snprintf as a built-in. Reported by Juan Manuel Guerrero + . + 2014-08-09 Eli Zaretskii * INSTALL: Fix last change. === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2014-08-15 04:34:06 +0000 +++ msdos/sed2v2.inp 2014-08-28 01:59:29 +0000 @@ -127,6 +127,8 @@ #define HAVE_SNPRINTF 1\ #else\ #undef HAVE_SNPRINTF\ +#include \ +extern int snprintf (char *__restrict, size_t, const char *__restrict, ...);\ #endif s/^#undef PENDING_OUTPUT_N_BYTES *$/#define PENDING_OUTPUT_N_BYTES fp->_ptr - fp->_base/ === modified file 'msdos/sedlibmk.inp' --- msdos/sedlibmk.inp 2014-04-16 13:27:28 +0000 +++ msdos/sedlibmk.inp 2014-08-25 17:44:27 +0000 @@ -315,6 +315,7 @@ /^BYTESWAP_H *=/s/@[^@\n]*@/byteswap.h/ /^DIRENT_H *=/s/@[^@\n]*@// /^ERRNO_H *=/s/@[^@\n]*@// +/^EXECINFO_H *=/s/@[^@\n]*@/execinfo.h/ /^STDBOOL_H *=/s/@[^@\n]*@// /^STDALIGN_H *=/s/@[^@\n]*@/stdalign.h/ /^STDARG_H *=/s/@[^@\n]*@// @@ -333,7 +334,7 @@ /am__append_[1-9][0-9]* *=.*gettext\.h/s/@[^@\n]*@/\#/ /am__append_2 *=.*verify\.h/s/@[^@\n]*@// /^@gl_GNULIB_ENABLED_tempname_TRUE@/s/@[^@\n]*@// -/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o/ +/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o execinfo.o/ /^am__append_[1-9][0-9]* *=/,/^[^ ]/{ s/ *inttypes\.h// s| *sys/select\.h|| === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-28 00:50:36 +0000 +++ src/ChangeLog 2014-08-28 01:59:29 +0000 @@ -1,3 +1,20 @@ +2014-08-28 Eli Zaretskii + + * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define. + + * indent.c (Fvertical_motion): Fix vertical motion up through a + display property after a newline. (Bug#18276) + + * xdisp.c (display_line): Don't assume that the call to + reseat_at_next_visible_line_start ends up at a character + immediately following the newline on the previous line. Avoids + setting the ends_at_zv_p flag on screen lines that are not at or + beyond ZV, which causes infloop in redisplay. For the details, see + http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00368.html. + + * dispnew.c (buffer_posn_from_coords): Fix mirroring of X + coordinate for hscrolled R2L screen lines. (Bug#18277) + 2014-08-28 Paul Eggert * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults === modified file 'src/conf_post.h' --- src/conf_post.h 2014-06-02 06:08:49 +0000 +++ src/conf_post.h 2014-08-28 01:59:29 +0000 @@ -123,13 +123,6 @@ so we could reuse it in readlinkat; see msdos.c. */ #define opendir sys_opendir -/* The "portable" definition of _GL_INLINE on config.h does not work - with DJGPP GCC 3.4.4: it causes unresolved externals in sysdep.c, - although lib/execinfo.h is included and the inline functions there - are visible. */ -#if __GNUC__ < 4 -# define _GL_EXECINFO_INLINE inline -#endif /* End of gnulib-related stuff. */ #define emacs_raise(sig) msdos_fatal_signal (sig) === modified file 'src/dispnew.c' --- src/dispnew.c 2014-08-10 08:26:28 +0000 +++ src/dispnew.c 2014-08-28 01:59:29 +0000 @@ -5143,9 +5143,8 @@ move_it_to (&it, -1, 0, *y, -1, MOVE_TO_X | MOVE_TO_Y); /* TO_X is the pixel position that the iterator will compute for the - glyph at *X. We add it.first_visible_x because iterator - positions include the hscroll. */ - to_x = x0 + it.first_visible_x; + glyph at *X. */ + to_x = x0; if (it.bidi_it.paragraph_dir == R2L) /* For lines in an R2L paragraph, we need to mirror TO_X wrt the text area. This is because the iterator, even in R2L @@ -5159,6 +5158,10 @@ it should be mirrored into zero pixel position.) */ to_x = window_box_width (w, TEXT_AREA) - to_x - 1; + /* We need to add it.first_visible_x because iterator positions + include the hscroll. */ + to_x += it.first_visible_x; + /* Now move horizontally in the row to the glyph under *X. Second argument is ZV to prevent move_it_in_display_line from matching based on buffer positions. */ === modified file 'src/indent.c' --- src/indent.c 2014-06-23 04:11:29 +0000 +++ src/indent.c 2014-08-28 01:59:29 +0000 @@ -2004,6 +2004,8 @@ int first_x; bool overshoot_handled = 0; bool disp_string_at_start_p = 0; + ptrdiff_t nlines = XINT (lines); + int vpos_init = 0; itdata = bidi_shelve_cache (); SET_TEXT_POS (pt, PT, PT_BYTE); @@ -2093,18 +2095,31 @@ overshoot_handled = 1; } - if (XINT (lines) <= 0) - { - it.vpos = 0; + else if (IT_CHARPOS (it) == PT - 1 + && FETCH_BYTE (PT - 1) == '\n' + && nlines < 0) + { + /* The position we started from was covered by a display + property, so we moved to position before the string, and + backed up one line, because the character at PT - 1 is a + newline. So we need one less line to go up. */ + nlines++; + /* But we still need to record that one line, in order to + return the correct value to the caller. */ + vpos_init = -1; + } + if (nlines <= 0) + { + it.vpos = vpos_init; /* Do this even if LINES is 0, so that we move back to the beginning of the current line as we ought. */ - if (XINT (lines) == 0 || IT_CHARPOS (it) > 0) - move_it_by_lines (&it, max (PTRDIFF_MIN, XINT (lines))); + if (nlines == 0 || IT_CHARPOS (it) > 0) + move_it_by_lines (&it, max (PTRDIFF_MIN, nlines)); } else if (overshoot_handled) { it.vpos = 0; - move_it_by_lines (&it, min (PTRDIFF_MAX, XINT (lines))); + move_it_by_lines (&it, min (PTRDIFF_MAX, nlines)); } else { @@ -2119,13 +2134,13 @@ it.vpos = 0; move_it_by_lines (&it, 1); } - if (XINT (lines) > 1) - move_it_by_lines (&it, min (PTRDIFF_MAX, XINT (lines) - 1)); + if (nlines > 1) + move_it_by_lines (&it, min (PTRDIFF_MAX, nlines - 1)); } else { it.vpos = 0; - move_it_by_lines (&it, min (PTRDIFF_MAX, XINT (lines))); + move_it_by_lines (&it, min (PTRDIFF_MAX, nlines)); } } === modified file 'src/xdisp.c' --- src/xdisp.c 2014-08-19 00:51:33 +0000 +++ src/xdisp.c 2014-08-28 01:59:29 +0000 @@ -3413,6 +3413,48 @@ if (it->selective_display_ellipsis_p) it->saved_face_id = it->face_id; + /* Here's the description of the semantics of, and the logic behind, + the various HANDLED_* statuses: + + HANDLED_NORMALLY means the handler did its job, and the loop + should proceed to calling the next handler in order. + + HANDLED_RECOMPUTE_PROPS means the handler caused a significant + change in the properties and overlays at current position, so the + loop should be restarted, to re-invoke the handlers that were + already called. This happens when fontification-functions were + called by handle_fontified_prop, and actually fontified + something. Another case where HANDLED_RECOMPUTE_PROPS is + returned is when we discover overlay strings that need to be + displayed right away. The loop below will continue for as long + as the status is HANDLED_RECOMPUTE_PROPS. + + HANDLED_RETURN means return immediately to the caller, to + continue iteration without calling any further handlers. This is + used when we need to act on some property right away, for example + when we need to display the ellipsis or a replacing display + property, such as display string or image. + + HANDLED_OVERLAY_STRING_CONSUMED means an overlay string was just + consumed, and the handler switched to the next overlay string. + This signals the loop below to refrain from looking for more + overlays before all the overlay strings of the current overlay + are processed. + + Some of the handlers called by the loop push the iterator state + onto the stack (see 'push_it'), and arrange for the iteration to + continue with another object, such as an image, a display string, + or an overlay string. In most such cases, it->stop_charpos is + set to the first character of the string, so that when the + iteration resumes, this function will immediately be called + again, to examine the properties at the beginning of the string. + + When a display or overlay string is exhausted, the iterator state + is popped (see 'pop_it'), and iteration continues with the + previous object. Again, in many such cases this function is + called again to find the next position where properties might + change. */ + do { handled = HANDLED_NORMALLY; @@ -20621,10 +20663,15 @@ row->truncated_on_right_p = 1; it->continuation_lines_width = 0; reseat_at_next_visible_line_start (it, 0); - if (IT_BYTEPOS (*it) <= BEG_BYTE) - row->ends_at_zv_p = true; + /* We insist below that IT's position be at ZV because in + bidi-reordered lines the character at visible line start + might not be the character that follows the newline in + the logical order. */ + if (IT_BYTEPOS (*it) > BEG_BYTE) + row->ends_at_zv_p = + IT_BYTEPOS (*it) >= ZV_BYTE && FETCH_BYTE (ZV_BYTE - 1) != '\n'; else - row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n'; + row->ends_at_zv_p = false; break; } } === modified file 'test/ChangeLog' --- test/ChangeLog 2014-08-13 19:17:21 +0000 +++ test/ChangeLog 2014-08-28 01:59:29 +0000 @@ -1,3 +1,8 @@ +2014-08-28 Glenn Morris + + * automated/python-tests.el (python-shell-calculate-exec-path-2): + Update test for today's python.el changes. + 2014-08-13 Jan Nieuwenhuizen * automated/compile-tests.el (compile--test-error-line): Grok FILE === modified file 'test/automated/python-tests.el' --- test/automated/python-tests.el 2014-07-21 14:41:19 +0000 +++ test/automated/python-tests.el 2014-08-18 19:15:06 +0000 @@ -1753,7 +1753,7 @@ "Test `python-shell-exec-path' modification." (let* ((original-exec-path exec-path) (python-shell-virtualenv-path - (directory-file-name user-emacs-directory)) + (directory-file-name (expand-file-name user-emacs-directory))) (exec-path (python-shell-calculate-exec-path))) (should (equal exec-path ------------------------------------------------------------ revno: 117754 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-08-27 18:55:45 -0700 message: * lisp/subr.el (remq): Revert 2014-08-25 doc change (not always true). See the interminable bug discussion if you have nothing better to do. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-27 10:51:21 +0000 +++ lisp/ChangeLog 2014-08-28 01:55:45 +0000 @@ -1,3 +1,7 @@ +2014-08-28 Glenn Morris + + * subr.el (remq): Revert 2014-08-25 doc change (not always true). + 2014-08-27 Dmitry Antipov * startup.el (normal-top-level): Now use internal--top-level-message. === modified file 'lisp/subr.el' --- lisp/subr.el 2014-08-25 03:16:36 +0000 +++ lisp/subr.el 2014-08-28 01:55:45 +0000 @@ -565,7 +565,7 @@ (delete elt (copy-sequence seq)))) (defun remq (elt list) - "Return a copy of LIST with all occurrences of ELT removed. + "Return LIST with all occurrences of ELT removed. The comparison is done with `eq'. Contrary to `delq', this does not use side-effects, and the argument LIST is not modified." (while (and (eq elt (car list)) (setq list (cdr list)))) ------------------------------------------------------------ revno: 117753 fixes bug: http://debbugs.gnu.org/18051 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-08-27 17:50:36 -0700 message: * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-27 19:40:54 +0000 +++ src/ChangeLog 2014-08-28 00:50:36 +0000 @@ -1,3 +1,8 @@ +2014-08-28 Paul Eggert + + * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults + (Bug#18051). + 2014-08-27 Eli Zaretskii * syntax.c (scan_lists): Don't examine positions before BEGV. === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-27 18:56:47 +0000 +++ src/sysdep.c 2014-08-28 00:50:36 +0000 @@ -3601,8 +3601,11 @@ # if defined HAVE_NEWLOCALE || defined HAVE_SETLOCALE # include -# else +# endif +# ifndef LC_COLLATE # define LC_COLLATE 0 +# endif +# ifndef LC_COLLATE_MASK # define LC_COLLATE_MASK 0 # endif # ifndef HAVE_NEWLOCALE ------------------------------------------------------------ revno: 117752 fixes bug: http://debbugs.gnu.org/18339 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2014-08-27 22:40:54 +0300 message: Fix bug #18339 with segfault when $ is typed into empty LaTeX buffer. src/syntax.c (scan_lists): Don't examine positions before BEGV. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-27 18:56:47 +0000 +++ src/ChangeLog 2014-08-27 19:40:54 +0000 @@ -1,3 +1,8 @@ +2014-08-27 Eli Zaretskii + + * syntax.c (scan_lists): Don't examine positions before BEGV. + (Bug#18339) + 2014-08-27 Paul Eggert Improve robustness of new string-collation code (Bug#18051). === modified file 'src/syntax.c' --- src/syntax.c 2014-07-09 23:39:58 +0000 +++ src/syntax.c 2014-08-27 19:40:54 +0000 @@ -2857,10 +2857,13 @@ case Smath: if (!sexpflag) break; - temp_pos = dec_bytepos (from_byte); - UPDATE_SYNTAX_TABLE_BACKWARD (from - 1); - if (from != stop && c == FETCH_CHAR_AS_MULTIBYTE (temp_pos)) - DEC_BOTH (from, from_byte); + if (from > BEGV) + { + temp_pos = dec_bytepos (from_byte); + UPDATE_SYNTAX_TABLE_BACKWARD (from - 1); + if (from != stop && c == FETCH_CHAR_AS_MULTIBYTE (temp_pos)) + DEC_BOTH (from, from_byte); + } if (mathexit) { mathexit = 0; ------------------------------------------------------------ revno: 117751 fixes bug: http://debbugs.gnu.org/18051 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-08-27 11:56:47 -0700 message: Improve robustness of new string-collation code. * configure.ac (newlocale): Check for this, not for uselocale. * src/sysdep.c (LC_COLLATE, LC_COLLATE_MASK, freelocale, locale_t) (newlocale, wcscoll_l): Define substitutes for platforms that lack them, so as to simplify the mainline code. (str_collate): Simplify the code by assuming the above definitions. Use wcscoll_l, not uselocale, as uselocale is too fragile. For example, the old version left the Emacs in the wrong locale if wcscoll reported an error. Use 'int', not ptrdiff_t, for the int result. Report an error if newlocale fails. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-26 14:42:06 +0000 +++ ChangeLog 2014-08-27 18:56:47 +0000 @@ -1,3 +1,8 @@ +2014-08-27 Paul Eggert + + Improve robustness of new string-collation code (Bug#18051). + * configure.ac (newlocale): Check for this, not for uselocale. + 2014-08-26 Dmitry Antipov Detect features needed to handle C stack overflows. === modified file 'configure.ac' --- configure.ac 2014-08-26 14:42:06 +0000 +++ configure.ac 2014-08-27 18:56:47 +0000 @@ -3558,7 +3558,7 @@ AC_CHECK_FUNCS(accept4 fchdir gethostname \ getrusage get_current_dir_name \ lrand48 random rint \ -select getpagesize setlocale uselocale \ +select getpagesize setlocale newlocale \ getrlimit setrlimit shutdown getaddrinfo \ pthread_sigmask strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-27 11:22:37 +0000 +++ src/ChangeLog 2014-08-27 18:56:47 +0000 @@ -1,3 +1,15 @@ +2014-08-27 Paul Eggert + + Improve robustness of new string-collation code (Bug#18051). + * sysdep.c (LC_COLLATE, LC_COLLATE_MASK, freelocale, locale_t) + (newlocale, wcscoll_l): Define substitutes for platforms that + lack them, so as to simplify the mainline code. + (str_collate): Simplify the code by assuming the above definitions. + Use wcscoll_l, not uselocale, as uselocale is too fragile. For + example, the old version left the Emacs in the wrong locale if + wcscoll reported an error. Use 'int', not ptrdiff_t, for the int + result. Report an error if newlocale fails. + 2014-08-27 Michael Albinus * lisp.h (str_collate): === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-27 11:22:37 +0000 +++ src/sysdep.c 2014-08-27 18:56:47 +0000 @@ -3599,24 +3599,89 @@ #ifdef __STDC_ISO_10646__ # include -# if defined HAVE_USELOCALE || defined HAVE_SETLOCALE +# if defined HAVE_NEWLOCALE || defined HAVE_SETLOCALE # include +# else +# define LC_COLLATE 0 +# define LC_COLLATE_MASK 0 # endif -# ifndef HAVE_SETLOCALE -# define setlocale(category, locale) ((char *) 0) +# ifndef HAVE_NEWLOCALE +# undef freelocale +# undef locale_t +# undef newlocale +# undef wcscoll_l +# define freelocale emacs_freelocale +# define locale_t emacs_locale_t +# define newlocale emacs_newlocale +# define wcscoll_l emacs_wcscoll_l + +typedef char const *locale_t; + +static locale_t +newlocale (int category_mask, char const *locale, locale_t loc) +{ + return locale; +} + +static void +freelocale (locale_t loc) +{ +} + +static char * +emacs_setlocale (int category, char const *locale) +{ +# ifdef HAVE_SETLOCALE + errno = 0; + char *loc = setlocale (category, locale); + if (loc || errno) + return loc; + errno = EINVAL; +# else + errno = ENOTSUP; +# endif + return 0; +} + +static int +wcscoll_l (wchar_t const *a, wchar_t const *b, locale_t loc) +{ + int result = 0; + char *oldloc = emacs_setlocale (LC_COLLATE, NULL); + int err; + + if (! oldloc) + err = errno; + else + { + USE_SAFE_ALLOCA; + char *oldcopy = SAFE_ALLOCA (strlen (oldloc) + 1); + strcpy (oldcopy, oldloc); + if (! emacs_setlocale (LC_COLLATE, loc)) + err = errno; + else + { + errno = 0; + result = wcscoll (a, b); + err = errno; + if (! emacs_setlocale (LC_COLLATE, oldcopy)) + err = errno; + } + SAFE_FREE (); + } + + errno = err; + return result; +} # endif int str_collate (Lisp_Object s1, Lisp_Object s2) { - ptrdiff_t res, len, i, i_byte; + int res, err; + ptrdiff_t len, i, i_byte; wchar_t *p1, *p2; Lisp_Object lc_collate; -# ifdef HAVE_USELOCALE - locale_t loc = 0, oldloc = 0; -# else - char *oldloc = NULL; -# endif USE_SAFE_ALLOCA; @@ -3633,44 +3698,28 @@ FETCH_STRING_CHAR_ADVANCE (*(p2+i-1), s2, i, i_byte); *(p2+len) = 0; - /* Create a new locale object, and set it. */ lc_collate = Fgetenv_internal (build_string ("LC_COLLATE"), Vprocess_environment); if (STRINGP (lc_collate)) { -#ifdef HAVE_USELOCALE - loc = newlocale (LC_COLLATE_MASK, SSDATA (lc_collate), 0); - if (loc) - oldloc = uselocale (loc); -#else - oldloc = setlocale (LC_COLLATE, NULL); - if (oldloc) - { - oldloc = xstrdup (oldloc); - setlocale (LC_COLLATE, SSDATA (lc_collate)); - } -#endif - } - - errno = 0; - res = wcscoll (p1, p2); - if (errno) - error ("Wrong argument: %s", strerror (errno)); - -#ifdef HAVE_USELOCALE - /* Free the locale object, and reset. */ - if (loc) - freelocale (loc); - if (oldloc) - uselocale (oldloc); -#else - /* Restore the original locale. */ - setlocale (LC_COLLATE, oldloc); - xfree (oldloc); -#endif - - /* Return result. */ + locale_t loc = newlocale (LC_COLLATE_MASK, SSDATA (lc_collate), 0); + if (!loc) + error ("Wrong locale: %s", strerror (errno)); + errno = 0; + res = wcscoll_l (p1, p2, loc); + err = errno; + freelocale (loc); + } + else + { + errno = 0; + res = wcscoll (p1, p2); + err = errno; + } + if (err) + error ("Wrong argument: %s", strerror (err)); + SAFE_FREE (); return res; } ------------------------------------------------------------ revno: 117750 committer: Michael Albinus branch nick: trunk timestamp: Wed 2014-08-27 13:22:37 +0200 message: * lisp.h (str_collate): * sysdep.c (str_collate): Return int. (str_collate) [__STDC_ISO_10646__]: Propagate error of wcscoll. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-27 10:51:21 +0000 +++ src/ChangeLog 2014-08-27 11:22:37 +0000 @@ -1,3 +1,9 @@ +2014-08-27 Michael Albinus + + * lisp.h (str_collate): + * sysdep.c (str_collate): Return int. + (str_collate) [__STDC_ISO_10646__]: Propagate error of wcscoll. + 2014-08-27 Dmitry Antipov Fix some glitches in previous change. === modified file 'src/lisp.h' --- src/lisp.h 2014-08-26 06:25:59 +0000 +++ src/lisp.h 2014-08-27 11:22:37 +0000 @@ -4298,7 +4298,7 @@ extern void unlock_file (Lisp_Object); extern void unlock_buffer (struct buffer *); extern void syms_of_filelock (void); -extern ptrdiff_t str_collate (Lisp_Object, Lisp_Object); +extern int str_collate (Lisp_Object, Lisp_Object); /* Defined in sound.c. */ extern void syms_of_sound (void); === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-27 04:15:20 +0000 +++ src/sysdep.c 2014-08-27 11:22:37 +0000 @@ -3606,7 +3606,7 @@ # define setlocale(category, locale) ((char *) 0) # endif -ptrdiff_t +int str_collate (Lisp_Object s1, Lisp_Object s2) { ptrdiff_t res, len, i, i_byte; @@ -3653,7 +3653,10 @@ #endif } + errno = 0; res = wcscoll (p1, p2); + if (errno) + error ("Wrong argument: %s", strerror (errno)); #ifdef HAVE_USELOCALE /* Free the locale object, and reset. */ @@ -3674,7 +3677,7 @@ #endif /* __STDC_ISO_10646__ */ #ifdef WINDOWSNT -ptrdiff_t +int str_collate (Lisp_Object s1, Lisp_Object s2) { Lisp_Object lc_collate = ------------------------------------------------------------ revno: 117749 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2014-08-27 14:51:21 +0400 message: * src/keyboard.c (Vtop_level_message): Rename to Vinternal__top_level_message, as suggested by Stefan Monnier in http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00493.html All related users changed. * lisp/startup.el (normal-top-level): Now use internal--top-level-message. * doc/lispref/eval.texi (Eval): Mention possible recovery from stack overflow. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-07-11 12:49:49 +0000 +++ doc/lispref/ChangeLog 2014-08-27 10:51:21 +0000 @@ -1,3 +1,7 @@ +2014-08-27 Dmitry Antipov + + * eval.texi (Eval): Mention possible recovery from stack overflow. + 2014-07-11 Eli Zaretskii * internals.texi (Garbage Collection): Fix last change. === modified file 'doc/lispref/eval.texi' --- doc/lispref/eval.texi 2014-01-01 07:43:34 +0000 +++ doc/lispref/eval.texi 2014-08-27 10:51:21 +0000 @@ -805,7 +805,12 @@ This limit, with the associated error when it is exceeded, is one way Emacs Lisp avoids infinite recursion on an ill-defined function. If you increase the value of @code{max-lisp-eval-depth} too much, such -code can cause stack overflow instead. +code can cause stack overflow instead. On some systems, this overflow +can be handled. In that case, normal Lisp evaluation is interrupted +and control is transferred back to the top level command loop +(@code{top-level}). Note that there is no way to enter Emacs Lisp +debugger in this situation. @xref{Error Debugging}. + @cindex Lisp nesting error The depth limit counts internal uses of @code{eval}, @code{apply}, and === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-26 17:55:07 +0000 +++ lisp/ChangeLog 2014-08-27 10:51:21 +0000 @@ -1,3 +1,7 @@ +2014-08-27 Dmitry Antipov + + * startup.el (normal-top-level): Now use internal--top-level-message. + 2014-08-26 Dmitry Antipov * startup.el (normal-top-level): Use top-level-message. === modified file 'lisp/startup.el' --- lisp/startup.el 2014-08-26 06:25:59 +0000 +++ lisp/startup.el 2014-08-27 10:51:21 +0000 @@ -497,7 +497,7 @@ reads the initialization files, etc. It is the default value of the variable `top-level'." (if command-line-processed - (message top-level-message) + (message internal--top-level-message) (setq command-line-processed t) ;; Look in each dir in load-path for a subdirs.el file. If we === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-27 04:15:20 +0000 +++ src/ChangeLog 2014-08-27 10:51:21 +0000 @@ -6,6 +6,10 @@ (handle_sigsegv): Check whether we really crash somewhere near to stack boundary, and handle fatal signal as usual if not. (init_sigsegv): Adjust accordingly. + * keyboard.c (Vtop_level_message): Rename to + Vinternal__top_level_message, as suggested by Stefan Monnier in + http://lists.gnu.org/archive/html/emacs-devel/2014-08/msg00493.html + All related users changed. 2014-08-26 Dmitry Antipov === modified file 'src/keyboard.c' --- src/keyboard.c 2014-08-27 04:15:20 +0000 +++ src/keyboard.c 2014-08-27 10:51:21 +0000 @@ -1153,10 +1153,10 @@ { /* Comes here from handle_sigsegv, see sysdep.c. */ init_eval (); - Vtop_level_message = recover_top_level_message; + Vinternal__top_level_message = recover_top_level_message; } else - Vtop_level_message = regular_top_level_message; + Vinternal__top_level_message = regular_top_level_message; #endif /* HAVE_STACK_OVERFLOW_HANDLING */ if (command_loop_level > 0 || minibuf_level > 0) { @@ -11029,9 +11029,9 @@ recover_top_level_message = build_pure_c_string ("Re-entering top level after C stack overflow"); #endif - DEFVAR_LISP ("top-level-message", Vtop_level_message, + DEFVAR_LISP ("internal--top-level-message", Vinternal__top_level_message, doc: /* Message displayed by `normal-top-level'. */); - Vtop_level_message = regular_top_level_message; + Vinternal__top_level_message = regular_top_level_message; /* Tool-bars. */ DEFSYM (QCimage, ":image"); ------------------------------------------------------------ revno: 117748 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2014-08-27 08:15:20 +0400 message: Fix some glitches in previous change. * sysdep.c (stack_direction): Replace stack_grows_down to simplify calculation of stack boundaries. (handle_sigsegv): Check whether we really crash somewhere near to stack boundary, and handle fatal signal as usual if not. (init_sigsegv): Adjust accordingly. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-26 17:55:07 +0000 +++ src/ChangeLog 2014-08-27 04:15:20 +0000 @@ -1,3 +1,12 @@ +2014-08-27 Dmitry Antipov + + Fix some glitches in previous change. + * sysdep.c (stack_direction): Replace stack_grows_down + to simplify calculation of stack boundaries. + (handle_sigsegv): Check whether we really crash somewhere near + to stack boundary, and handle fatal signal as usual if not. + (init_sigsegv): Adjust accordingly. + 2014-08-26 Dmitry Antipov Handle C stack overflow caused by too nested Lisp evaluation. === modified file 'src/keyboard.c' --- src/keyboard.c 2014-08-26 06:25:59 +0000 +++ src/keyboard.c 2014-08-27 04:15:20 +0000 @@ -11028,7 +11028,7 @@ #ifdef HAVE_STACK_OVERFLOW_HANDLING recover_top_level_message = build_pure_c_string ("Re-entering top level after C stack overflow"); -#endif +#endif DEFVAR_LISP ("top-level-message", Vtop_level_message, doc: /* Message displayed by `normal-top-level'. */); Vtop_level_message = regular_top_level_message; === modified file 'src/sysdep.c' --- src/sysdep.c 2014-08-26 08:01:48 +0000 +++ src/sysdep.c 2014-08-27 04:15:20 +0000 @@ -1720,9 +1720,9 @@ #ifdef HAVE_STACK_OVERFLOW_HANDLING -/* True if stack grows down as expected on most OS/ABI variants. */ +/* -1 if stack grows down as expected on most OS/ABI variants, 1 otherwise. */ -static bool stack_grows_down; +static int stack_direction; /* Alternate stack used by SIGSEGV handler below. */ @@ -1741,17 +1741,25 @@ if (!getrlimit (RLIMIT_STACK, &rlim)) { - enum { STACK_EXTRA = 16 * 1024 }; - char *fault_addr = (char *) siginfo->si_addr; - unsigned long used = (stack_grows_down - ? stack_bottom - fault_addr - : fault_addr - stack_bottom); + enum { STACK_DANGER_ZONE = 16 * 1024 }; + char *beg, *end, *addr; - if (used + STACK_EXTRA > rlim.rlim_cur) - /* Most likely this is it. */ + beg = stack_bottom; + end = stack_bottom + stack_direction * rlim.rlim_cur; + if (beg > end) + addr = beg, beg = end, end = addr; + addr = (char *) siginfo->si_addr; + /* If we're somewhere on stack and too close to + one of its boundaries, most likely this is it. */ + if (beg < addr && addr < end + && (addr - beg < STACK_DANGER_ZONE + || end - addr < STACK_DANGER_ZONE)) siglongjmp (return_to_command_loop, 1); } } + + /* Otherwise we can't do anything with this. */ + deliver_fatal_thread_signal (sig); } /* Return true if we have successfully set up SIGSEGV handler on alternate @@ -1763,7 +1771,7 @@ struct sigaction sa; stack_t ss; - stack_grows_down = ((char *) &ss < stack_bottom); + stack_direction = ((char *) &ss < stack_bottom) ? -1 : 1; ss.ss_sp = sigsegv_stack; ss.ss_size = sizeof (sigsegv_stack); ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.