commit e6127d94746e230f95bdf2ad002e4379474e5a8b (HEAD, refs/remotes/origin/master) Author: Jan D Date: Sat Mar 28 23:05:30 2015 +0100 * lisp/emacs-lisp/package.el (package-refresh-contents): Fix spelling error diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dbd092d..c8e84a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-28 Jan Djärv + + * emacs-lisp/package.el (package-refresh-contents): Fix spelling + error in previous change. + 2015-03-28 Tom Willemse (tiny change) * elec-pair.el (electric-pair-local-mode): New command. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index d34dfbc..0275da3 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1718,7 +1718,7 @@ and make them available for download." (car archive))))) (package-read-all-archive-contents) (package--build-compatibility-table) - (message "Package refersh done")) + (message "Package refresh done")) (defun package--find-non-dependencies () "Return a list of installed packages which are not dependencies. commit 36a2efe2583e7381710088d4d0cd3185ed1a0cbf Author: Glenn Morris Date: Sat Mar 28 10:33:43 2015 -0700 ChangeLog fix Add tiny change marker to author without assignment. NB there are several previous commits from the same author... diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 40a5790..dbd092d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,4 @@ -2015-03-28 Tom Willemse +2015-03-28 Tom Willemse (tiny change) * elec-pair.el (electric-pair-local-mode): New command. (electric-pair-mode): Mention `electric-pair-local-mode' in the commit 40b3dcd2c06e30048be0bdc32861148a53660c90 Author: Tom Willemse Date: Sat Mar 28 14:43:33 2015 +0000 New `electric-pair-local-mode' Fixes: big#19528 * lisp/elec-pair.el (electric-pair-local-mode): New command. (electric-pair-mode): Mention `electric-pair-local-mode' in the docstring. diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index b161a0c..1fffa23 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -870,7 +870,9 @@ mode to skip whitespace forward before deciding whether to skip over the closing delimiter. @end itemize -To toggle Electric Pair mode, type @kbd{M-x electric-pair-mode}. +To toggle Electric Pair mode, type @kbd{M-x electric-pair-mode}. To +toggle the mode in a single buffer, use @kbd{M-x +electric-pair-local-mode}. @node Comments @section Manipulating Comments diff --git a/etc/NEWS b/etc/NEWS index 396335e..6de8f03 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -215,6 +215,9 @@ Unicode standards. ** You can access `mouse-buffer-menu' (C-down-mouse-1) using C-f10. ++++ +** New buffer-local `electric-pair-local-mode'. + * Changes in Specialized Modes and Packages in Emacs 25.1 ** xterm-mouse-mode now supports mouse-tracking (if your xterm supports it). diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 488abb1..40a5790 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-28 Tom Willemse + + * elec-pair.el (electric-pair-local-mode): New command. + (electric-pair-mode): Mention `electric-pair-local-mode' in the + docstring. + 2015-03-28 Jan Djärv * emacs-lisp/package.el (package-refresh-contents): Add a message at diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index 2cede62..562b294 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -557,7 +557,8 @@ the mode if ARG is omitted or nil. Electric Pair mode is a global minor mode. When enabled, typing an open parenthesis automatically inserts the corresponding -closing parenthesis. (Likewise for brackets, etc.)." +closing parenthesis. (Likewise for brackets, etc.). To toggle +the mode in a single buffer, use `electric-pair-local-mode'." :global t :group 'electricity (if electric-pair-mode (progn @@ -571,6 +572,19 @@ closing parenthesis. (Likewise for brackets, etc.)." (remove-hook 'self-insert-uses-region-functions #'electric-pair-will-use-region))) +;;;###autoload +(define-minor-mode electric-pair-local-mode + "Toggle `electric-pair-mode' only in this buffer." + :variable (buffer-local-value 'electric-pair-mode (current-buffer)) + (cond + ((eq electric-pair-mode (default-value 'electric-pair-mode)) + (kill-local-variable 'electric-pair-mode)) + ((not (default-value 'electric-pair-mode)) + ;; Locally enabled, but globally disabled. + (electric-pair-mode 1) ; Setup the hooks. + (setq-default electric-pair-mode nil) ; But keep it globally disabled. + ))) + (provide 'elec-pair) ;;; elec-pair.el ends here commit be5e9348dc137d06655676e686f153cf33de4f28 Author: Jan D Date: Sat Mar 28 12:33:25 2015 +0100 Don't send bad SM messages. * xsmfns.c (smc_save_yourself_CB): Return if Vinvocation_name or user_login_name are not strings. diff --git a/src/ChangeLog b/src/ChangeLog index 0cc0a42..7874910 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-28 Jan Djärv + + * xsmfns.c (smc_save_yourself_CB): Return if Vinvocation_name or + user_login_name are not strings. + 2015-03-28 Eli Zaretskii * w32.c (sys_connect): Fix a mistake in previous commit that broke diff --git a/src/xsmfns.c b/src/xsmfns.c index 375b51c..48aaa9b 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -169,6 +169,11 @@ smc_save_yourself_CB (SmcConn smcConn, int props_idx = 0; int i; char *smid_opt, *chdir_opt = NULL; + Lisp_Object user_login_name = Fuser_login_name (Qnil); + + // Must have these. + if (! STRINGP (Vinvocation_name) || ! STRINGP (user_login_name)) + return; /* How to start a new instance of Emacs. */ props[props_idx] = &prop_ptr[props_idx]; @@ -180,32 +185,25 @@ smc_save_yourself_CB (SmcConn smcConn, props[props_idx]->vals[0].value = emacs_program; ++props_idx; - if (STRINGP (Vinvocation_name)) - { - /* The name of the program. */ - props[props_idx] = &prop_ptr[props_idx]; - props[props_idx]->name = xstrdup (SmProgram); - props[props_idx]->type = xstrdup (SmARRAY8); - props[props_idx]->num_vals = 1; - props[props_idx]->vals = &values[val_idx++]; - props[props_idx]->vals[0].length = SBYTES (Vinvocation_name); - props[props_idx]->vals[0].value = SDATA (Vinvocation_name); - ++props_idx; - } + /* The name of the program. */ + props[props_idx] = &prop_ptr[props_idx]; + props[props_idx]->name = xstrdup (SmProgram); + props[props_idx]->type = xstrdup (SmARRAY8); + props[props_idx]->num_vals = 1; + props[props_idx]->vals = &values[val_idx++]; + props[props_idx]->vals[0].length = SBYTES (Vinvocation_name); + props[props_idx]->vals[0].value = SDATA (Vinvocation_name); + ++props_idx; /* User id. */ - Lisp_Object user_login_name = Fuser_login_name (Qnil); - if (STRINGP (user_login_name)) - { - props[props_idx] = &prop_ptr[props_idx]; - props[props_idx]->name = xstrdup (SmUserID); - props[props_idx]->type = xstrdup (SmARRAY8); - props[props_idx]->num_vals = 1; - props[props_idx]->vals = &values[val_idx++]; - props[props_idx]->vals[0].length = SBYTES (user_login_name); - props[props_idx]->vals[0].value = SDATA (user_login_name); - ++props_idx; - } + props[props_idx] = &prop_ptr[props_idx]; + props[props_idx]->name = xstrdup (SmUserID); + props[props_idx]->type = xstrdup (SmARRAY8); + props[props_idx]->num_vals = 1; + props[props_idx]->vals = &values[val_idx++]; + props[props_idx]->vals[0].length = SBYTES (user_login_name); + props[props_idx]->vals[0].value = SDATA (user_login_name); + ++props_idx; char *cwd = get_current_dir_name (); if (cwd) commit 733a9f114cc7219a8380db84b05081f145a163ae Author: Jan D Date: Sat Mar 28 12:15:18 2015 +0100 Fixes: debbugs:17879 * lisp/emacs-lisp/package.el (package-refresh-contents): Add a message at the end so it does not appear to have hanged. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b2d431c..488abb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-28 Jan Djärv + + * emacs-lisp/package.el (package-refresh-contents): Add a message at + the end so it does not appear to have hanged (Bug#17879). + 2015-03-27 Wolfgang Jenkner * font-lock.el (font-lock--remove-face-from-text-property): New diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 0d001bf..d34dfbc 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1717,7 +1717,8 @@ and make them available for download." (error (message "Failed to download `%s' archive." (car archive))))) (package-read-all-archive-contents) - (package--build-compatibility-table)) + (package--build-compatibility-table) + (message "Package refersh done")) (defun package--find-non-dependencies () "Return a list of installed packages which are not dependencies.