Now on revision 109212. ------------------------------------------------------------ revno: 109212 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2012-07-26 09:23:25 +0400 message: Explicitly free restriction data that are not needed anymore. * editfns.c (save_restriction_restore): Free restriction data. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-26 01:27:33 +0000 +++ src/ChangeLog 2012-07-26 05:23:25 +0000 @@ -1,3 +1,8 @@ +2012-07-26 Dmitry Antipov + + Explicitly free restriction data that are not needed anymore. + * editfns.c (save_restriction_restore): Free restriction data. + 2012-07-26 Stefan Monnier * eval.c (Fautoload_do_load): Rename from do_autoload, export to Lisp, === modified file 'src/editfns.c' --- src/editfns.c 2012-07-17 07:43:01 +0000 +++ src/editfns.c 2012-07-26 05:23:25 +0000 @@ -3379,6 +3379,10 @@ buf->clip_changed = 1; /* Remember that the narrowing changed. */ } + /* These aren't needed anymore, so don't wait for GC. */ + free_marker (XCAR (data)); + free_marker (XCDR (data)); + free_cons (XCONS (data)); } else /* A buffer, which means that there was no old restriction. */ ------------------------------------------------------------ revno: 109211 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2012-07-25 21:29:24 -0400 message: * lisp/mouse.el (popup-menu): Fix last change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-26 01:27:33 +0000 +++ lisp/ChangeLog 2012-07-26 01:29:24 +0000 @@ -1,5 +1,9 @@ 2012-07-26 Stefan Monnier + * mouse.el (popup-menu): Fix last change. + +2012-07-26 Stefan Monnier + Autoload from Lisp with more care. Follow aliases when looking for function properties. * subr.el (autoloadp): New function. @@ -31,7 +35,6 @@ * emacs-lisp/byte-opt.el (byte-compile-inline-expand): * calc/calc.el (name): Use autoloadp & autoload-do-load. - 2012-07-25 Alp Aker * international/mule-cmds.el (ucs-insert): Mark it as an obsolete @@ -88,8 +91,8 @@ 2012-07-21 Leo Liu - * progmodes/cc-cmds.el (c-defun-name): Use - match-string-no-properties instead for consistency. + * progmodes/cc-cmds.el (c-defun-name): + Use match-string-no-properties instead for consistency. 2012-07-20 Leo Liu === modified file 'lisp/emacs-lisp/cl-loaddefs.el' --- lisp/emacs-lisp/cl-loaddefs.el 2012-07-17 12:58:25 +0000 +++ lisp/emacs-lisp/cl-loaddefs.el 2012-07-26 01:29:24 +0000 @@ -260,7 +260,7 @@ ;;;;;; cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase ;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when ;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp -;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "6b06545d8d17e8b902435f08be6ac0c2") +;;;;;; cl-gensym) "cl-macs" "cl-macs.el" "db390970b6e9bd057169b197d5189781") ;;; Generated autoloads from cl-macs.el (autoload 'cl-gensym "cl-macs" "\ === modified file 'lisp/mouse.el' --- lisp/mouse.el 2012-07-20 11:32:30 +0000 +++ lisp/mouse.el 2012-07-26 01:29:24 +0000 @@ -116,7 +116,7 @@ (setq position (cond ((eq position 'point) - (let* ((pp (posn-at-point pos window)) + (let* ((pp (posn-at-point)) (xy (posn-x-y pp))) (list (list (car xy) (cdr xy)) (posn-window pp)))) ((not position) ------------------------------------------------------------ revno: 109210 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2012-07-25 21:27:33 -0400 message: Autoload more carefully from Lisp. Follow aliases for function properties. * lisp/subr.el (autoloadp): New function. (symbol-file): Use it. (function-get): New function. * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Use function-get and autoload-do-load. * lisp/emacs-lisp/lisp-mode.el (lisp-font-lock-syntactic-face-function) (lisp-indent-function): * lisp/emacs-lisp/gv.el (gv-get): * lisp/emacs-lisp/edebug.el (get-edebug-spec, edebug-basic-spec): * lisp/emacs-lisp/byte-opt.el (byte-optimize-form): * lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-warn): * lisp/emacs-lisp/autoload.el (make-autoload, autoload-print-form): Use function-get. * lisp/emacs-lisp/cl.el: Don't propagate function properties any more. * src/eval.c (Fautoload_do_load): Rename from do_autoload, export to Lisp, add argument, tune behavior, and adjust all callers. * lisp/speedbar.el (speedbar-add-localized-speedbar-support): * lisp/emacs-lisp/disass.el (disassemble-internal): * lisp/desktop.el (desktop-load-file): * lisp/help-fns.el (help-function-arglist, find-lisp-object-file-name) (describe-function-1): * lisp/emacs-lisp/find-func.el (find-function-noselect): * lisp/emacs-lisp/elp.el (elp-instrument-function): * lisp/emacs-lisp/advice.el (ad-has-proper-definition): * lisp/apropos.el (apropos-safe-documentation, apropos-macrop): * lisp/emacs-lisp/debug.el (debug-on-entry): * lisp/emacs-lisp/cl-macs.el (cl-compiler-macroexpand): * lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand): * lisp/calc/calc.el (name): Use autoloadp & autoload-do-load. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-07-22 04:11:49 +0000 +++ etc/NEWS 2012-07-26 01:27:33 +0000 @@ -498,6 +498,10 @@ * Lisp changes in Emacs 24.2 +** New functions `autoloadp' and `autoload-do-load'. + +** `function-get' fetches the property of a function, following aliases. + ** `toggle-read-only' accepts a second argument specifying whether to print a message, if called from Lisp. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-25 23:11:23 +0000 +++ lisp/ChangeLog 2012-07-26 01:27:33 +0000 @@ -1,3 +1,37 @@ +2012-07-26 Stefan Monnier + + Autoload from Lisp with more care. Follow aliases when looking for + function properties. + * subr.el (autoloadp): New function. + (symbol-file): Use it. + (function-get): New function. + * emacs-lisp/macroexp.el (macroexp--expand-all): Use function-get and + autoload-do-load. + * emacs-lisp/lisp-mode.el (lisp-font-lock-syntactic-face-function) + (lisp-indent-function): + * emacs-lisp/gv.el (gv-get): + * emacs-lisp/edebug.el (get-edebug-spec, edebug-basic-spec): + * emacs-lisp/byte-opt.el (byte-optimize-form): + * emacs-lisp/bytecomp.el (byte-compile-arglist-warn): + * emacs-lisp/autoload.el (make-autoload, autoload-print-form): + Use function-get. + * emacs-lisp/cl.el: Don't propagate function properties any more. + + * speedbar.el (speedbar-add-localized-speedbar-support): + * emacs-lisp/disass.el (disassemble-internal): + * desktop.el (desktop-load-file): + * help-fns.el (help-function-arglist, find-lisp-object-file-name) + (describe-function-1): + * emacs-lisp/find-func.el (find-function-noselect): + * emacs-lisp/elp.el (elp-instrument-function): + * emacs-lisp/advice.el (ad-has-proper-definition): + * apropos.el (apropos-safe-documentation, apropos-macrop): + * emacs-lisp/debug.el (debug-on-entry): + * emacs-lisp/cl-macs.el (cl-compiler-macroexpand): + * emacs-lisp/byte-opt.el (byte-compile-inline-expand): + * calc/calc.el (name): Use autoloadp & autoload-do-load. + + 2012-07-25 Alp Aker * international/mule-cmds.el (ucs-insert): Mark it as an obsolete === modified file 'lisp/apropos.el' --- lisp/apropos.el 2012-07-10 11:51:54 +0000 +++ lisp/apropos.el 2012-07-26 01:27:33 +0000 @@ -980,7 +980,7 @@ (setq function (if (byte-code-function-p function) (if (> (length function) 4) (aref function 4)) - (if (eq (car-safe function) 'autoload) + (if (autoloadp function) (nth 2 function) (if (eq (car-safe function) 'lambda) (if (stringp (nth 2 function)) @@ -1114,7 +1114,7 @@ (consp (setq symbol (symbol-function symbol))) (or (eq (car symbol) 'macro) - (if (eq (car symbol) 'autoload) + (if (autoloadp symbol) (memq (nth 4 symbol) '(macro t)))))) === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2012-05-19 03:00:48 +0000 +++ lisp/calc/calc.el 2012-07-26 01:27:33 +0000 @@ -914,7 +914,7 @@ ;; Set up the autoloading linkage. (let ((name (and (fboundp 'calc-dispatch) - (eq (car-safe (symbol-function 'calc-dispatch)) 'autoload) + (autoloadp (symbol-function 'calc-dispatch)) (nth 1 (symbol-function 'calc-dispatch)))) (p load-path)) === modified file 'lisp/desktop.el' --- lisp/desktop.el 2012-06-21 07:25:56 +0000 +++ lisp/desktop.el 2012-07-26 01:27:33 +0000 @@ -1119,11 +1119,8 @@ (defun desktop-load-file (function) "Load the file where auto loaded FUNCTION is defined." - (when function - (let ((fcell (and (fboundp function) (symbol-function function)))) - (when (and (listp fcell) - (eq 'autoload (car fcell))) - (load (cadr fcell)))))) + (when (fboundp function) + (autoload-do-load (symbol-function function) function))) ;; ---------------------------------------------------------------------------- ;; Create a buffer, load its file, set its mode, ...; === modified file 'lisp/emacs-lisp/advice.el' --- lisp/emacs-lisp/advice.el 2012-02-10 15:50:11 +0000 +++ lisp/emacs-lisp/advice.el 2012-07-26 01:27:33 +0000 @@ -2542,7 +2542,7 @@ For that it has to be fbound with a non-autoload definition." (and (symbolp function) (fboundp function) - (not (eq (car-safe (symbol-function function)) 'autoload)))) + (not (autoloadp (symbol-function function))))) ;; The following two are necessary for the sake of packages such as ;; ange-ftp which redefine functions via fcell indirection: === modified file 'lisp/emacs-lisp/autoload.el' --- lisp/emacs-lisp/autoload.el 2012-07-10 11:51:54 +0000 +++ lisp/emacs-lisp/autoload.el 2012-07-26 01:27:33 +0000 @@ -163,23 +163,23 @@ ((or `define-generic-mode `define-derived-mode `define-compilation-mode) nil) (_ t))) - (body (nthcdr (or (get car 'doc-string-elt) 3) form)) + (body (nthcdr (or (function-get car 'doc-string-elt) 3) form)) (doc (if (stringp (car body)) (pop body)))) ;; Add the usage form at the end where describe-function-1 ;; can recover it. (when (listp args) (setq doc (help-add-fundoc-usage doc args))) ;; `define-generic-mode' quotes the name, so take care of that - (list 'autoload (if (listp name) name (list 'quote name)) - file doc - (or (and (memq car '(define-skeleton define-derived-mode - define-generic-mode - easy-mmode-define-global-mode - define-global-minor-mode - define-globalized-minor-mode - easy-mmode-define-minor-mode - define-minor-mode)) t) - (eq (car-safe (car body)) 'interactive)) - (if macrop (list 'quote 'macro) nil)))) + `(autoload ,(if (listp name) name (list 'quote name)) + ,file ,doc + ,(or (and (memq car '(define-skeleton define-derived-mode + define-generic-mode + easy-mmode-define-global-mode + define-global-minor-mode + define-globalized-minor-mode + easy-mmode-define-minor-mode + define-minor-mode)) t) + (eq (car-safe (car body)) 'interactive)) + ,(if macrop ''macro nil)))) ;; For defclass forms, use `eieio-defclass-autoload'. ((eq car 'defclass) @@ -277,7 +277,7 @@ ;; Symbols at the toplevel are meaningless. ((symbolp form) nil) (t - (let ((doc-string-elt (get (car-safe form) 'doc-string-elt)) + (let ((doc-string-elt (function-get (car-safe form) 'doc-string-elt)) (outbuf autoload-print-form-outbuf)) (if (and doc-string-elt (stringp (nth doc-string-elt form))) ;; We need to hack the printing because the @@ -356,7 +356,7 @@ "Insert the section-header line, which lists the file name and which functions are in it, etc." (insert generate-autoload-section-header) - (prin1 (list 'autoloads autoloads load-name file time) + (prin1 `(autoloads ,autoloads ,load-name ,file ,time) outbuf) (terpri outbuf) ;; Break that line at spaces, to avoid very long lines. === modified file 'lisp/emacs-lisp/byte-opt.el' --- lisp/emacs-lisp/byte-opt.el 2012-07-10 11:51:54 +0000 +++ lisp/emacs-lisp/byte-opt.el 2012-07-26 01:27:33 +0000 @@ -249,8 +249,8 @@ (let* ((name (car form)) (localfn (cdr (assq name byte-compile-function-environment))) (fn (or localfn (and (fboundp name) (symbol-function name))))) - (when (and (consp fn) (eq (car fn) 'autoload)) - (load (nth 1 fn)) + (when (autoloadp fn) + (autoload-do-load fn) (setq fn (or (and (fboundp name) (symbol-function name)) (cdr (assq name byte-compile-function-environment))))) (pcase fn @@ -586,10 +586,11 @@ (let (opt new) (if (and (consp form) (symbolp (car form)) - (or (and for-effect - ;; we don't have any of these yet, but we might. - (setq opt (get (car form) 'byte-for-effect-optimizer))) - (setq opt (get (car form) 'byte-optimizer))) + (or ;; (and for-effect + ;; ;; We don't have any of these yet, but we might. + ;; (setq opt (get (car form) + ;; 'byte-for-effect-optimizer))) + (setq opt (function-get (car form) 'byte-optimizer))) (not (eq form (setq new (funcall opt form))))) (progn ;; (if (equal form new) (error "bogus optimizer -- %s" opt)) === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2012-07-13 07:06:09 +0000 +++ lisp/emacs-lisp/bytecomp.el 2012-07-26 01:27:33 +0000 @@ -1355,7 +1355,7 @@ nums sig min max) (when calls (when (and (symbolp name) - (eq (get name 'byte-optimizer) + (eq (function-get name 'byte-optimizer) 'byte-compile-inline-expand)) (byte-compile-warn "defsubst `%s' was used before it was defined" name)) === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2012-07-17 12:58:25 +0000 +++ lisp/emacs-lisp/cl-macs.el 2012-07-26 01:27:33 +0000 @@ -2420,8 +2420,8 @@ (while (and (symbolp func) (not (setq handler (get func 'compiler-macro))) (fboundp func) - (or (not (eq (car-safe (symbol-function func)) 'autoload)) - (load (nth 1 (symbol-function func))))) + (or (not (autoloadp (symbol-function func))) + (autoload-do-load (symbol-function func) func))) (setq func (symbol-function func))) (and handler (not (eq form (setq form (apply handler form (cdr form)))))))) === modified file 'lisp/emacs-lisp/cl.el' --- lisp/emacs-lisp/cl.el 2012-07-13 18:15:22 +0000 +++ lisp/emacs-lisp/cl.el 2012-07-26 01:27:33 +0000 @@ -320,16 +320,7 @@ )) (let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun))) (intern (format "cl-%s" fun))))) - (defalias fun new) - ;; If `cl-foo' is declare inline, then make `foo' inline as well, and - ;; similarly. Same for edebug specifications, indent rules and - ;; doc-string position. - ;; FIXME: For most of them, we should instead follow aliases - ;; where applicable. - (dolist (prop '(byte-optimizer doc-string-elt edebug-form-spec - lisp-indent-function)) - (if (get new prop) - (put fun prop (get new prop)))))) + (defalias fun new))) ;;; Features provided a bit differently in Elisp. === modified file 'lisp/emacs-lisp/debug.el' --- lisp/emacs-lisp/debug.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/debug.el 2012-07-26 01:27:33 +0000 @@ -805,9 +805,9 @@ ,(interactive-form (symbol-function function)) (apply ',(symbol-function function) debug-on-entry-args))) - (when (eq (car-safe (symbol-function function)) 'autoload) + (when (autoloadp (symbol-function function)) ;; The function is autoloaded. Load its real definition. - (load (cadr (symbol-function function)) nil noninteractive nil t)) + (autoload-do-load (symbol-function function) function)) (when (or (not (consp (symbol-function function))) (and (eq (car (symbol-function function)) 'macro) (not (consp (cdr (symbol-function function)))))) === modified file 'lisp/emacs-lisp/disass.el' --- lisp/emacs-lisp/disass.el 2012-06-07 19:25:48 +0000 +++ lisp/emacs-lisp/disass.el 2012-07-26 01:27:33 +0000 @@ -80,14 +80,10 @@ obj (symbol-function obj))) (if (subrp obj) (error "Can't disassemble #" name)) - (when (and (listp obj) (eq (car obj) 'autoload)) - (load (nth 1 obj)) - (setq obj (symbol-function name))) - (if (eq (car-safe obj) 'macro) ;handle macros + (setq obj (autoload-do-load obj name)) + (if (eq (car-safe obj) 'macro) ;Handle macros. (setq macro t obj (cdr obj))) - (when (and (listp obj) (eq (car obj) 'closure)) - (error "Don't know how to compile an interpreted closure")) (if (and (listp obj) (eq (car obj) 'byte-code)) (setq obj (list 'lambda nil obj))) (if (and (listp obj) (not (eq (car obj) 'lambda))) === modified file 'lisp/emacs-lisp/edebug.el' --- lisp/emacs-lisp/edebug.el 2012-06-13 15:46:29 +0000 +++ lisp/emacs-lisp/edebug.el 2012-07-26 01:27:33 +0000 @@ -242,10 +242,13 @@ (defun get-edebug-spec (symbol) ;; Get the spec of symbol resolving all indirection. - (let ((edebug-form-spec (get symbol 'edebug-form-spec)) - indirect) - (while (and (symbolp edebug-form-spec) - (setq indirect (get edebug-form-spec 'edebug-form-spec))) + (let ((edebug-form-spec nil) + (indirect symbol)) + (while + (progn + (and (symbolp indirect) + (setq indirect + (function-get indirect 'edebug-form-spec 'autoload)))) ;; (edebug-trace "indirection: %s" edebug-form-spec) (setq edebug-form-spec indirect)) edebug-form-spec @@ -263,7 +266,7 @@ (setq spec (cdr spec))) t)) ((symbolp spec) - (unless (functionp spec) (get spec 'edebug-form-spec))))) + (unless (functionp spec) (function-get spec 'edebug-form-spec))))) ;;; Utilities === modified file 'lisp/emacs-lisp/elp.el' --- lisp/emacs-lisp/elp.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/elp.el 2012-07-26 01:27:33 +0000 @@ -258,7 +258,7 @@ ;; the autoload here, since that could have side effects, and ;; elp-instrument-function is similar (in my mind) to defun-ish ;; type functionality (i.e. it shouldn't execute the function). - (and (eq (car-safe funguts) 'autoload) + (and (autoloadp funguts) (error "ELP cannot profile autoloaded function: %s" funsym)) ;; We cannot profile functions used internally during profiling. (unless (elp-profilable-p funsym) === modified file 'lisp/emacs-lisp/find-func.el' --- lisp/emacs-lisp/find-func.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/find-func.el 2012-07-26 01:27:33 +0000 @@ -347,8 +347,7 @@ (if aliases (message "%s" aliases)) (let ((library - (cond ((eq (car-safe def) 'autoload) - (nth 1 def)) + (cond ((autoloadp def) (nth 1 def)) ((subrp def) (if lisp-only (error "%s is a built-in function" function)) === modified file 'lisp/emacs-lisp/gv.el' --- lisp/emacs-lisp/gv.el 2012-07-10 11:27:27 +0000 +++ lisp/emacs-lisp/gv.el 2012-07-26 01:27:33 +0000 @@ -84,14 +84,7 @@ (if (symbolp place) (funcall do place (lambda (v) `(setq ,place ,v))) (let* ((head (car place)) - (gf (get head 'gv-expander))) - ;; Autoload the head, if applicable, since that might define - ;; `gv-expander'. - (when (and (null gf) (fboundp head) - (eq 'autoload (car-safe (symbol-function head)))) - (with-demoted-errors - (load (nth 1 (symbol-function head)) 'noerror 'nomsg) - (setq gf (get head 'gv-expander)))) + (gf (function-get head 'gv-expander 'autoload))) (if gf (apply gf do (cdr place)) (let ((me (macroexpand place ;FIXME: expand one step at a time! ;; (append macroexpand-all-environment === modified file 'lisp/emacs-lisp/lisp-mode.el' --- lisp/emacs-lisp/lisp-mode.el 2012-06-27 21:15:13 +0000 +++ lisp/emacs-lisp/lisp-mode.el 2012-07-26 01:27:33 +0000 @@ -158,7 +158,8 @@ (goto-char listbeg) (and (looking-at "([ \t\n]*\\(\\(\\sw\\|\\s_\\)+\\)") (match-string 1))))) - (docelt (and firstsym (get (intern-soft firstsym) + (docelt (and firstsym + (function-get (intern-soft firstsym) lisp-doc-string-elt-property)))) (if (and docelt ;; It's a string in a form that can have a docstring. @@ -1135,7 +1136,8 @@ (let ((function (buffer-substring (point) (progn (forward-sexp 1) (point)))) method) - (setq method (or (get (intern-soft function) 'lisp-indent-function) + (setq method (or (function-get (intern-soft function) + 'lisp-indent-function) (get (intern-soft function) 'lisp-indent-hook))) (cond ((or (eq method 'defun) (and (null method) === modified file 'lisp/emacs-lisp/macroexp.el' --- lisp/emacs-lisp/macroexp.el 2012-07-17 08:15:06 +0000 +++ lisp/emacs-lisp/macroexp.el 2012-07-26 01:27:33 +0000 @@ -185,12 +185,7 @@ ;; Macro expand compiler macros. This cannot be delayed to ;; byte-optimize-form because the output of the compiler-macro can ;; use macros. - (let ((handler nil)) - (while (and (symbolp func) - (not (setq handler (get func 'compiler-macro))) - (fboundp func)) - ;; Follow the sequence of aliases. - (setq func (symbol-function func))) + (let ((handler (function-get func 'compiler-macro))) (if (null handler) ;; No compiler macro. We just expand each argument (for ;; setq/setq-default this works alright because the variable names @@ -198,12 +193,9 @@ (macroexp--all-forms form 1) ;; If the handler is not loaded yet, try (auto)loading the ;; function itself, which may in turn load the handler. - (when (and (not (functionp handler)) - (fboundp func) (eq (car-safe (symbol-function func)) - 'autoload)) + (unless (functionp handler) (ignore-errors - (load (nth 1 (symbol-function func)) - 'noerror 'nomsg))) + (autoload-do-load (indirect-function func) func))) (let ((newform (macroexp--compiler-macro handler form))) (if (eq form newform) ;; The compiler macro did not find anything to do. === modified file 'lisp/emacs-lisp/pcase.el' --- lisp/emacs-lisp/pcase.el 2012-07-11 23:13:41 +0000 +++ lisp/emacs-lisp/pcase.el 2012-07-26 01:27:33 +0000 @@ -114,7 +114,8 @@ PRED can take the form FUNCTION in which case it gets called with one argument. - (FUN ARG1 .. ARGN) in which case it gets called with N+1 arguments. + (FUN ARG1 .. ARGN) in which case it gets called with an N+1'th argument + which is the value being matched. A PRED of the form FUNCTION is equivalent to one of the form (FUNCTION). PRED patterns can refer to variables bound earlier in the pattern. E.g. you can match pairs where the cdr is larger than the car with a pattern === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2012-07-13 14:25:59 +0000 +++ lisp/help-fns.el 2012-07-26 01:27:33 +0000 @@ -150,7 +150,7 @@ arglist))) (unless (zerop rest) (push '&rest arglist) (push 'rest arglist)) (nreverse arglist)))) - ((and (eq (car-safe def) 'autoload) (not (eq (nth 4 def) 'keymap))) + ((and (autoloadp def) (not (eq (nth 4 def) 'keymap))) "[Arg list not available until function definition is loaded.]") (t t))) @@ -288,7 +288,7 @@ found via `load-path'. The return value can also be `C-source', which means that OBJECT is a function or variable defined in C. If no suitable file is found, return nil." - (let* ((autoloaded (eq (car-safe type) 'autoload)) + (let* ((autoloaded (autoloadp type)) (file-name (or (and autoloaded (nth 1 type)) (symbol-file object (if (memq type (list 'defvar 'defface)) @@ -468,7 +468,7 @@ (concat beg "Lisp macro")) ((eq (car-safe def) 'closure) (concat beg "Lisp closure")) - ((eq (car-safe def) 'autoload) + ((autoloadp def) (format "%s autoloaded %s" (if (commandp def) "an interactive" "an") (if (eq (nth 4 def) 'keymap) "keymap" @@ -563,7 +563,7 @@ ;; If the function is autoloaded, and its docstring has ;; key substitution constructs, load the library. (doc (progn - (and (eq (car-safe real-def) 'autoload) + (and (autoloadp real-def) help-enable-auto-load (string-match "\\([^\\]=\\|[^=]\\|\\`\\)\\\\[[{<]" doc-raw) === modified file 'lisp/speedbar.el' --- lisp/speedbar.el 2012-06-08 16:39:49 +0000 +++ lisp/speedbar.el 2012-07-26 01:27:33 +0000 @@ -1864,9 +1864,7 @@ ;; If it is autoloaded, we need to load it now so that ;; we have access to the variable -speedbar-menu-items. ;; Is this XEmacs safe? - (let ((sf (symbol-function v))) - (if (and (listp sf) (eq (car sf) 'autoload)) - (load-library (car (cdr sf))))) + (autoload-do-load (symbol-function v) v) (setq speedbar-special-mode-expansion-list (list v)) (setq v (intern-soft (concat ms "-speedbar-key-map"))) (if (not v) === modified file 'lisp/subr.el' --- lisp/subr.el 2012-07-25 09:34:48 +0000 +++ lisp/subr.el 2012-07-26 01:27:33 +0000 @@ -1691,6 +1691,23 @@ ;;; Load history +(defsubst autoloadp (object) + "Non-nil if OBJECT is an autoload." + (eq 'autoload (car-safe object))) + +;; (defun autoload-type (object) +;; "Returns the type of OBJECT or `function' or `command' if the type is nil. +;; OBJECT should be an autoload object." +;; (when (autoloadp object) +;; (let ((type (nth 3 object))) +;; (cond ((null type) (if (nth 2 object) 'command 'function)) +;; ((eq 'keymap t) 'macro) +;; (type))))) + +;; (defalias 'autoload-file #'cadr +;; "Return the name of the file from which AUTOLOAD will be loaded. +;; \n\(fn AUTOLOAD)") + (defun symbol-file (symbol &optional type) "Return the name of the file that defined SYMBOL. The value is normally an absolute file name. It can also be nil, @@ -1703,7 +1720,7 @@ definition, variable definition, or face definition only." (if (and (or (null type) (eq type 'defun)) (symbolp symbol) (fboundp symbol) - (eq 'autoload (car-safe (symbol-function symbol)))) + (autoloadp (symbol-function symbol))) (nth 1 (symbol-function symbol)) (let ((files load-history) file) @@ -2752,6 +2769,20 @@ form." (secure-hash 'sha1 object start end binary)) +(defun function-get (f prop &optional autoload) + "Return the value of property PROP of function F. +If AUTOLOAD is non-nil and F is an autoloaded macro, try to autoload +the macro in the hope that it will set PROP." + (let ((val nil)) + (while (and (symbolp f) + (null (setq val (get f prop))) + (fboundp f)) + (let ((fundef (symbol-function f))) + (if (and autoload (autoloadp fundef) + (not (equal fundef (autoload-do-load fundef f 'macro)))) + nil ;Re-try `get' on the same `f'. + (setq f fundef)))) + val)) ;;;; Support for yanking and text properties. === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-25 22:47:42 +0000 +++ src/ChangeLog 2012-07-26 01:27:33 +0000 @@ -1,3 +1,8 @@ +2012-07-26 Stefan Monnier + + * eval.c (Fautoload_do_load): Rename from do_autoload, export to Lisp, + add argument, tune behavior, and adjust all callers. + 2012-07-25 Paul Eggert Use typedef for EMACS_INT, EMACS_UINT. === modified file 'src/data.c' --- src/data.c 2012-07-19 22:35:58 +0000 +++ src/data.c 2012-07-26 01:27:33 +0000 @@ -761,7 +761,7 @@ { struct gcpro gcpro1; GCPRO1 (cmd); - do_autoload (fun, cmd); + Fautoload_do_load (fun, cmd, Qnil); UNGCPRO; return Finteractive_form (cmd); } @@ -2059,7 +2059,7 @@ return Qnil; } -/* Extract and set vector and string elements */ +/* Extract and set vector and string elements. */ DEFUN ("aref", Faref, Saref, 2, 2, 0, doc: /* Return the element of ARRAY at index IDX. === modified file 'src/eval.c' --- src/eval.c 2012-07-20 05:28:00 +0000 +++ src/eval.c 2012-07-26 01:27:33 +0000 @@ -988,26 +988,14 @@ { /* SYM is not mentioned in ENVIRONMENT. Look at its function definition. */ + struct gcpro gcpro1; + GCPRO1 (form); + def = Fautoload_do_load (def, sym, Qmacro); + UNGCPRO; if (EQ (def, Qunbound) || !CONSP (def)) /* Not defined or definition not suitable. */ break; - if (EQ (XCAR (def), Qautoload)) - { - /* Autoloading function: will it be a macro when loaded? */ - tem = Fnth (make_number (4), def); - if (EQ (tem, Qt) || EQ (tem, Qmacro)) - /* Yes, load it and try again. */ - { - struct gcpro gcpro1; - GCPRO1 (form); - do_autoload (def, sym); - UNGCPRO; - continue; - } - else - break; - } - else if (!EQ (XCAR (def), Qmacro)) + if (!EQ (XCAR (def), Qmacro)) break; else expander = XCDR (def); } @@ -1952,22 +1940,35 @@ FUNNAME is the symbol which is the function's name. FUNDEF is the autoload definition (a list). */ -void -do_autoload (Lisp_Object fundef, Lisp_Object funname) +DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0, + doc: /* Load FUNDEF which should be an autoload. +If non-nil, FUNNAME should be the symbol whose function value is FUNDEF, +in which case the function returns the new autoloaded function value. +If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if +it is defines a macro. */) + (Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only) { ptrdiff_t count = SPECPDL_INDEX (); - Lisp_Object fun; struct gcpro gcpro1, gcpro2, gcpro3; + if (!CONSP (fundef) || !EQ (Qautoload, XCAR (fundef))) + return fundef; + + if (EQ (macro_only, Qmacro)) + { + Lisp_Object kind = Fnth (make_number (4), fundef); + if (! (EQ (kind, Qt) || EQ (kind, Qmacro))) + return fundef; + } + /* This is to make sure that loadup.el gives a clear picture of what files are preloaded and when. */ if (! NILP (Vpurify_flag)) error ("Attempt to autoload %s while preparing to dump", SDATA (SYMBOL_NAME (funname))); - fun = funname; CHECK_SYMBOL (funname); - GCPRO3 (fun, funname, fundef); + GCPRO3 (funname, fundef, macro_only); /* Preserve the match data. */ record_unwind_save_match_data (); @@ -1982,18 +1983,28 @@ The value saved here is to be restored into Vautoload_queue. */ record_unwind_protect (un_autoload, Vautoload_queue); Vautoload_queue = Qt; - Fload (Fcar (Fcdr (fundef)), Qnil, Qt, Qnil, Qt); + /* If `macro_only', assume this autoload to be a "best-effort", + so don't signal an error if autoloading fails. */ + Fload (Fcar (Fcdr (fundef)), macro_only, Qt, Qnil, Qt); /* Once loading finishes, don't undo it. */ Vautoload_queue = Qt; unbind_to (count, Qnil); - fun = Findirect_function (fun, Qnil); - - if (!NILP (Fequal (fun, fundef))) - error ("Autoloading failed to define function %s", - SDATA (SYMBOL_NAME (funname))); UNGCPRO; + + if (NILP (funname)) + return Qnil; + else + { + Lisp_Object fun = Findirect_function (funname, Qnil); + + if (!NILP (Fequal (fun, fundef))) + error ("Autoloading failed to define function %s", + SDATA (SYMBOL_NAME (funname))); + else + return fun; + } } @@ -2200,7 +2211,7 @@ xsignal1 (Qinvalid_function, original_fun); if (EQ (funcar, Qautoload)) { - do_autoload (fun, original_fun); + Fautoload_do_load (fun, original_fun, Qnil); goto retry; } if (EQ (funcar, Qmacro)) @@ -2729,7 +2740,6 @@ ptrdiff_t i; QUIT; - maybe_gc (); if (++lisp_eval_depth > max_lisp_eval_depth) { @@ -2742,10 +2752,13 @@ backtrace.next = backtrace_list; backtrace_list = &backtrace; backtrace.function = &args[0]; - backtrace.args = &args[1]; + backtrace.args = &args[1]; /* This also GCPROs them. */ backtrace.nargs = nargs - 1; backtrace.debug_on_exit = 0; + /* Call GC after setting up the backtrace, so the latter GCPROs the args. */ + maybe_gc (); + if (debug_on_next_call) do_debug_on_call (Qlambda); @@ -2857,7 +2870,7 @@ val = funcall_lambda (fun, numargs, args + 1); else if (EQ (funcar, Qautoload)) { - do_autoload (fun, original_fun); + Fautoload_do_load (fun, original_fun, Qnil); CHECK_CONS_LIST (); goto retry; } @@ -3582,6 +3595,7 @@ defsubr (&Scalled_interactively_p); defsubr (&Scommandp); defsubr (&Sautoload); + defsubr (&Sautoload_do_load); defsubr (&Seval); defsubr (&Sapply); defsubr (&Sfuncall); === modified file 'src/keyboard.c' --- src/keyboard.c 2012-07-21 14:11:33 +0000 +++ src/keyboard.c 2012-07-26 01:27:33 +0000 @@ -8827,18 +8827,12 @@ next = access_keymap (map, key, 1, 0, 1); - /* Handle symbol with autoload definition. */ - if (SYMBOLP (next) && !NILP (Ffboundp (next)) - && CONSP (XSYMBOL (next)->function) - && EQ (XCAR (XSYMBOL (next)->function), Qautoload)) - do_autoload (XSYMBOL (next)->function, next); - /* Handle a symbol whose function definition is a keymap or an array. */ if (SYMBOLP (next) && !NILP (Ffboundp (next)) && (ARRAYP (XSYMBOL (next)->function) || KEYMAPP (XSYMBOL (next)->function))) - next = XSYMBOL (next)->function; + next = Fautoload_do_load (XSYMBOL (next)->function, next, Qnil); /* If the keymap gives a function, not an array, then call the function with one arg and use @@ -10282,7 +10276,7 @@ struct gcpro gcpro1, gcpro2; GCPRO2 (cmd, prefixarg); - do_autoload (final, cmd); + Fautoload_do_load (final, cmd, Qnil); UNGCPRO; } else === modified file 'src/keymap.c' --- src/keymap.c 2012-07-15 07:57:54 +0000 +++ src/keymap.c 2012-07-26 01:27:33 +0000 @@ -225,7 +225,7 @@ Fdefine_key should cause keymaps to be autoloaded. This function can GC when AUTOLOAD is non-zero, because it calls - do_autoload which can GC. */ + Fautoload_do_load which can GC. */ Lisp_Object get_keymap (Lisp_Object object, int error_if_not_keymap, int autoload) @@ -259,7 +259,7 @@ struct gcpro gcpro1, gcpro2; GCPRO2 (tem, object); - do_autoload (tem, object); + Fautoload_do_load (tem, object, Qnil); UNGCPRO; goto autoload_retry; === modified file 'src/lisp.h' --- src/lisp.h 2012-07-25 22:47:42 +0000 +++ src/lisp.h 2012-07-26 01:27:33 +0000 @@ -2822,7 +2822,6 @@ extern _Noreturn void error (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2); extern _Noreturn void verror (const char *, va_list) ATTRIBUTE_FORMAT_PRINTF (1, 0); -extern void do_autoload (Lisp_Object, Lisp_Object); extern Lisp_Object un_autoload (Lisp_Object); extern void init_eval_once (void); extern Lisp_Object safe_call (ptrdiff_t, Lisp_Object *); @@ -2834,7 +2833,7 @@ #endif extern void syms_of_eval (void); -/* Defined in editfns.c */ +/* Defined in editfns.c. */ extern Lisp_Object Qfield; extern void insert1 (Lisp_Object); extern Lisp_Object format2 (const char *, Lisp_Object, Lisp_Object); @@ -2851,7 +2850,7 @@ extern void syms_of_editfns (void); extern void set_time_zone_rule (const char *); -/* Defined in buffer.c */ +/* Defined in buffer.c. */ extern int mouse_face_overlay_overlaps (Lisp_Object); extern _Noreturn void nsberror (Lisp_Object); extern void adjust_overlays_for_insert (ptrdiff_t, ptrdiff_t); @@ -2870,7 +2869,7 @@ extern void syms_of_buffer (void); extern void keys_of_buffer (void); -/* Defined in marker.c */ +/* Defined in marker.c. */ extern ptrdiff_t marker_position (Lisp_Object); extern ptrdiff_t marker_byte_position (Lisp_Object); ------------------------------------------------------------ revno: 109209 committer: Alp Aker branch nick: trunk timestamp: Wed 2012-07-25 19:11:23 -0400 message: * international/mule-cmds.el (ucs-insert): Mark it as an obsolete function, not an obsolete variable (Bug#12046). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-25 10:46:59 +0000 +++ lisp/ChangeLog 2012-07-25 23:11:23 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Alp Aker + + * international/mule-cmds.el (ucs-insert): Mark it as an obsolete + function, not an obsolete variable (Bug#12046). + 2012-07-25 Andreas Schwab * faces.el (face-spec-reset-face): Fix last change. (Bug#12042) === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2012-07-17 04:17:23 +0000 +++ lisp/international/mule-cmds.el 2012-07-25 23:11:23 +0000 @@ -2954,7 +2954,7 @@ (t (cdr (assoc-string input (ucs-names) t)))))) -(define-obsolete-variable-alias 'ucs-insert 'insert-char "24.2") +(define-obsolete-function-alias 'ucs-insert 'insert-char "24.2") (define-key ctl-x-map "8\r" 'insert-char) ;;; mule-cmds.el ends here ------------------------------------------------------------ revno: 109208 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-07-25 15:47:42 -0700 message: Use typedef for EMACS_INT, EMACS_UINT. * lisp.h, s/ms-w32.h (EMACS_INT, EMACS_UINT): Use typedefs rather than macros. This simplifies debugging in the usual case, since it lets GDB show addresses as 'EMACS_INT *' rather than 'long int *' and it allows expressions involving EMACS_INT casts. * .gdbinit (xreload): Simplify by using EMACS_INT cast. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2012-06-14 04:02:35 +0000 +++ src/.gdbinit 2012-07-25 22:47:42 +0000 @@ -1190,9 +1190,7 @@ define xreload set $tagmask = ((1 << gdb_gctypebits) - 1) - # The consing_since_gc business widens the 1 to EMACS_INT, - # a symbol not directly visible to GDB. - set $valmask = gdb_use_lsb ? ~($tagmask) : ((consing_since_gc - consing_since_gc + 1) << gdb_valbits) - 1 + set $valmask = gdb_use_lsb ? ~($tagmask) : ((EMACS_INT) 1 << gdb_valbits) - 1 end document xreload When starting Emacs a second time in the same gdb session under === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-25 17:31:34 +0000 +++ src/ChangeLog 2012-07-25 22:47:42 +0000 @@ -1,3 +1,12 @@ +2012-07-25 Paul Eggert + + Use typedef for EMACS_INT, EMACS_UINT. + * lisp.h, s/ms-w32.h (EMACS_INT, EMACS_UINT): Use typedefs rather + than macros. This simplifies debugging in the usual case, since + it lets GDB show addresses as 'EMACS_INT *' rather than 'long int *' + and it allows expressions involving EMACS_INT casts. + * .gdbinit (xreload): Simplify by using EMACS_INT cast. + 2012-07-25 Jan Dj辰rv * nsterm.m (ns_read_socket): Return early if there is a modal === modified file 'src/lisp.h' --- src/lisp.h 2012-07-24 06:45:44 +0000 +++ src/lisp.h 2012-07-25 22:47:42 +0000 @@ -45,22 +45,24 @@ EMACS_INT_MAX - maximum value of EMACS_INT; can be used in #if pI - printf length modifier for EMACS_INT EMACS_UINT - unsigned variant of EMACS_INT */ -#ifndef EMACS_INT +#ifndef EMACS_INT_MAX # if LONG_MAX < LLONG_MAX && defined WIDE_EMACS_INT -# define EMACS_INT long long +typedef long long int EMACS_INT; +typedef unsigned long long int EMACS_UINT; # define EMACS_INT_MAX LLONG_MAX # define pI "ll" # elif INT_MAX < LONG_MAX -# define EMACS_INT long +typedef long int EMACS_INT; +typedef unsigned long int EMACS_UINT; # define EMACS_INT_MAX LONG_MAX # define pI "l" # else -# define EMACS_INT int +typedef int EMACS_INT; +typedef unsigned int EMACS_UINT; # define EMACS_INT_MAX INT_MAX # define pI "" # endif #endif -#define EMACS_UINT unsigned EMACS_INT /* Number of bits in some machine integer types. */ enum === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2012-07-14 02:26:31 +0000 +++ src/s/ms-w32.h 2012-07-25 22:47:42 +0000 @@ -388,7 +388,8 @@ # ifdef WIDE_EMACS_INT /* Use pre-C99-style 64-bit integers. */ -# define EMACS_INT __int64 +typedef __int64 EMACS_INT; +typedef unsigned __int64 EMACS_UINT; # define EMACS_INT_MAX _I64_MAX # define pI "I64" ------------------------------------------------------------ revno: 109207 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2012-07-25 22:10:37 +0000 message: gnus-art.el (gnus-kill-sticky-article-buffers): Reintroduce diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-07-25 03:22:25 +0000 +++ lisp/gnus/ChangeLog 2012-07-25 22:10:37 +0000 @@ -1,3 +1,7 @@ +2012-07-25 Julien Danjou + + * gnus-art.el (gnus-kill-sticky-article-buffers): Reintroduce. + 2012-07-25 Katsumi Yamaoka * nnimap.el (nnimap-get-responses): Don't remove, still used. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2012-07-24 22:17:17 +0000 +++ lisp/gnus/gnus-art.el 2012-07-25 22:10:37 +0000 @@ -4775,6 +4775,18 @@ (when (eq major-mode 'gnus-sticky-article-mode) (gnus-kill-buffer buffer)))) +(defun gnus-kill-sticky-article-buffers (arg) + "Kill all sticky article buffers. +If a prefix ARG is given, ask for confirmation." + (interactive "P") + (dolist (buf (gnus-buffers)) + (with-current-buffer buf + (when (eq major-mode 'gnus-sticky-article-mode) + (if (not arg) + (gnus-kill-buffer buf) + (when (yes-or-no-p (concat "Kill buffer " (buffer-name buf) "? ")) + (gnus-kill-buffer buf))))))) + ;;; ;;; Gnus MIME viewing functions ;;; ------------------------------------------------------------ revno: 109206 fixes bug(s): http://debbugs.gnu.org/12043 committer: Jan D. branch nick: trunk timestamp: Wed 2012-07-25 19:31:34 +0200 message: * nsterm.m (ns_read_socket): Return early if there is a modal window. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-25 09:34:48 +0000 +++ src/ChangeLog 2012-07-25 17:31:34 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Jan Dj辰rv + + * nsterm.m (ns_read_socket): Return early if there is a modal + window (Bug#12043). + 2012-07-25 Martin Rudalics * frame.c (Fredirect_frame_focus): In doc-string don't mention === modified file 'src/nsterm.m' --- src/nsterm.m 2012-07-21 12:10:49 +0000 +++ src/nsterm.m 2012-07-25 17:31:34 +0000 @@ -3411,6 +3411,9 @@ /* NSTRACE (ns_read_socket); */ + if ([NSApp modalWindow] != nil) + return -1; + if (interrupt_input_blocked) { interrupt_input_pending = 1; ------------------------------------------------------------ revno: 109205 committer: Andreas Schwab branch nick: emacs timestamp: Wed 2012-07-25 12:46:59 +0200 message: Fixes: debbugs:12042 * faces.el (face-spec-reset-face): Fix last change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-25 09:43:12 +0000 +++ lisp/ChangeLog 2012-07-25 10:46:59 +0000 @@ -1,3 +1,7 @@ +2012-07-25 Andreas Schwab + + * faces.el (face-spec-reset-face): Fix last change. (Bug#12042) + 2012-07-25 Christopher Schmidt * emacs-lisp/pp.el (pp-display-expression): Select old selected === modified file 'lisp/faces.el' --- lisp/faces.el 2012-07-18 14:00:09 +0000 +++ lisp/faces.el 2012-07-25 10:46:59 +0000 @@ -1547,14 +1547,14 @@ ;; temacs, prior to loading frame.el. (unless (and (fboundp 'display-graphic-p) (display-graphic-p frame)) - '(:family "default" :foundry "default" :width normal + `(:family "default" :foundry "default" :width normal :height 1 :weight normal :slant normal - :foreground (if (frame-parameter nil 'reverse) - "unspecified-bg" - "unspecified-fg") - :background (if (frame-parameter nil 'reverse) - "unspecified-fg" - "unspecified-bg")))) + :foreground ,(if (frame-parameter nil 'reverse) + "unspecified-bg" + "unspecified-fg") + :background ,(if (frame-parameter nil 'reverse) + "unspecified-fg" + "unspecified-bg")))) ;; For all other faces, unspecify all attributes. (apply 'append (mapcar (lambda (x) (list (car x) 'unspecified)) ------------------------------------------------------------ revno: 109204 author: Christopher Schmidt committer: martin rudalics branch nick: trunk timestamp: Wed 2012-07-25 11:43:12 +0200 message: In pp-display-expression select old selected window only if it is still live (Bug#12034). * emacs-lisp/pp.el (pp-display-expression): Select old selected window only if it is still live (Bug#12034). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-25 09:34:48 +0000 +++ lisp/ChangeLog 2012-07-25 09:43:12 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Christopher Schmidt + + * emacs-lisp/pp.el (pp-display-expression): Select old selected + window only if it is still live (Bug#12034). + 2012-07-25 Martin Rudalics * subr.el (redirect-frame-focus): Add advertised calling === modified file 'lisp/emacs-lisp/pp.el' --- lisp/emacs-lisp/pp.el 2012-02-05 02:09:35 +0000 +++ lisp/emacs-lisp/pp.el 2012-07-25 09:43:12 +0000 @@ -110,7 +110,8 @@ (progn (select-window window) (run-hooks 'temp-buffer-show-hook)) - (select-window old-selected) + (when (window-live-p old-selected) + (select-window old-selected)) (message "See buffer %s." out-buffer-name))) (message "%s" (buffer-substring (point-min) (point))) )))))) ------------------------------------------------------------ revno: 109203 committer: martin rudalics branch nick: trunk timestamp: Wed 2012-07-25 11:34:48 +0200 message: Add advertised calling convention for redirect-frame-focus (Bug#12030). * frame.c (Fredirect_frame_focus): In doc-string don't mention that FOCUS-FRAME can be omitted. * subr.el (redirect-frame-focus): Add advertised calling convention (Bug#12030). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-25 05:48:19 +0000 +++ lisp/ChangeLog 2012-07-25 09:34:48 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Martin Rudalics + + * subr.el (redirect-frame-focus): Add advertised calling + convention (Bug#12030). + 2012-07-25 Paul Eggert Prefer typical American spelling for "acknowledgment". @@ -570,7 +575,7 @@ 2012-07-06 Dmitry Gutov * window.el (quit-window): Always restore window height when - it's saved in quit-restore parameter. + it's saved in quit-restore parameter (Bug#11810). 2012-07-06 Glenn Morris === modified file 'lisp/subr.el' --- lisp/subr.el 2012-07-19 06:24:04 +0000 +++ lisp/subr.el 2012-07-25 09:34:48 +0000 @@ -1184,6 +1184,7 @@ (set-advertised-calling-convention 'all-completions '(string collection &optional predicate) "23.1") (set-advertised-calling-convention 'unintern '(name obarray) "23.3") +(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.2") ;;;; Obsolescence declarations for variables, and aliases. === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-25 05:09:02 +0000 +++ src/ChangeLog 2012-07-25 09:34:48 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Martin Rudalics + + * frame.c (Fredirect_frame_focus): In doc-string don't mention + that FOCUS-FRAME can be omitted. + 2012-07-25 Dmitry Antipov Adjust buffer text indirection counters at the end of Fkill_buffer. === modified file 'src/frame.c' --- src/frame.c 2012-07-20 07:29:04 +0000 +++ src/frame.c 2012-07-25 09:34:48 +0000 @@ -1874,8 +1874,8 @@ request a switch to FOCUS-FRAME, and `last-event-frame' will be FOCUS-FRAME after reading an event typed at FRAME. -If FOCUS-FRAME is omitted or nil, any existing redirection is -canceled, and the frame again receives its own keystrokes. +If FOCUS-FRAME is nil, any existing redirection is canceled, and the +frame again receives its own keystrokes. Focus redirection is useful for temporarily redirecting keystrokes to a surrogate minibuffer frame when a frame doesn't have its own ------------------------------------------------------------ revno: 109202 committer: Paul Eggert branch nick: trunk timestamp: Tue 2012-07-24 22:48:19 -0700 message: Prefer typical American spelling for "acknowledgment". diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2012-02-07 06:34:52 +0000 +++ admin/notes/bugtracker 2012-07-25 05:48:19 +0000 @@ -125,7 +125,7 @@ The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases. -** To not get acknowledgement mail from the tracker, +** To not get acknowledgment mail from the tracker, add an "X-Debbugs-No-Ack:" header (with any value). If you use Gnus, you can add an element to gnus-posting-styles to do this automatically, eg: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-07-21 14:48:17 +0000 +++ doc/lispref/ChangeLog 2012-07-25 05:48:19 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Paul Eggert + + Prefer typical American spelling for "acknowledgment". + * intro.texi (Acknowledgments): Rename from Acknowledgements. + 2012-07-21 Eli Zaretskii * commands.texi (Special Events): Mention language-change event. === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2012-07-06 04:25:04 +0000 +++ doc/lispref/elisp.texi 2012-07-25 05:48:19 +0000 @@ -254,7 +254,7 @@ * Lisp History:: Emacs Lisp is descended from Maclisp. * Conventions:: How the manual is formatted. * Version Info:: Which Emacs version is running? -* Acknowledgements:: The authors, editors, and sponsors of this manual. +* Acknowledgments:: The authors, editors, and sponsors of this manual. Conventions === modified file 'doc/lispref/intro.texi' --- doc/lispref/intro.texi 2012-07-06 07:48:10 +0000 +++ doc/lispref/intro.texi 2012-07-25 05:48:19 +0000 @@ -44,7 +44,7 @@ * Lisp History:: Emacs Lisp is descended from Maclisp. * Conventions:: How the manual is formatted. * Version Info:: Which Emacs version is running? -* Acknowledgements:: The authors, editors, and sponsors of this manual. +* Acknowledgments:: The authors, editors, and sponsors of this manual. @end menu @node Caveats @@ -523,8 +523,8 @@ 23.1, the value is 1. @end defvar -@node Acknowledgements -@section Acknowledgements +@node Acknowledgments +@section Acknowledgments This manual was originally written by Robert Krawitz, Bil Lewis, Dan LaLiberte, Richard@tie{}M. Stallman and Chris Welty, the volunteers of === modified file 'doc/lispref/spellfile' --- doc/lispref/spellfile 2011-12-19 06:21:24 +0000 +++ doc/lispref/spellfile 2012-07-25 05:48:19 +0000 @@ -1,6 +1,5 @@ ARPA Abbrev -Acknowledgements Alan Arnold Autoloading === modified file 'doc/man/emacs.1' --- doc/man/emacs.1 2012-06-10 13:20:58 +0000 +++ doc/man/emacs.1 2012-07-25 05:48:19 +0000 @@ -634,7 +634,7 @@ .SH AUTHORS .I Emacs was written by Richard Stallman and the Free Software Foundation. -For detailed credits and acknowledgements, see the GNU Emacs manual. +For detailed credits and acknowledgments, see the GNU Emacs manual. . . . === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-07-14 02:08:32 +0000 +++ doc/misc/ChangeLog 2012-07-25 05:48:19 +0000 @@ -1,3 +1,12 @@ +2012-07-25 Paul Eggert + + Prefer typical American spelling for "acknowledgment". + * calc.texi (History and Acknowledgments): Rename from + History and Acknowledgements. + * idlwave.texi (Acknowledgments): + * ses.texi (Acknowledgments): + * woman.texi (Acknowledgments): Rename from Acknowledgements. + 2012-07-09 Paul Eggert Rename configure.in to configure.ac (Bug#11603). === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2012-05-28 23:35:09 +0000 +++ doc/misc/calc.texi 2012-07-25 05:48:19 +0000 @@ -218,7 +218,7 @@ * Notations Used in This Manual:: * Demonstration of Calc:: * Using Calc:: -* History and Acknowledgements:: +* History and Acknowledgments:: @end menu @node What is Calc, About This Manual, Getting Started, Getting Started @@ -582,7 +582,7 @@ Press @key{DEL} repeatedly to remove any leftover results from the stack. To exit from Calc, press @kbd{q} or @kbd{C-x * c} again. -@node Using Calc, History and Acknowledgements, Demonstration of Calc, Getting Started +@node Using Calc, History and Acknowledgments, Demonstration of Calc, Getting Started @section Using Calc @noindent @@ -1148,8 +1148,8 @@ its initial state: Empty stack, and initial mode settings. @end table -@node History and Acknowledgements, , Using Calc, Getting Started -@section History and Acknowledgements +@node History and Acknowledgments, , Using Calc, Getting Started +@section History and Acknowledgments @noindent Calc was originally started as a two-week project to occupy a lull @@ -27779,7 +27779,7 @@ input units. If you want to disallow using inconsistent units, you can set the customizable variable -@code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, +@code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, if you request units which are inconsistent with the original units, you will be warned about it and no conversion will occur. @@ -35597,15 +35597,15 @@ @end defvar @defvar calc-ensure-consistent-units -When converting units, the variable @code{calc-ensure-consistent-units} -determines whether or not the target units need to be consistent with the +When converting units, the variable @code{calc-ensure-consistent-units} +determines whether or not the target units need to be consistent with the original units. If @code{calc-ensure-consistent-units} is @code{nil}, then -the target units don't need to have the same dimensions as the original units; -for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. -If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units -need to have the same dimensions as the original units; for example, converting -@samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} -have different dimensions. The default value of @code{calc-ensure-consistent-units} +the target units don't need to have the same dimensions as the original units; +for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. +If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units +need to have the same dimensions as the original units; for example, converting +@samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} +have different dimensions. The default value of @code{calc-ensure-consistent-units} is @code{nil}. @end defvar === modified file 'doc/misc/idlwave.texi' --- doc/misc/idlwave.texi 2012-02-28 08:17:21 +0000 +++ doc/misc/idlwave.texi 2012-07-25 05:48:19 +0000 @@ -71,7 +71,7 @@ * Getting Started:: Tutorial * The IDLWAVE Major Mode:: The mode for editing IDL programs * The IDLWAVE Shell:: The mode for running IDL as an inferior program -* Acknowledgements:: Who did what +* Acknowledgments:: Who did what * Sources of Routine Info:: How does IDLWAVE know about routine XYZ * HTML Help Browser Tips:: * Configuration Examples:: The user is king @@ -2361,7 +2361,7 @@ Normal hook. Executed when @file{idlwave.el} is loaded. @end defopt -@node The IDLWAVE Shell, Acknowledgements, The IDLWAVE Major Mode, Top +@node The IDLWAVE Shell, Acknowledgments, The IDLWAVE Major Mode, Top @chapter The IDLWAVE Shell @cindex IDLWAVE shell @cindex Major mode, @code{idlwave-shell-mode} @@ -3273,9 +3273,9 @@ (three underscores) are replaced by the indicated expression. @end defopt -@node Acknowledgements, Sources of Routine Info, The IDLWAVE Shell, Top -@chapter Acknowledgements -@cindex Acknowledgements +@node Acknowledgments, Sources of Routine Info, The IDLWAVE Shell, Top +@chapter Acknowledgments +@cindex Acknowledgments @cindex Maintainer, of IDLWAVE @cindex Authors, of IDLWAVE @cindex Contributors, to IDLWAVE @@ -3352,7 +3352,7 @@ @noindent Thanks to everyone! -@node Sources of Routine Info, HTML Help Browser Tips, Acknowledgements, Top +@node Sources of Routine Info, HTML Help Browser Tips, Acknowledgments, Top @appendix Sources of Routine Info @cindex Sources of routine information === modified file 'doc/misc/sc.texi' --- doc/misc/sc.texi 2012-06-10 13:20:58 +0000 +++ doc/misc/sc.texi 2012-07-25 05:48:19 +0000 @@ -221,7 +221,7 @@ @cindex nested citations @cindex citation -A @dfn{citation} is the acknowledgement of the original author of a mail +A @dfn{citation} is the acknowledgment of the original author of a mail message in the body of the reply. There are two basic citation styles which Supercite supports. The first, called @dfn{nested citations} is an anonymous form of citation; in other words, an indication is made === modified file 'doc/misc/ses.texi' --- doc/misc/ses.texi 2012-01-19 07:21:25 +0000 +++ doc/misc/ses.texi 2012-07-25 05:48:19 +0000 @@ -71,7 +71,7 @@ * Advanced Features:: Want to know more? * For Gurus:: Want to know @emph{even more}? * Index:: Concept, Function and Variable Index -* Acknowledgements:: Acknowledgements +* Acknowledgments:: Acknowledgments * GNU Free Documentation License:: The license for this documentation. @end menu @@ -927,15 +927,15 @@ @end table @c =================================================================== -@node Index, Acknowledgements, For Gurus, Top +@node Index, Acknowledgments, For Gurus, Top @unnumbered Index @printindex cp @c =================================================================== -@node Acknowledgements, GNU Free Documentation License, Index, Top -@chapter Acknowledgements +@node Acknowledgments, GNU Free Documentation License, Index, Top +@chapter Acknowledgments Coding by: @quotation @@ -976,7 +976,7 @@ @c =================================================================== -@node GNU Free Documentation License, , Acknowledgements, Top +@node GNU Free Documentation License, , Acknowledgments, Top @appendix GNU Free Documentation License @include doclicense.texi === modified file 'doc/misc/woman.texi' --- doc/misc/woman.texi 2012-02-29 08:11:23 +0000 +++ doc/misc/woman.texi 2012-07-25 05:48:19 +0000 @@ -94,7 +94,7 @@ * Log:: The *WoMan-Log* Buffer * Technical:: Technical Details * Bugs:: Reporting Bugs -* Acknowledgements:: Acknowledgements +* Acknowledgments:: Acknowledgments * GNU Free Documentation License:: The license for this documentation. * Command Index:: Command Index * Variable Index:: Variable Index @@ -1306,7 +1306,7 @@ @c =================================================================== -@node Bugs, Acknowledgements, Technical, Top +@node Bugs, Acknowledgments, Technical, Top @comment node-name, next, previous, up @chapter Reporting Bugs @cindex reporting bugs @@ -1331,10 +1331,10 @@ @c =================================================================== -@node Acknowledgements, GNU Free Documentation License, Bugs, Top +@node Acknowledgments, GNU Free Documentation License, Bugs, Top @comment node-name, next, previous, up -@chapter Acknowledgements -@cindex acknowledgements +@chapter Acknowledgments +@cindex acknowledgments For Heather, Kathryn and Madelyn, the women in my life (although they will probably never use it)! @@ -1388,7 +1388,7 @@ @page -@node GNU Free Documentation License, Command Index, Acknowledgements, Top +@node GNU Free Documentation License, Command Index, Acknowledgments, Top @appendix GNU Free Documentation License @include doclicense.texi === modified file 'leim/SKK-DIC/SKK-JISYO.L' --- leim/SKK-DIC/SKK-JISYO.L 2011-06-12 10:37:40 +0000 +++ leim/SKK-DIC/SKK-JISYO.L 2012-07-25 05:48:19 +0000 @@ -34,7 +34,7 @@ ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;; -;; ACKNOWLEDGEMENT +;; ACKNOWLEDGMENT ;; ;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学 ;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作 === modified file 'leim/ja-dic/ja-dic.el' --- leim/ja-dic/ja-dic.el 2011-02-26 09:48:22 +0000 +++ leim/ja-dic/ja-dic.el 2012-07-25 05:48:19 +0000 @@ -47,7 +47,7 @@ ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;; -;; ACKNOWLEDGEMENT +;; ACKNOWLEDGMENT ;; ;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学 ;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-25 02:38:36 +0000 +++ lisp/ChangeLog 2012-07-25 05:48:19 +0000 @@ -1,3 +1,9 @@ +2012-07-25 Paul Eggert + + Prefer typical American spelling for "acknowledgment". + * vc/add-log.el (change-log-acknowledgment): Rename from + change-log-acknowledgement, with an alias for the old name. + 2012-07-25 Jay Belanger * calc-alg.el (math-simplify-divide): Don't cross multiply === modified file 'lisp/completion.el' --- lisp/completion.el 2012-05-04 23:16:47 +0000 +++ lisp/completion.el 2012-07-25 05:48:19 +0000 @@ -228,7 +228,7 @@ ;; superior to that of the LISPM version. ;; ;;----------------------------------------------- -;; Acknowledgements +;; Acknowledgments ;;----------------------------------------------- ;; Cliff Lasser (cal@think.com), Kevin Herbert (kph@cisco.com), ;; eero@media-lab, kgk@cs.brown.edu, jla@ai.mit.edu, === modified file 'lisp/emulation/cua-rect.el' --- lisp/emulation/cua-rect.el 2012-04-19 17:20:26 +0000 +++ lisp/emulation/cua-rect.el 2012-07-25 05:48:19 +0000 @@ -21,7 +21,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;;; Acknowledgements +;;; Acknowledgments ;; The rectangle handling and display code borrows from the standard ;; GNU emacs rect.el package and the rect-mark.el package by Rick === modified file 'lisp/emulation/viper.el' --- lisp/emulation/viper.el 2012-04-09 13:05:48 +0000 +++ lisp/emulation/viper.el 2012-07-25 05:48:19 +0000 @@ -103,8 +103,8 @@ ;; (require 'viper) ;; -;;; Acknowledgements: -;; ----------------- +;;; Acknowledgments: +;; ---------------- ;; Bug reports and ideas contributed by many users have helped ;; improve Viper and the various versions of VIP. ;; See the on-line manual for a complete list of contributors. === modified file 'lisp/hippie-exp.el' --- lisp/hippie-exp.el 2012-01-19 07:21:25 +0000 +++ lisp/hippie-exp.el 2012-07-25 05:48:19 +0000 @@ -156,7 +156,7 @@ ;; opposite situation to occur, that `hippie-expand' misses some ;; suggestion because it thinks it has already tried it. ;; -;; Acknowledgement +;; Acknowledgment ;; ;; I want to thank Mikael Djurfeldt in discussions with whom the idea ;; of this function took form. === modified file 'lisp/ido.el' --- lisp/ido.el 2012-06-20 15:51:34 +0000 +++ lisp/ido.el 2012-07-25 05:48:19 +0000 @@ -279,7 +279,7 @@ ;; can be used by other packages to read a buffer name, a file name, ;; or a directory name in the `ido' way. -;;; Acknowledgements +;;; Acknowledgments ;; Infinite amounts of gratitude goes to Stephen Eglen ;; who wrote iswitch-buffer mode - from which I ripped off 99% of the code === modified file 'lisp/iswitchb.el' --- lisp/iswitchb.el 2012-05-04 06:02:23 +0000 +++ lisp/iswitchb.el 2012-07-25 05:48:19 +0000 @@ -233,7 +233,7 @@ ;;; TODO -;;; Acknowledgements +;;; Acknowledgments ;; Thanks to Jari Aalto for help with the ;; first version of this package, iswitch-buffer. Thanks also to many === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2012-06-06 18:13:09 +0000 +++ lisp/mail/emacsbug.el 2012-07-25 05:48:19 +0000 @@ -212,7 +212,7 @@ (insert ". Please check that the From: line contains a valid email address. After a delay of up -to one day, you should receive an acknowledgement at that address. +to one day, you should receive an acknowledgment at that address. Please write in English if possible, as the Emacs maintainers usually do not have translators for other languages.\n\n"))) === modified file 'lisp/mail/mspools.el' --- lisp/mail/mspools.el 2012-04-09 13:05:48 +0000 +++ lisp/mail/mspools.el 2012-07-25 05:48:19 +0000 @@ -83,7 +83,7 @@ ;; Useful settings for VM ;; vm-auto-get-new-mail should be t (the default). -;; Acknowledgements +;; Acknowledgments ;; Thanks to jond@mitre.org (Jonathan Doughty) for help with code for ;; setting up vm-spool-files. === modified file 'lisp/mail/rfc2368.el' --- lisp/mail/rfc2368.el 2012-01-19 07:21:25 +0000 +++ lisp/mail/rfc2368.el 2012-07-25 05:48:19 +0000 @@ -33,7 +33,7 @@ ;; ;; this is intended as a replacement for mailto.el ;; -;; acknowledgements: +;; acknowledgments: ;; ;; the functions that deal w/ unhexifying in this file were basically ;; taken from w3 -- i hope to replace them w/ something else soon OR === modified file 'lisp/progmodes/cmacexp.el' --- lisp/progmodes/cmacexp.el 2012-04-09 13:05:48 +0000 +++ lisp/progmodes/cmacexp.el 2012-07-25 05:48:19 +0000 @@ -80,7 +80,7 @@ ;; making comments visible in the expansion. ;; - All work is done in core memory, no need for temporary files. -;; ACKNOWLEDGEMENTS ================================================== +;; ACKNOWLEDGMENTS =================================================== ;; A lot of thanks to Don Maszle who did a great work of testing, bug ;; reporting and suggestion of new features. This work has been === modified file 'lisp/progmodes/ebnf-yac.el' --- lisp/progmodes/ebnf-yac.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/ebnf-yac.el 2012-07-25 05:48:19 +0000 @@ -73,8 +73,8 @@ ;; example: this_is_a_valid.name, Another_EXAMPLE, mIxEd.CaSe. ;; ;; -;; Acknowledgements -;; ---------------- +;; Acknowledgments +;; --------------- ;; ;; Thanks to Matthew K. Junker for the suggestion to deal ;; with %right, %left and %prec pragmas. His suggestion was extended to deal === modified file 'lisp/progmodes/ebnf2ps.el' --- lisp/progmodes/ebnf2ps.el 2012-04-22 13:58:00 +0000 +++ lisp/progmodes/ebnf2ps.el 2012-07-25 05:48:19 +0000 @@ -1128,8 +1128,8 @@ ;; . Optimizations... ;; ;; -;; Acknowledgements -;; ---------------- +;; Acknowledgments +;; --------------- ;; ;; Thanks to Eli Zaretskii for some doc fixes. ;; === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2012-06-02 10:56:09 +0000 +++ lisp/progmodes/vhdl-mode.el 2012-07-25 05:48:19 +0000 @@ -102,7 +102,7 @@ ;; VHDL Mode distribution. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Acknowledgements +;; Acknowledgments ;; Electrification ideas by Bob Pack ;; and Steve Grout. @@ -4499,7 +4499,7 @@ (mra) architecture is selected. If another architecture is desired, it can be marked as most-recently-analyzed (speedbar menu) before generating the configuration. - + Note: Configurations of subcomponents (i.e. hierarchical configuration declarations) are currently not considered when displaying configurations in speedbar. @@ -6979,7 +6979,7 @@ (save-excursion (goto-char new) (eq new (progn (back-to-indentation) (point))))) - (setq placeholder new))) + (setq placeholder new))) (vhdl-add-syntax 'statement-cont placeholder) (if begin-after-ip (vhdl-add-syntax 'block-open))) === modified file 'lisp/vc/add-log.el' --- lisp/vc/add-log.el 2012-04-09 13:05:48 +0000 +++ lisp/vc/add-log.el 2012-07-25 05:48:19 +0000 @@ -223,13 +223,15 @@ (define-obsolete-face-alias 'change-log-function-face 'change-log-function "22.1") -(defface change-log-acknowledgement +(defface change-log-acknowledgment '((t (:inherit font-lock-comment-face))) "Face for highlighting acknowledgments." :version "21.1" :group 'change-log) +(define-obsolete-face-alias 'change-log-acknowledgement + 'change-log-acknowledgment "24.2") (define-obsolete-face-alias 'change-log-acknowledgement-face - 'change-log-acknowledgement "22.1") + 'change-log-acknowledgment "22.1") (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)") (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*") @@ -271,14 +273,14 @@ ;; Function of change. ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function)) ;; - ;; Acknowledgements. + ;; Acknowledgments. ;; Don't include plain "From" because that is vague; ;; we want to encourage people to say something more specific. ;; Note that the FSF does not use "Patches by"; our convention ;; is to put the name of the author of the changes at the top ;; of the change log entry. ("\\(^\\( +\\|\t\\)\\| \\)\\(Thanks to\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" - 3 'change-log-acknowledgement)) + 3 'change-log-acknowledgment)) "Additional expressions to highlight in Change Log mode.") (defun change-log-search-file-name (where) === modified file 'lisp/vc/ediff.el' --- lisp/vc/ediff.el 2012-07-16 10:19:56 +0000 +++ lisp/vc/ediff.el 2012-07-25 05:48:19 +0000 @@ -101,7 +101,7 @@ ;; and on any buffer. -;;; Acknowledgements: +;;; Acknowledgments: ;; Ediff was inspired by Dale R. Worley's emerge.el. ;; Ediff would not have been possible without the help and encouragement of === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2012-07-19 14:38:01 +0000 +++ lisp/vc/vc-git.el 2012-07-25 05:48:19 +0000 @@ -772,7 +772,7 @@ (list (cons (nth 1 vc-git-root-log-format) (nth 2 vc-git-root-log-format))) (append - `((,log-view-message-re (1 'change-log-acknowledgement))) + `((,log-view-message-re (1 'change-log-acknowledgment))) ;; Handle the case: ;; user: foo@bar '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" @@ -788,8 +788,8 @@ (1 'change-log-name) (2 'change-log-email)) ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" - (1 'change-log-acknowledgement) - (2 'change-log-acknowledgement)) + (1 'change-log-acknowledgment) + (2 'change-log-acknowledgment)) ("^Date: \\(.+\\)" (1 'change-log-date)) ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2012-06-08 16:39:49 +0000 +++ lisp/whitespace.el 2012-07-25 05:48:19 +0000 @@ -309,8 +309,8 @@ ;; buffer is visited or written. ;; ;; -;; Acknowledgements -;; ---------------- +;; Acknowledgments +;; --------------- ;; ;; Thanks to felix (EmacsWiki) for keeping highlight when switching between ;; major modes on a file. === modified file 'lisp/windmove.el' --- lisp/windmove.el 2012-01-21 10:02:34 +0000 +++ lisp/windmove.el 2012-07-25 05:48:19 +0000 @@ -118,7 +118,7 @@ ;; (setq windmove-window-distance-delta 2) ;; -;; Acknowledgements: +;; Acknowledgments: ;; ;; Special thanks to Julian Assange (proff@iq.org), whose ;; change-windows-intuitively.el predates Windmove, and provided the === modified file 'lisp/woman.el' --- lisp/woman.el 2012-07-11 23:13:41 +0000 +++ lisp/woman.el 2012-07-25 05:48:19 +0000 @@ -368,8 +368,8 @@ ;; http://cm.bell-labs.com/7thEdMan/ -;; Acknowledgements -;; ================ +;; Acknowledgments +;; =============== ;; For Heather, Kathryn and Madelyn, the women in my life ;; (although they will probably never use it)!