diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 16 | ||||
| -rw-r--r-- | lisp/erc/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/erc/erc-track.el | 79 | ||||
| -rw-r--r-- | lisp/mh-e/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
6 files changed, 76 insertions, 51 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 745346a903a..e9db9891714 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2014-09-30 Leonardo Nobrega <leonobr@gmail.com> (tiny change) + + * progmodes/python.el (python-fill-paren): Don't inf-loop at EOB + (bug#18462). + +2014-09-30 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/package.el (package-check-signature): Default to nil if + GPG is not available. + (package-refresh-contents): Don't mess with the keyring if we won't + check the signatures anyway. + 2014-09-30 Stefan Monnier <monnier@iro.umontreal.ca> * ses.el (ses--row, ses--col): New dyn-scoped vars, to replace row&col. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 1649ee0ea1a..4832673b95c 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -289,7 +289,9 @@ contrast, `package-user-dir' contains packages for personal use." :group 'package :version "24.1") -(defcustom package-check-signature 'allow-unsigned +(defcustom package-check-signature + (if (progn (require 'epg-config) (executable-find epg-gpg-program)) + 'allow-unsigned) "Non-nil means to check package signatures when installing. The value `allow-unsigned' means to still install a package even if it is unsigned. @@ -1314,12 +1316,12 @@ makes them available for download." (make-directory package-user-dir t)) (let ((default-keyring (expand-file-name "package-keyring.gpg" data-directory))) - (if (file-exists-p default-keyring) - (condition-case-unless-debug error - (progn - (epg-check-configuration (epg-configuration)) - (package-import-keyring default-keyring)) - (error (message "Cannot import default keyring: %S" (cdr error)))))) + (when (and package-check-signature (file-exists-p default-keyring)) + (condition-case-unless-debug error + (progn + (epg-check-configuration (epg-configuration)) + (package-import-keyring default-keyring)) + (error (message "Cannot import default keyring: %S" (cdr error)))))) (dolist (archive package-archives) (condition-case-unless-debug nil (package--download-one-archive archive "archive-contents") diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b5dd3f2f359..1ea79dbbc1a 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,11 @@ +2014-09-30 Stefan Monnier <monnier@iro.umontreal.ca> + + * erc-track.el (erc-modified-channels-display): Update all mode lines + if needed (bug#18510). Remove call to erc-modified-channels-object + where we ignored the return value. + (erc-modified-channels-update): Don't force-mode-line-update here + any more. + 2014-09-26 Kelvin White <kwhite@gnu.org> * erc.el (erc-format-nick): Fix code regression - Bug #18551 @@ -12,7 +20,7 @@ (erc-cmd-SV, erc-ctcp-query-VERSION, erc-version, erc-version-string): Change version string. -2014-08-13 Kelvin White <kwhite@gnu.org> +2014-08-13 Kelvin White <kwhite@gnu.org> * erc.el (erc-send-input): Disable display commands in current buffer (erc-format-target-and/or-network): Fix cases when buffer name is set diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index 3f7b6a7b501..706cce2fefe 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -767,8 +767,7 @@ ARGS are ignored." (erc-modified-channels-remove-buffer buffer)))) erc-modified-channels-alist) (when removed-channel - (erc-modified-channels-display) - (force-mode-line-update t))) + (erc-modified-channels-display))) (remove-hook 'post-command-hook 'erc-modified-channels-update))) (defvar erc-track-mouse-face (if (featurep 'xemacs) @@ -825,43 +824,45 @@ Use `erc-make-mode-line-buffer-name' to create buttons." ((eq 'importance erc-track-switch-direction) (erc-track-sort-by-importance))) (run-hooks 'erc-track-list-changed-hook) - (unless (eq erc-track-position-in-mode-line nil) - (if (null erc-modified-channels-alist) - (setq erc-modified-channels-object (erc-modified-channels-object nil)) - ;; erc-modified-channels-alist contains all the data we need. To - ;; better understand what is going on, we split things up into - ;; four lists: BUFFERS, COUNTS, SHORT-NAMES, and FACES. These - ;; four lists we use to create a new - ;; `erc-modified-channels-object' using - ;; `erc-make-mode-line-buffer-name'. - (let* ((buffers (mapcar 'car erc-modified-channels-alist)) - (counts (mapcar 'cadr erc-modified-channels-alist)) - (faces (mapcar 'cddr erc-modified-channels-alist)) - (long-names (mapcar #'(lambda (buf) - (or (buffer-name buf) - "")) - buffers)) - (short-names (if (functionp erc-track-shorten-function) - (funcall erc-track-shorten-function - long-names) - long-names)) - strings) - (while buffers - (when (car short-names) - (setq strings (cons (erc-make-mode-line-buffer-name - (car short-names) - (car buffers) - (car faces) - (car counts)) - strings))) - (setq short-names (cdr short-names) - buffers (cdr buffers) - counts (cdr counts) - faces (cdr faces))) - (when (featurep 'xemacs) - (erc-modified-channels-object nil)) - (setq erc-modified-channels-object - (erc-modified-channels-object strings)))))) + (when erc-track-position-in-mode-line + (let* ((oldobject erc-modified-channels-object) + (strings + (when erc-modified-channels-alist + ;; erc-modified-channels-alist contains all the data we need. To + ;; better understand what is going on, we split things up into + ;; four lists: BUFFERS, COUNTS, SHORT-NAMES, and FACES. These + ;; four lists we use to create a new + ;; `erc-modified-channels-object' using + ;; `erc-make-mode-line-buffer-name'. + (let* ((buffers (mapcar 'car erc-modified-channels-alist)) + (counts (mapcar 'cadr erc-modified-channels-alist)) + (faces (mapcar 'cddr erc-modified-channels-alist)) + (long-names (mapcar #'(lambda (buf) + (or (buffer-name buf) + "")) + buffers)) + (short-names (if (functionp erc-track-shorten-function) + (funcall erc-track-shorten-function + long-names) + long-names)) + strings) + (while buffers + (when (car short-names) + (setq strings (cons (erc-make-mode-line-buffer-name + (car short-names) + (car buffers) + (car faces) + (car counts)) + strings))) + (setq short-names (cdr short-names) + buffers (cdr buffers) + counts (cdr counts) + faces (cdr faces))) + strings))) + (newobject (erc-modified-channels-object strings))) + (unless (equal oldobject newobject) + (setq erc-modified-channels-object newobject) + (force-mode-line-update t))))) (defun erc-modified-channels-remove-buffer (buffer) "Remove BUFFER from `erc-modified-channels-alist'." diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 6e482280a9f..8008f07c700 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -9,8 +9,8 @@ * mh-comp.el (mh-insert-x-face): Ensure that mh-x-face-file is a string before trying to use it (closes SF #474). (mh-bare-components): New function to create a temporary initial - components file; replaces mh-find-components. Improve the temp - folder and file names as per a suggestion from Bill Wohler. Also + components file; replaces mh-find-components. Improve the temp + folder and file names as per a suggestion from Bill Wohler. Also address XEmacs compatibility issues: use mm-make-temp-file instead of make-temp-file, and only pass one argument to delete-directory. (mh-edit-again, mh-send-sub): Use mh-bare-components instead of diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index e617e2932d0..6c11a478942 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3300,7 +3300,8 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'." (end-of-line) (when (not (python-syntax-context 'paren)) (skip-syntax-backward "^)"))) - (while (python-syntax-context 'paren) + (while (and (python-syntax-context 'paren) + (not (eobp))) (goto-char (1+ (point-marker)))) (point-marker))) (let ((paragraph-start "\f\\|[ \t]*$") @@ -3311,7 +3312,8 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'." (while (not (eobp)) (forward-line 1) (python-indent-line) - (goto-char (line-end-position)))) t) + (goto-char (line-end-position)))) + t) ;;; Skeletons |