Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103907. ------------------------------------------------------------ revno: 103907 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-04-13 21:16:11 -0300 message: * lisp/minibuffer.el (completion-in-region-mode-predicate) (completion-in-region-mode--predicate): New vars. (completion-in-region, completion-in-region--postch) (completion-in-region-mode): Use them. (completion--capf-wrapper): Also return the hook function. (completion-at-point, completion-help-at-point): Adjust and provide a predicate. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-13 17:56:47 +0000 +++ lisp/ChangeLog 2011-04-14 00:16:11 +0000 @@ -1,4 +1,12 @@ -2011-04-13 Stefan Monnier +2011-04-14 Stefan Monnier + + * minibuffer.el (completion-in-region-mode-predicate) + (completion-in-region-mode--predicate): New vars. + (completion-in-region, completion-in-region--postch) + (completion-in-region-mode): Use them. + (completion--capf-wrapper): Also return the hook function. + (completion-at-point, completion-help-at-point): + Adjust and provide a predicate. Preserve arg names for advice of subr and lexical functions (bug#8457). * help-fns.el (help-function-arglist): Consolidate the subr and === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-04-10 21:31:14 +0000 +++ lisp/minibuffer.el 2011-04-14 00:16:11 +0000 @@ -58,6 +58,10 @@ ;;; Todo: +;; - completion-insert-complete-hook (called after inserting a complete +;; completion), typically used for "complete-abbrev" where it would expand +;; the abbrev. Tho we'd probably want to provide it from the +;; completion-table. ;; - extend `boundaries' to provide various other meta-data about the ;; output of `all-completions': ;; - preferred sorting order when displayed in *Completions*. @@ -1254,12 +1258,22 @@ (defvar completion-in-region--data nil) +(defvar completion-in-region-mode-predicate nil + "Predicate to tell `completion-in-region-mode' when to exit. +It is called with no argument and should return nil when +`completion-in-region-mode' should exit (and hence pop down +the *Completions* buffer).") + +(defvar completion-in-region-mode--predicate nil + "Copy of the value of `completion-in-region-mode-predicate'. +This holds the value `completion-in-region-mode-predicate' had when +we entered `completion-in-region-mode'.") + (defun completion-in-region (start end collection &optional predicate) "Complete the text between START and END using COLLECTION. Return nil if there is no valid completion, else t. Point needs to be somewhere between START and END." (assert (<= start (point)) (<= (point) end)) - ;; FIXME: undisplay the *Completions* buffer once the completion is done. (with-wrapper-hook ;; FIXME: Maybe we should use this hook to provide a "display ;; completions" operation as well. @@ -1268,9 +1282,10 @@ (minibuffer-completion-predicate predicate) (ol (make-overlay start end nil nil t))) (overlay-put ol 'field 'completion) - (completion-in-region-mode 1) - (setq completion-in-region--data - (list (current-buffer) start end collection)) + (when completion-in-region-mode-predicate + (completion-in-region-mode 1) + (setq completion-in-region--data + (list (current-buffer) start end collection))) (unwind-protect (call-interactively 'minibuffer-complete) (delete-overlay ol))))) @@ -1299,13 +1314,8 @@ (save-excursion (goto-char (nth 2 completion-in-region--data)) (line-end-position))) - (let ((comp-data (run-hook-wrapped - 'completion-at-point-functions - ;; Only use the known-safe functions. - #'completion--capf-wrapper 'safe))) - (eq (car comp-data) - ;; We're still in the same completion field. - (nth 1 completion-in-region--data))))) + (when completion-in-region-mode--predicate + (funcall completion-in-region-mode--predicate)))) (completion-in-region-mode -1))) ;; (defalias 'completion-in-region--prech 'completion-in-region--postch) @@ -1320,9 +1330,12 @@ (delq (assq 'completion-in-region-mode minor-mode-overriding-map-alist) minor-mode-overriding-map-alist)) (if (null completion-in-region-mode) - (unless (equal "*Completions*" (buffer-name (window-buffer))) + (unless (or (equal "*Completions*" (buffer-name (window-buffer))) + (null completion-in-region-mode--predicate)) (minibuffer-hide-completions)) ;; (add-hook 'pre-command-hook #'completion-in-region--prech) + (set (make-local-variable 'completion-in-region-mode--predicate) + completion-in-region-mode-predicate) (add-hook 'post-command-hook #'completion-in-region--postch) (push `(completion-in-region-mode . ,completion-in-region-mode-map) minor-mode-overriding-map-alist))) @@ -1366,7 +1379,7 @@ (message "Completion function %S uses a deprecated calling convention" fun) (push fun completion--capf-misbehave-funs)))) - res))) + (if res (cons fun res))))) (defun completion-at-point () "Perform completion on the text around point. @@ -1374,18 +1387,20 @@ (interactive) (let ((res (run-hook-wrapped 'completion-at-point-functions #'completion--capf-wrapper 'all))) - (cond - ((functionp res) (funcall res)) - ((consp res) - (let* ((plist (nthcdr 3 res)) - (start (nth 0 res)) - (end (nth 1 res)) - (completion-annotate-function + (pcase res + (`(,_ . ,(and (pred functionp) f)) (funcall f)) + (`(,hookfun . (,start ,end ,collection . ,plist)) + (let* ((completion-annotate-function (or (plist-get plist :annotation-function) - completion-annotate-function))) - (completion-in-region start end (nth 2 res) + completion-annotate-function)) + (completion-in-region-mode-predicate + (lambda () + ;; We're still in the same completion field. + (eq (car (funcall hookfun)) start)))) + (completion-in-region start end collection (plist-get plist :predicate)))) - (res)))) ;Maybe completion already happened and the function returned t. + ;; Maybe completion already happened and the function returned t. + (_ (cdr res))))) (defun completion-help-at-point () "Display the completions on the text around point. @@ -1394,29 +1409,36 @@ (let ((res (run-hook-wrapped 'completion-at-point-functions ;; Ignore misbehaving functions. #'completion--capf-wrapper 'optimist))) - (cond - ((functionp res) - (message "Don't know how to show completions for %S" res)) - ((consp res) - (let* ((plist (nthcdr 3 res)) - (minibuffer-completion-table (nth 2 res)) + (pcase res + (`(,_ . ,(and (pred functionp) f)) + (message "Don't know how to show completions for %S" f)) + (`(,hookfun . (,start ,end ,collection . ,plist)) + (let* ((minibuffer-completion-table collection) (minibuffer-completion-predicate (plist-get plist :predicate)) (completion-annotate-function (or (plist-get plist :annotation-function) completion-annotate-function)) - (ol (make-overlay (nth 0 res) (nth 1 res) nil nil t))) + (completion-in-region-mode-predicate + (lambda () + ;; We're still in the same completion field. + (eq (car (funcall hookfun)) start))) + (ol (make-overlay start end nil nil t))) ;; FIXME: We should somehow (ab)use completion-in-region-function or ;; introduce a corresponding hook (plus another for word-completion, ;; and another for force-completion, maybe?). (overlay-put ol 'field 'completion) + (completion-in-region-mode 1) + (setq completion-in-region--data + (list (current-buffer) start end collection)) (unwind-protect (call-interactively 'minibuffer-completion-help) (delete-overlay ol)))) - (res + (`(,hookfun . ,_) ;; The hook function already performed completion :-( ;; Not much we can do at this point. + (message "%s already performed completion!" hookfun) nil) - (t (message "Nothing to complete at point"))))) + (_ (message "Nothing to complete at point"))))) ;;; Key bindings. ------------------------------------------------------------ revno: 103906 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-04-13 14:56:47 -0300 message: Preserve arg names for advice of subr and lexical functions. * lisp/help-fns.el (help-function-arglist): Consolidate the subr and new-byte-code cases. Add argument `preserve-names' to extract names from the docstring when needed. * lisp/emacs-lisp/advice.el (ad-define-subr-args, ad-undefine-subr-args) (ad-subr-args-defined-p, ad-get-subr-args, ad-subr-arglist): Remove. (ad-arglist): Use help-function-arglist's new arg. (ad-definition-type): Use cond. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-13 14:27:41 +0000 +++ lisp/ChangeLog 2011-04-13 17:56:47 +0000 @@ -1,3 +1,14 @@ +2011-04-13 Stefan Monnier + + Preserve arg names for advice of subr and lexical functions (bug#8457). + * help-fns.el (help-function-arglist): Consolidate the subr and + new-byte-code cases. Add argument `preserve-names' to extract names + from the docstring when needed. + * emacs-lisp/advice.el (ad-define-subr-args, ad-undefine-subr-args) + (ad-subr-args-defined-p, ad-get-subr-args, ad-subr-arglist): Remove. + (ad-arglist): Use help-function-arglist's new arg. + (ad-definition-type): Use cond. + 2011-04-13 Juanma Barranquero * autorevert.el (auto-revert-handler): === modified file 'lisp/emacs-lisp/advice.el' --- lisp/emacs-lisp/advice.el 2011-03-11 20:04:22 +0000 +++ lisp/emacs-lisp/advice.el 2011-04-13 17:56:47 +0000 @@ -503,36 +503,6 @@ ;; exact structure of the original argument list as long as the new argument ;; list takes a compatible number/magnitude of actual arguments. -;; @@@ Definition of subr argument lists: -;; ====================================== -;; When advice constructs the advised definition of a function it has to -;; know the argument list of the original function. For functions and macros -;; the argument list can be determined from the actual definition, however, -;; for subrs there is no such direct access available. In Lemacs and for some -;; subrs in Emacs-19 the argument list of a subr can be determined from -;; its documentation string, in a v18 Emacs even that is not possible. If -;; advice cannot at all determine the argument list of a subr it uses -;; `(&rest ad-subr-args)' which will always work but is inefficient because -;; it conses up arguments. The macro `ad-define-subr-args' can be used by -;; the advice programmer to explicitly tell advice about the argument list -;; of a certain subr, for example, -;; -;; (ad-define-subr-args 'fset '(sym newdef)) -;; -;; is used by advice itself to tell a v18 Emacs about the arguments of `fset'. -;; The following can be used to undo such a definition: -;; -;; (ad-undefine-subr-args 'fset) -;; -;; The argument list definition is stored on the property list of the subr -;; name symbol. When an argument list could be determined from the -;; documentation string it will be cached under that property. The general -;; mechanism for looking up the argument list of a subr is the following: -;; 1) look for a definition stored on the property list -;; 2) if that failed try to infer it from the documentation string and -;; if successful cache it on the property list -;; 3) otherwise use `(&rest ad-subr-args)' - ;; @@ Activation and deactivation: ;; =============================== ;; The definition of an advised function does not change until all its advice @@ -1654,41 +1624,6 @@ ;; (fii 3 2) ;; 5 ;; -;; @@ Specifying argument lists of subrs: -;; ====================================== -;; The argument lists of subrs cannot be determined directly from Lisp. -;; This means that Advice has to use `(&rest ad-subr-args)' as the -;; argument list of the advised subr which is not very efficient. In Lemacs -;; subr argument lists can be determined from their documentation string, in -;; Emacs-19 this is the case for some but not all subrs. To accommodate -;; for the cases where the argument lists cannot be determined (e.g., in a -;; v18 Emacs) Advice comes with a specification mechanism that allows the -;; advice programmer to tell advice what the argument list of a certain subr -;; really is. -;; -;; In a v18 Emacs the following will return the &rest idiom: -;; -;; (ad-arglist (symbol-function 'car)) -;; (&rest ad-subr-args) -;; -;; To tell advice what the argument list of `car' really is we -;; can do the following: -;; -;; (ad-define-subr-args 'car '(list)) -;; ((list)) -;; -;; Now `ad-arglist' will return the proper argument list (this method is -;; actually used by advice itself for the advised definition of `fset'): -;; -;; (ad-arglist (symbol-function 'car)) -;; (list) -;; -;; The defined argument list will be stored on the property list of the -;; subr name symbol. When advice looks for a subr argument list it first -;; checks for a definition on the property list, if that fails it tries -;; to infer it from the documentation string and caches it on the property -;; list if it was successful, otherwise `(&rest ad-subr-args)' will be used. -;; ;; @@ Advising interactive subrs: ;; ============================== ;; For the most part there is no difference between advising functions and @@ -2536,52 +2471,11 @@ If DEFINITION could be from a subr then its NAME should be supplied to make subr arglist lookup more efficient." (require 'help-fns) - (cond - ((or (ad-macro-p definition) (ad-advice-p definition)) - (help-function-arglist (cdr definition))) - (t (help-function-arglist definition)))) - -;; Store subr-args as `((arg1 arg2 ...))' so I can distinguish -;; a defined empty arglist `(nil)' from an undefined arglist: -(defmacro ad-define-subr-args (subr arglist) - `(put ,subr 'ad-subr-arglist (list ,arglist))) -(defmacro ad-undefine-subr-args (subr) - `(put ,subr 'ad-subr-arglist nil)) -(defmacro ad-subr-args-defined-p (subr) - `(get ,subr 'ad-subr-arglist)) -(defmacro ad-get-subr-args (subr) - `(car (get ,subr 'ad-subr-arglist))) - -(defun ad-subr-arglist (subr-name) - "Retrieve arglist of the subr with SUBR-NAME. -Either use the one stored under the `ad-subr-arglist' property, -or try to retrieve it from the docstring and cache it under -that property, or otherwise use `(&rest ad-subr-args)'." - (if (ad-subr-args-defined-p subr-name) - (ad-get-subr-args subr-name) - ;; says jwz: Should use this for Lemacs 19.8 and above: - ;;((fboundp 'subr-min-args) - ;; ...) - ;; says hans: I guess what Jamie means is that I should use the values - ;; of `subr-min-args' and `subr-max-args' to construct the subr arglist - ;; without having to look it up via parsing the docstring, e.g., - ;; values 1 and 2 would suggest `(arg1 &optional arg2)' as an - ;; argument list. However, that won't work because there is no - ;; way to distinguish a subr with args `(a &optional b &rest c)' from - ;; one with args `(a &rest c)' using that mechanism. Also, the argument - ;; names from the docstring are more meaningful. Hence, I'll stick with - ;; the old way of doing things. - (let ((doc (or (ad-real-documentation subr-name t) ""))) - (if (not (string-match "\n\n\\((.+)\\)\\'" doc)) - ;; Signalling an error leads to bugs during bootstrapping because - ;; the DOC file is not yet built (which is an error, BTW). - ;; (error "The usage info is missing from the subr %s" subr-name) - '(&rest ad-subr-args) - (ad-define-subr-args - subr-name - (cdr (car (read-from-string - (downcase (match-string 1 doc)))))) - (ad-get-subr-args subr-name))))) + (help-function-arglist + (if (or (ad-macro-p definition) (ad-advice-p definition)) + (cdr definition) + definition) + 'preserve-names)) (defun ad-docstring (definition) "Return the unexpanded docstring of DEFINITION." @@ -2629,17 +2523,16 @@ (defun ad-definition-type (definition) "Return symbol that describes the type of DEFINITION." - (if (ad-macro-p definition) - 'macro - (if (ad-subr-p definition) - (if (ad-special-form-p definition) - 'special-form - 'subr) - (if (or (ad-lambda-p definition) - (ad-compiled-p definition)) - 'function - (if (ad-advice-p definition) - 'advice))))) + (cond + ((ad-macro-p definition) 'macro) + ((ad-subr-p definition) + (if (ad-special-form-p definition) + 'special-form + 'subr)) + ((or (ad-lambda-p definition) + (ad-compiled-p definition)) + 'function) + ((ad-advice-p definition) 'advice))) (defun ad-has-proper-definition (function) "True if FUNCTION is a symbol with a proper definition. @@ -3921,10 +3814,6 @@ ;; Use the advice mechanism to advise `documentation' to make it ;; generate proper documentation strings for advised definitions: -;; This makes sure we get the right arglist for `documentation' -;; during bootstrapping. -(ad-define-subr-args 'documentation '(function &optional raw)) - ;; @@ Starting, stopping and recovering from the advice package magic: ;; =================================================================== === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2011-04-08 18:53:26 +0000 +++ lisp/help-fns.el 2011-04-13 17:56:47 +0000 @@ -99,46 +99,55 @@ (format "%S" (help-make-usage 'fn arglist)))))) ;; FIXME: Move to subr.el? -(defun help-function-arglist (def) +(defun help-function-arglist (def &optional preserve-names) + "Return a formal argument list for the function DEF. +IF PRESERVE-NAMES is non-nil, return a formal arglist that uses +the same names as used in the original source code, when possible." ;; Handle symbols aliased to other symbols. (if (and (symbolp def) (fboundp def)) (setq def (indirect-function def))) ;; If definition is a macro, find the function inside it. (if (eq (car-safe def) 'macro) (setq def (cdr def))) (cond - ((and (byte-code-function-p def) (integerp (aref def 0))) - (let* ((args-desc (aref def 0)) - (max (lsh args-desc -8)) - (min (logand args-desc 127)) - (rest (logand args-desc 128)) - (arglist ())) - (dotimes (i min) - (push (intern (concat "arg" (number-to-string (1+ i)))) arglist)) - (when (> max min) - (push '&optional arglist) - (dotimes (i (- max min)) - (push (intern (concat "arg" (number-to-string (+ 1 i min)))) - arglist))) - (unless (zerop rest) (push '&rest arglist) (push 'rest arglist)) - (nreverse arglist))) - ((byte-code-function-p def) (aref def 0)) + ((and (byte-code-function-p def) (listp (aref def 0))) (aref def 0)) ((eq (car-safe def) 'lambda) (nth 1 def)) ((eq (car-safe def) 'closure) (nth 2 def)) - ((subrp def) - (let ((arity (subr-arity def)) - (arglist ())) - (dotimes (i (car arity)) - (push (intern (concat "arg" (number-to-string (1+ i)))) arglist)) - (cond - ((not (numberp (cdr arglist))) - (push '&rest arglist) - (push 'rest arglist)) - ((< (car arity) (cdr arity)) - (push '&optional arglist) - (dotimes (i (- (cdr arity) (car arity))) - (push (intern (concat "arg" (number-to-string - (+ 1 i (car arity))))) - arglist)))) - (nreverse arglist))) + ((or (and (byte-code-function-p def) (integerp (aref def 0))) + (subrp def)) + (or (when preserve-names + (let* ((doc (condition-case nil (documentation def) (error nil))) + (docargs (if doc (car (help-split-fundoc doc nil)))) + (arglist (if docargs + (cdar (read-from-string (downcase docargs))))) + (valid t)) + ;; Check validity. + (dolist (arg arglist) + (unless (and (symbolp arg) + (let ((name (symbol-name arg))) + (if (eq (aref name 0) ?&) + (memq arg '(&rest &optional)) + (not (string-match "\\." name))))) + (setq valid nil))) + (when valid arglist))) + (let* ((args-desc (if (not (subrp def)) + (aref def 0) + (let ((a (subr-arity def))) + (logior (car a) + (if (numberp (cdr a)) + (lsh (cdr a) 8) + (lsh 1 7)))))) + (max (lsh args-desc -8)) + (min (logand args-desc 127)) + (rest (logand args-desc 128)) + (arglist ())) + (dotimes (i min) + (push (intern (concat "arg" (number-to-string (1+ i)))) arglist)) + (when (> max min) + (push '&optional arglist) + (dotimes (i (- max min)) + (push (intern (concat "arg" (number-to-string (+ 1 i min)))) + arglist))) + (unless (zerop rest) (push '&rest arglist) (push 'rest arglist)) + (nreverse arglist)))) ((and (eq (car-safe def) 'autoload) (not (eq (nth 4 def) 'keymap))) "[Arg list not available until function definition is loaded.]") (t t))) ------------------------------------------------------------ revno: 103905 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-04-13 20:43:38 +0300 message: Fix bug #8487 with invisible text at EOB under bidi. src/xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init when at ZV. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-04-12 10:20:32 +0000 +++ src/ChangeLog 2011-04-13 17:43:38 +0000 @@ -1,3 +1,8 @@ +2011-04-13 Eli Zaretskii + + * xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init + when at ZV. (Bug#8487) + 2011-04-12 Andreas Schwab * charset.c (Fclear_charset_maps): Use xfree instead of free. === modified file 'src/xdisp.c' --- src/xdisp.c 2011-04-11 16:39:09 +0000 +++ src/xdisp.c 2011-04-13 17:43:38 +0000 @@ -3660,7 +3660,7 @@ _after_ bidi iteration avoids affecting the visual order of the displayed text when invisible properties are added or removed. */ - if (it->bidi_it.first_elt) + if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV) { /* If we were `reseat'ed to a new paragraph, determine the paragraph base direction. We need ------------------------------------------------------------ revno: 103904 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-04-13 16:27:41 +0200 message: lisp/autorevert.el: Use `remote-file-name-inhibit-cache'. * autorevert.el (auto-revert-handler): Bind `remote-file-name-inhibit-cache', not `tramp-cache-inhibit-cache', which was removed in revno:101730 (2010-10-02). Don't quote lambda. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-13 02:16:42 +0000 +++ lisp/ChangeLog 2011-04-13 14:27:41 +0000 @@ -1,5 +1,10 @@ 2011-04-13 Juanma Barranquero + * autorevert.el (auto-revert-handler): + Bind `remote-file-name-inhibit-cache', not `tramp-cache-inhibit-cache', + which was removed in revno:101730 (2010-10-02). + Don't quote lambda. + * image-mode.el (image-transform-set-scale): Fix change in revno:103877 (2011-04-09). === modified file 'lisp/autorevert.el' --- lisp/autorevert.el 2011-02-20 00:09:28 +0000 +++ lisp/autorevert.el 2011-04-13 14:27:41 +0000 @@ -434,9 +434,9 @@ (file-readable-p buffer-file-name) (if auto-revert-tail-mode ;; Tramp caches the file attributes. Setting - ;; `tramp-cache-inhibit' forces Tramp to - ;; reread the values. - (let ((tramp-cache-inhibit-cache t)) + ;; `remote-file-name-inhibit-cache' forces Tramp + ;; to reread the values. + (let ((remote-file-name-inhibit-cache t)) (/= auto-revert-tail-pos (setq size (nth 7 (file-attributes @@ -460,10 +460,10 @@ (when buffer-file-name (setq eob (eobp)) (walk-windows - #'(lambda (window) - (and (eq (window-buffer window) buffer) - (= (window-point window) (point-max)) - (push window eoblist))) + (lambda (window) + (and (eq (window-buffer window) buffer) + (= (window-point window) (point-max)) + (push window eoblist))) 'no-mini t)) (if auto-revert-tail-mode (auto-revert-tail-handler size) ------------------------------------------------------------ revno: 103903 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-04-13 13:58:47 +0200 message: Fix typos. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-04-12 22:18:02 +0000 +++ doc/misc/ChangeLog 2011-04-13 11:58:47 +0000 @@ -1,7 +1,11 @@ +2011-04-13 Juanma Barranquero + + * ede.texi: Fix typos. + 2011-04-12 Lars Magne Ingebrigtsen - * gnus.texi (Window Layout): @itemize @code doesn't exist. It's @table - @code. + * gnus.texi (Window Layout): @itemize @code doesn't exist. + It's @table @code. 2011-03-19 Antoine Levitt === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/ede.texi 2011-04-13 11:58:47 +0000 @@ -2123,7 +2123,7 @@ @end deffn @deffn Method ede-proj-flush-autoconf :AFTER this -Flush the configure file (current buffer) to accomodate @var{THIS}. +Flush the configure file (current buffer) to accommodate @var{THIS}. By flushing, remove any cruft that may be in the file. Subsequent calls to @dfn{ede-proj-tweak-autoconf} can restore items removed by flush. @end deffn @@ -2174,7 +2174,7 @@ @end deffn @deffn Method ede-proj-tweak-autoconf :AFTER this -Tweak the configure file (current buffer) to accomodate @var{THIS}. +Tweak the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-proj-compilers :AFTER obj @@ -2684,7 +2684,7 @@ @end deffn @deffn Method ede-proj-flush-autoconf :AFTER this -Flush the configure file (current buffer) to accomodate @var{THIS}. +Flush the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-buffer-mine :AFTER this buffer @@ -2697,7 +2697,7 @@ @end deffn @deffn Method ede-proj-tweak-autoconf :AFTER this -Tweak the configure file (current buffer) to accomodate @var{THIS}. +Tweak the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-update-version-in-source :AFTER this version @@ -2777,7 +2777,7 @@ @end deffn @deffn Method ede-proj-flush-autoconf :AFTER this -Flush the configure file (current buffer) to accomodate @var{THIS}. +Flush the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-buffer-mine :AFTER this buffer @@ -2796,7 +2796,7 @@ @end deffn @deffn Method ede-proj-tweak-autoconf :AFTER this -Tweak the configure file (current buffer) to accomodate @var{THIS}. +Tweak the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-update-version-in-source :AFTER this version @@ -3008,7 +3008,7 @@ @subsubsection Specialized Methods @deffn Method ede-proj-tweak-autoconf :AFTER this -Tweak the configure file (current buffer) to accomodate @var{THIS}. +Tweak the configure file (current buffer) to accommodate @var{THIS}. @end deffn @@ -3536,7 +3536,7 @@ @subsubsection Specialized Methods @deffn Method ede-proj-flush-autoconf :AFTER this -Flush the configure file (current buffer) to accomodate @var{THIS}. +Flush the configure file (current buffer) to accommodate @var{THIS}. @end deffn @deffn Method ede-proj-makefile-insert-rules :AFTER this @@ -3558,7 +3558,7 @@ @end deffn @deffn Method ede-proj-tweak-autoconf :AFTER this -Tweak the configure file (current buffer) to accomodate @var{THIS}. +Tweak the configure file (current buffer) to accommodate @var{THIS}. @end deffn === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-04-06 12:18:10 +0000 +++ src/ChangeLog.11 2011-04-13 11:58:47 +0000 @@ -4906,7 +4906,7 @@ (Finternal_describe_syntax_value): Recognize new flag; use the SYNTAX_FLAGS_* macros. (scan_sexps_forward, Fparse_partial_sexp): Change representation of - comment style to accomodate the new styles. + comment style to accommodate the new styles. (back_comment, forw_comment, Fforward_comment, scan_lists) (scan_sexps_forward): Update code to obey the new comment style flag. ------------------------------------------------------------ revno: 103902 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-04-13 04:16:42 +0200 message: lisp/image-mode.el: Fix change in revno:103877 (2011-04-09). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-12 22:18:02 +0000 +++ lisp/ChangeLog 2011-04-13 02:16:42 +0000 @@ -1,3 +1,8 @@ +2011-04-13 Juanma Barranquero + + * image-mode.el (image-transform-set-scale): + Fix change in revno:103877 (2011-04-09). + 2011-04-12 Lars Magne Ingebrigtsen * net/network-stream.el (network-stream-open-starttls): Only do === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2011-04-09 20:28:01 +0000 +++ lisp/image-mode.el 2011-04-13 02:16:42 +0000 @@ -610,7 +610,7 @@ This command has no effect unless Emacs is compiled with ImageMagick support." (interactive "nScale: ") - (setq image-transform-resize resize) + (setq image-transform-resize scale) (image-toggle-display-image)) (defun image-transform-fit-to-height () ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.