commit 81d89d88aef5de720e7fbeecbfb295d6eaf6fd37 (HEAD, refs/remotes/origin/master) Author: Oscar Fuentes Date: Wed Feb 18 05:09:12 2015 +0100 Fixes display of prefix argument when input-method-function * keyboard.c (read_char): When there is an input method function, do not restore the echo area if a prefix argument is being introduced. (Bug#19875) diff --git a/src/ChangeLog b/src/ChangeLog index 76e1956..8a3b534 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-02-18 Oscar Fuentes + + * keyboard.c (read_char): When there is an input method function, + do not restore the echo area if a prefix argument is being + introduced. (Bug#19875) + 2015-02-16 Kelly Dean * src/keyboard.c (timer_check_2): Fix incorrect comment. diff --git a/src/keyboard.c b/src/keyboard.c index ac70062..4f6a441 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3095,7 +3095,14 @@ read_char (int commandflag, Lisp_Object map, cancel_echoing (); ok_to_echo_at_next_pause = saved_ok_to_echo; - kset_echo_string (current_kboard, saved_echo_string); + /* Do not restore the echo area string when the user is + introducing a prefix argument. Otherwise we end with + repetitions of the partially introduced prefix + argument. (bug#19875) */ + if (NILP (intern ("prefix-arg"))) + { + kset_echo_string (current_kboard, saved_echo_string); + } current_kboard->echo_after_prompt = saved_echo_after_prompt; if (saved_immediate_echo) echo_now (); commit 8338e4420d4a0fd375f36698b5be54a65fe9cbb7 Author: Kelly Dean Date: Mon Feb 16 04:26:36 2015 +0000 lisp/files.el (insert-file-contents-literally): Fix typo diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3df34d6..704ec34 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2015-02-16 Kelly Dean + * lisp/files.el (insert-file-contents-literally): Fix docstring typo. + +2015-02-16 Kelly Dean + * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) (define-minor-mode): Clarify docstring. diff --git a/lisp/files.el b/lisp/files.el index 5e80cb7..8336979 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2110,7 +2110,7 @@ Do you want to revisit the file normally now? ") (defun insert-file-contents-literally (filename &optional visit beg end replace) "Like `insert-file-contents', but only reads in the file literally. A buffer may be modified in several ways after reading into the buffer, -to Emacs features such as format decoding, character code +due to Emacs features such as format decoding, character code conversion, `find-file-hook', automatic uncompression, etc. This function ensures that none of these modifications will take place." commit 04096849d54e09553d25897591993d5e0221a8d8 Author: Kelly Dean Date: Mon Feb 16 04:24:13 2015 +0000 emacs-lisp/easy-mmode.el: Clarify mode switch messages * emacs-lisp/easy-mmode.el (define-minor-mode): Clarify mode switch messages for minor modes. (Bug#19690) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b7ca890..3df34d6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,7 @@ * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) (define-minor-mode): Clarify docstring. + Clarify mode switch messages for minor modes. (Bug#19690) 2015-02-16 Kelly Dean diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index cc30042..bd95a60 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -284,14 +284,23 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. (if (called-interactively-p 'any) (progn ,(if (and globalp (symbolp mode)) + ;; Unnecessary but harmless if mode set buffer-locally `(customize-mark-as-set ',mode)) ;; Avoid overwriting a message shown by the body, ;; but do overwrite previous messages. (unless (and (current-message) (not (equal ,last-message (current-message)))) - (message ,(format "%s %%sabled" pretty-name) - (if ,mode "en" "dis"))))) + (let ((local + ,(if globalp + (if (symbolp mode) + `(if (local-variable-p ',mode) + " in current buffer" + "") + "") + " in current buffer"))) + (message ,(format "%s %%sabled%%s" pretty-name) + (if ,mode "en" "dis") local))))) ,@(when after-hook `(,after-hook))) (force-mode-line-update) ;; Return the new setting. commit cc273d1c033e669c642115550d2f132c7a9618b8 Author: Kelly Dean Date: Mon Feb 16 04:22:16 2015 +0000 emacs-lisp/easy-mmode.el (define-minor-mode): Clarify docs diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9741baa..b7ca890 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,7 @@ * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) + (define-minor-mode): Clarify docstring. 2015-02-16 Kelly Dean diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index cd5720d..cc30042 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -114,9 +114,12 @@ Optional KEYMAP is the default keymap bound to the mode keymap. BODY contains code to execute each time the mode is enabled or disabled. It is executed after toggling the mode, and before running MODE-hook. Before the actual body code, you can write keyword arguments, i.e. - alternating keywords and values. These following special keywords - are supported (other keywords are passed to `defcustom' if the minor - mode is global): + alternating keywords and values. If you provide BODY, then you must + provide (even if just nil) INIT-VALUE, LIGHTER, and KEYMAP, or provide + at least one keyword argument, or both; otherwise, BODY would be + misinterpreted as the first omitted argument. The following special + keywords are supported (other keywords are passed to `defcustom' if + the minor mode is global): :group GROUP Custom group name to use in all generated `defcustom' forms. Defaults to MODE without the possible trailing \"-mode\". commit 3194809d247efdc7ea65644ea7b298885e47a392 Author: Kelly Dean Date: Mon Feb 16 04:21:06 2015 +0000 emacs-lisp/easy-mmode.el: Process macro arguments correctly * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro arguments correctly. (Bug#19685) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d5080d9..9741baa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2015-02-16 Kelly Dean + * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro + arguments correctly. (Bug#19685) + +2015-02-16 Kelly Dean + * emacs-lisp/package-x.el (package-upload-buffer-internal): Create valid tar files. (Bug#19536) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index f7e8619..cd5720d 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -159,7 +159,8 @@ For example, you could write ;; Allow skipping the first three args. (cond ((keywordp init-value) - (setq body `(,init-value ,lighter ,keymap ,@body) + (setq body (if keymap `(,init-value ,lighter ,keymap ,@body) + `(,init-value ,lighter)) init-value nil lighter nil keymap nil)) ((keywordp lighter) (setq body `(,lighter ,keymap ,@body) lighter nil keymap nil)) commit 1f2c4f817ee37c7c7767e22eda1c427456885b6b Author: Kelly Dean Date: Mon Feb 16 04:19:41 2015 +0000 emacs-lisp/package-x.el: Create valid tar files * emacs-lisp/package-x.el (package-upload-buffer-internal): Create valid tar files. (Bug#19536) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3da9dc..d5080d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2015-02-16 Kelly Dean + * emacs-lisp/package-x.el (package-upload-buffer-internal): + Create valid tar files. (Bug#19536) + +2015-02-16 Kelly Dean + * desktop.el (desktop-read): Conditionally re-enable desktop autosave. (Bug#19059) diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el index e0945d4..6955ce8 100644 --- a/lisp/emacs-lisp/package-x.el +++ b/lisp/emacs-lisp/package-x.el @@ -247,7 +247,7 @@ if it exists." (concat (symbol-name pkg-name) "-readme.txt") package-archive-upload-base))) - (set-buffer pkg-buffer) + (set-buffer (if (eq file-type 'tar) tar-data-buffer pkg-buffer)) (write-region (point-min) (point-max) (expand-file-name (format "%s-%s.%s" pkg-name pkg-version extension) commit 1e00ee2497be60040a20fccb79633c936ccbe2c7 Author: Kelly Dean Date: Mon Feb 16 04:18:25 2015 +0000 desktop.el: Conditionally re-enable desktop autosave * desktop.el (desktop-read): Conditionally re-enable desktop autosave. (Bug#19059) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4200a7b..b3da9dc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2015-02-16 Kelly Dean + * desktop.el (desktop-read): Conditionally re-enable desktop autosave. + (Bug#19059) + +2015-02-16 Kelly Dean + * help-mode.el (help-do-xref): Prevent duplicated display of Info buffer, and prevent interference with existing buffer. (Bug#13190) diff --git a/lisp/desktop.el b/lisp/desktop.el index c272490..b85d8b2 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1136,7 +1136,8 @@ It returns t if a desktop file was loaded, nil otherwise." (desktop-buffer-fail-count 0) (owner (desktop-owner)) ;; Avoid desktop saving during evaluation of desktop buffer. - (desktop-save nil)) + (desktop-save nil) + (desktop-autosave-was-enabled)) (if (and owner (memq desktop-load-locked-desktop '(nil ask)) (or (null desktop-load-locked-desktop) @@ -1152,6 +1153,8 @@ Using it may cause conflicts. Use it anyway? " owner))))) ;; Temporarily disable the autosave that will leave it ;; disabled when loading the desktop fails with errors, ;; thus not overwriting the desktop with broken contents. + (setq desktop-autosave-was-enabled + (memq 'desktop-auto-save-set-timer window-configuration-change-hook)) (desktop-auto-save-disable) ;; Evaluate desktop buffer and remember when it was modified. (load (desktop-full-file-name) t t t) @@ -1205,7 +1208,7 @@ Using it may cause conflicts. Use it anyway? " owner))))) (set-window-prev-buffers window nil) (set-window-next-buffers window nil)))) (setq desktop-saved-frameset nil) - (desktop-auto-save-enable) + (if desktop-autosave-was-enabled (desktop-auto-save-enable)) t)) ;; No desktop file found. (let ((default-directory desktop-dirname)) commit 77052f4baa974802021197536f7f5004f471fc48 Author: Kelly Dean Date: Mon Feb 16 04:17:09 2015 +0000 * help-mode.el: Prevent duplicated display of Info buffer. (Bug#13190) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43cffff..4200a7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-16 Kelly Dean + + * help-mode.el (help-do-xref): Prevent duplicated display of Info + buffer, and prevent interference with existing buffer. (Bug#13190) + 2015-02-16 Fabián Ezequiel Gallina python.el: Do not deactivate mark on shell fontification. (Bug#19871) diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 564362a..b8b129d 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -739,7 +739,8 @@ Things are set up properly so that the resulting help-buffer has a proper [back] button." ;; There is a reference at point. Follow it. (let ((help-xref-following t)) - (apply function args))) + (apply function (if (eq function 'info) + (append args (list (generate-new-buffer-name "*info*"))) args)))) ;; The doc string is meant to explain what buttons do. (defun help-follow-mouse () commit cec04fb220601bdc653a44b007316a7e53663921 Author: Kelly Dean Date: Mon Feb 16 04:15:21 2015 +0000 * src/keyboard.c (timer_check_2): Fix incorrect comment diff --git a/src/ChangeLog b/src/ChangeLog index c89fa60..76e1956 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Kelly Dean + + * src/keyboard.c (timer_check_2): Fix incorrect comment. + 2015-02-14 Martin Rudalics * xterm.c (x_frame_normalize_before_maximize): Fix doc-string. diff --git a/src/keyboard.c b/src/keyboard.c index bcb51cf..ac70062 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4441,7 +4441,7 @@ timer_check_2 (Lisp_Object timers, Lisp_Object idle_timers) /* Set TIMER and TIMER_DIFFERENCE based on the next ordinary timer. TIMER_DIFFERENCE is the distance in time from NOW to when - this timer becomes ripe (negative if it's already ripe). + this timer becomes ripe. Skip past invalid timers and timers already handled. */ if (CONSP (timers)) {