Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103827. ------------------------------------------------------------ revno: 103827 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Tue 2011-04-05 06:33:38 +0200 message: * lisp/net/rcirc.el: Update my e-mail address. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-05 04:31:24 +0000 +++ lisp/ChangeLog 2011-04-05 04:33:38 +0000 @@ -1,6 +1,7 @@ -2011-04-05 Deniz Dogan +2011-04-05 Deniz Dogan - * net/rcirc.el (rcirc-mode-map): Remove M-o binding. + * net/rcirc.el: Update my e-mail address. + (rcirc-mode-map): Remove M-o binding. 2011-04-05 Chong Yidong === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-04-05 04:31:24 +0000 +++ lisp/net/rcirc.el 2011-04-05 04:33:38 +0000 @@ -4,7 +4,7 @@ ;; Author: Ryan Yeske ;; Maintainers: Ryan Yeske , -;; Deniz Dogan +;; Deniz Dogan ;; Keywords: comm ;; This file is part of GNU Emacs. ------------------------------------------------------------ revno: 103826 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Tue 2011-04-05 06:31:24 +0200 message: * lisp/net/rcirc.el (rcirc-mode-map): Remove M-o binding. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-05 01:21:52 +0000 +++ lisp/ChangeLog 2011-04-05 04:31:24 +0000 @@ -1,3 +1,7 @@ +2011-04-05 Deniz Dogan + + * net/rcirc.el (rcirc-mode-map): Remove M-o binding. + 2011-04-05 Chong Yidong * startup.el (command-line): Save the cursor's theme-face === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-03-31 12:19:17 +0000 +++ lisp/net/rcirc.el 2011-04-05 04:31:24 +0000 @@ -900,7 +900,6 @@ (define-key map (kbd "C-c C-m") 'rcirc-cmd-msg) (define-key map (kbd "C-c C-r") 'rcirc-cmd-nick) ; rename (define-key map (kbd "C-c C-o") 'rcirc-omit-mode) - (define-key map (kbd "M-o") 'rcirc-omit-mode) (define-key map (kbd "C-c C-p") 'rcirc-cmd-part) (define-key map (kbd "C-c C-q") 'rcirc-cmd-query) (define-key map (kbd "C-c C-t") 'rcirc-cmd-topic) ------------------------------------------------------------ revno: 103825 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-04-04 21:21:52 -0400 message: Fix theme and X-resource interactions for the cursor face. * lisp/startup.el (command-line): Save the cursor's theme-face directly, instead of using face-override-spec. * lisp/custom.el (load-theme): Minor optimization in assigning faces. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-04 22:08:01 +0000 +++ lisp/ChangeLog 2011-04-05 01:21:52 +0000 @@ -1,3 +1,10 @@ +2011-04-05 Chong Yidong + + * startup.el (command-line): Save the cursor's theme-face + directly, instead of using face-override-spec. + + * custom.el (load-theme): Minor optimization in assigning faces. + 2011-04-04 Juanma Barranquero * help-fns.el (describe-variable): Complete all variables having === modified file 'lisp/custom.el' --- lisp/custom.el 2011-03-31 04:24:03 +0000 +++ lisp/custom.el 2011-04-05 01:21:52 +0000 @@ -1151,6 +1151,20 @@ (custom-theme-load-confirm hash)) (let ((custom--inhibit-theme-enable t)) (eval-buffer)) + ;; Optimization: if the theme changes the `default' face, put that + ;; entry first. This avoids some `frame-set-background-mode' rigmarole + ;; by assigning the new background immediately. + (let* ((settings (get theme 'theme-settings)) + (tail settings) + found) + (while (and tail (not found)) + (and (eq (nth 0 (car tail)) 'theme-face) + (eq (nth 1 (car tail)) 'default) + (setq found (car tail))) + (setq tail (cdr tail))) + (if found + (put theme 'theme-settings (cons found (delq found settings))))) + ;; Finally, enable the theme. (unless no-enable (enable-theme theme)) t)))) === modified file 'lisp/startup.el' --- lisp/startup.el 2011-03-30 03:27:56 +0000 +++ lisp/startup.el 2011-04-05 01:21:52 +0000 @@ -906,7 +906,8 @@ ;; spec, but mark it as changed outside of Customize. (let ((color (x-get-resource "cursorColor" "CursorColor"))) (when color - (face-spec-set 'cursor `((t (:background ,color)))) + (put 'cursor 'theme-face + `((changed ((t :background ,color))))) (put 'cursor 'face-modified t))))) (frame-initialize)) ------------------------------------------------------------ revno: 103824 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2011-04-05 00:33:12 +0200 message: lisp/help-fns.el: Fix mistake in previous change. diff: === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2011-04-04 22:08:01 +0000 +++ lisp/help-fns.el 2011-04-04 22:33:12 +0000 @@ -636,7 +636,7 @@ obarray (lambda (vv) (or (get vv 'variable-documentation) - (not (keywordp vv)))) + (and (boundp vv) (not (keywordp vv))))) t nil nil (if (symbolp v) (symbol-name v)))) (list (if (equal val "") ------------------------------------------------------------ revno: 103823 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2011-04-05 00:08:01 +0200 message: lisp/help-fns.el (describe-variable): Fix completion. http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00112.html diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-04 09:35:16 +0000 +++ lisp/ChangeLog 2011-04-04 22:08:01 +0000 @@ -1,5 +1,11 @@ 2011-04-04 Juanma Barranquero + * help-fns.el (describe-variable): Complete all variables having + documentation, including keywords. + http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00112.html + +2011-04-04 Juanma Barranquero + Convert to lexical-binding. * bs.el (bs-refresh, bs-sort-buffer-interns-are-last) === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2011-04-04 09:35:16 +0000 +++ lisp/help-fns.el 2011-04-04 22:08:01 +0000 @@ -635,8 +635,8 @@ "Describe variable: ") obarray (lambda (vv) - (or (special-variable-p vv) - (get vv 'variable-documentation))) + (or (get vv 'variable-documentation) + (not (keywordp vv)))) t nil nil (if (symbolp v) (symbol-name v)))) (list (if (equal val "") ------------------------------------------------------------ revno: 103822 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-04-04 14:03:08 +0000 message: gnus-sum.el (gnus-update-marks): Reinstate the code to not alter marks on non-selected articles. gnus-start.el (gnus-get-unread-articles): Don't try to contact denied servers. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-04-02 23:41:03 +0000 +++ lisp/gnus/ChangeLog 2011-04-04 14:03:08 +0000 @@ -1,3 +1,8 @@ +2011-04-03 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-update-marks): Reinstate the code to not alter + marks on non-selected articles. + 2011-04-02 Chong Yidong * proto-stream.el: Move to Emacs core, at net/network-stream.el. @@ -10,6 +15,11 @@ * mm-view.el (mm-display-inline-fontify): Do not fontify with fundamental-mode. +2011-04-01 Lars Magne Ingebrigtsen + + * gnus-start.el (gnus-get-unread-articles): Don't try to contact denied + servers. + 2011-03-30 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-update-marks): Revert intersection change, which === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2011-03-15 22:38:41 +0000 +++ lisp/gnus/gnus-start.el 2011-04-04 14:03:08 +0000 @@ -1723,7 +1723,9 @@ ;; Do the rest of the retrieval. (dolist (elem type-cache) (destructuring-bind (method method-type infos early-data) elem - (when (and method infos) + (when (and method infos + (not (eq (gnus-server-status method) + 'denied))) (let ((updatep (gnus-check-backend-function 'request-update-info (car method)))) ;; See if any of the groups from this method require updating. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-03-31 13:31:56 +0000 +++ lisp/gnus/gnus-sum.el 2011-04-04 14:03:08 +0000 @@ -6070,12 +6070,15 @@ (let* ((old (cdr (assq (cdr type) (gnus-info-marks info)))) ;; Don't do anything about marks for articles we ;; didn't actually get any headers for. - (existing (gnus-compress-sequence gnus-newsgroup-articles)) (del - (gnus-remove-from-range (gnus-copy-sequence old) list)) + (gnus-list-range-intersection + gnus-newsgroup-articles + (gnus-remove-from-range (gnus-copy-sequence old) list))) (add - (gnus-remove-from-range - (gnus-copy-sequence list) old))) + (gnus-list-range-intersection + gnus-newsgroup-articles + (gnus-remove-from-range + (gnus-copy-sequence list) old)))) (when add (push (list add 'add (list (cdr type))) delta-marks)) (when del ------------------------------------------------------------ revno: 103821 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-04-04 11:35:16 +0200 message: Convert some .el files to lexical scoping. * bs.el (bs-refresh, bs-sort-buffer-interns-are-last) (bs--get-marked-string, bs--get-modified-string) (bs--get-readonly-string, bs--get-size-string, bs--get-name) (bs--get-mode-name, bs--get-file-name): Mark unused arguments. (bs--configuration-name-for-prefix-arg): Rename argument PREFIX-ARG. * ehelp.el (electric-help-execute-extended) (electric-help-ctrl-x-prefix): * hexl.el (hexl-revert-buffer-function): * linum.el (linum-after-change, linum-after-scroll): * emacs-lisp/re-builder.el (reb-auto-update): Mark unused arguments. * help-fns.el (help-describe-category-set): Remove unused ERR variable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-04 06:16:23 +0000 +++ lisp/ChangeLog 2011-04-04 09:35:16 +0000 @@ -1,3 +1,21 @@ +2011-04-04 Juanma Barranquero + + Convert to lexical-binding. + + * bs.el (bs-refresh, bs-sort-buffer-interns-are-last) + (bs--get-marked-string, bs--get-modified-string) + (bs--get-readonly-string, bs--get-size-string, bs--get-name) + (bs--get-mode-name, bs--get-file-name): Mark unused arguments. + (bs--configuration-name-for-prefix-arg): Rename argument PREFIX-ARG. + + * ehelp.el (electric-help-execute-extended) + (electric-help-ctrl-x-prefix): + * hexl.el (hexl-revert-buffer-function): + * linum.el (linum-after-change, linum-after-scroll): + * emacs-lisp/re-builder.el (reb-auto-update): Mark unused arguments. + + * help-fns.el (help-describe-category-set): Remove unused ERR variable. + 2011-04-04 Daiki Ueno * epa-dired.el: @@ -262,7 +280,7 @@ 2011-03-31 Tassilo Horn * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's - an entry for that server in rcirc-authinfo. (Bug#8385) + an entry for that server in rcirc-authinfo. (Bug#8385) 2011-03-31 Glenn Morris === modified file 'lisp/bs.el' --- lisp/bs.el 2011-02-12 22:23:06 +0000 +++ lisp/bs.el 2011-04-04 09:35:16 +0000 @@ -1,4 +1,4 @@ -;;; bs.el --- menu for selecting and displaying buffers +;;; bs.el --- menu for selecting and displaying buffers -*- lexical-binding: t -*- ;; Copyright (C) 1998-2011 Free Software Foundation, Inc. ;; Author: Olaf Sylvester @@ -693,7 +693,7 @@ (call-interactively 'bs-set-configuration) (bs--redisplay t)) -(defun bs-refresh (&rest ignored) +(defun bs-refresh (&rest _ignored) "Refresh whole Buffer Selection Menu. Arguments are IGNORED (for `revert-buffer')." (interactive) @@ -1017,7 +1017,7 @@ A value of nil means BUFFER belongs to a file." (not (buffer-file-name buffer))) -(defun bs-sort-buffer-interns-are-last (b1 b2) +(defun bs-sort-buffer-interns-are-last (_b1 b2) "Function for sorting internal buffers at the end of all buffers." (string-match-p "^\\*" (buffer-name b2))) @@ -1262,7 +1262,7 @@ fun) (t (apply fun args)))) -(defun bs--get-marked-string (start-buffer all-buffers) +(defun bs--get-marked-string (start-buffer _all-buffers) "Return a string which describes whether current buffer is marked. START-BUFFER is the buffer where we started buffer selection. ALL-BUFFERS is the list of buffers appearing in Buffer Selection Menu. @@ -1287,25 +1287,25 @@ (t bs-string-show-always))) -(defun bs--get-modified-string (start-buffer all-buffers) +(defun bs--get-modified-string (_start-buffer _all-buffers) "Return a string which describes whether current buffer is modified. START-BUFFER is the buffer where we started buffer selection. ALL-BUFFERS is the list of buffers appearing in Buffer Selection Menu." (if (buffer-modified-p) "*" " ")) -(defun bs--get-readonly-string (start-buffer all-buffers) +(defun bs--get-readonly-string (_start-buffer _all-buffers) "Return a string which describes whether current buffer is read only. START-BUFFER is the buffer where we started buffer selection. ALL-BUFFERS is the list of buffers appearing in Buffer Selection Menu." (if buffer-read-only "%" " ")) -(defun bs--get-size-string (start-buffer all-buffers) +(defun bs--get-size-string (_start-buffer _all-buffers) "Return a string which describes the size of current buffer. START-BUFFER is the buffer where we started buffer selection. ALL-BUFFERS is the list of buffers appearing in Buffer Selection Menu." (int-to-string (buffer-size))) -(defun bs--get-name (start-buffer all-buffers) +(defun bs--get-name (_start-buffer _all-buffers) "Return name of current buffer for Buffer Selection Menu. The name of current buffer gets additional text properties for mouse highlighting. @@ -1315,13 +1315,13 @@ 'help-echo "mouse-2: select this buffer, mouse-3: select in other frame" 'mouse-face 'highlight)) -(defun bs--get-mode-name (start-buffer all-buffers) +(defun bs--get-mode-name (start-buffer _all-buffers) "Return the name of mode of current buffer for Buffer Selection Menu. START-BUFFER is the buffer where we started buffer selection. ALL-BUFFERS is the list of buffers appearing in Buffer Selection Menu." (format-mode-line mode-name nil nil start-buffer)) -(defun bs--get-file-name (start-buffer all-buffers) +(defun bs--get-file-name (_start-buffer _all-buffers) "Return string for column 'File' in Buffer Selection Menu. This is the variable `buffer-file-name' of current buffer. If not visiting a file, `list-buffers-directory' is returned instead. @@ -1420,18 +1420,18 @@ (bs-show-in-buffer liste) (bs-message-without-log "%s" (bs--current-config-message))))) -(defun bs--configuration-name-for-prefix-arg (prefix-arg) - "Convert prefix argument PREFIX-ARG to a name of a buffer configuration. -If PREFIX-ARG is nil return `bs-default-configuration'. -If PREFIX-ARG is an integer return PREFIX-ARG element of `bs-configurations'. +(defun bs--configuration-name-for-prefix-arg (prefix) + "Convert prefix argument PREFIX to a name of a buffer configuration. +If PREFIX is nil return `bs-default-configuration'. +If PREFIX is an integer return PREFIX element of `bs-configurations'. Otherwise return `bs-alternative-configuration'." (cond ;; usually activation - ((null prefix-arg) + ((null prefix) bs-default-configuration) ;; call with integer as prefix argument - ((integerp prefix-arg) - (if (and (< 0 prefix-arg) (<= prefix-arg (length bs-configurations))) - (car (nth (1- prefix-arg) bs-configurations)) + ((integerp prefix) + (if (and (< 0 prefix) (<= prefix (length bs-configurations))) + (car (nth (1- prefix) bs-configurations)) bs-default-configuration)) ;; call by prefix argument C-u (t bs-alternative-configuration))) === modified file 'lisp/ehelp.el' --- lisp/ehelp.el 2011-01-25 04:08:28 +0000 +++ lisp/ehelp.el 2011-04-04 09:35:16 +0000 @@ -1,4 +1,4 @@ -;;; ehelp.el --- bindings for electric-help mode +;;; ehelp.el --- bindings for electric-help mode -*- lexical-binding: t -*- ;; Copyright (C) 1986, 1995, 2000-2011 Free Software Foundation, Inc. @@ -347,14 +347,14 @@ ;; This is to be bound to M-x in ehelp mode. Retains ehelp buffer and then ;; continues with execute-extended-command. -(defun electric-help-execute-extended (prefixarg) +(defun electric-help-execute-extended (_prefixarg) (interactive "p") (setq electric-help-form-to-execute '(execute-extended-command nil)) (electric-help-retain)) ;; This is to be buond to C-x in ehelp mode. Retains ehelp buffer and then ;; continues with ctrl-x prefix. -(defun electric-help-ctrl-x-prefix (prefixarg) +(defun electric-help-ctrl-x-prefix (_prefixarg) (interactive "p") (setq electric-help-form-to-execute '(progn (message nil) (setq unread-command-char ?\C-x))) (electric-help-retain)) === modified file 'lisp/emacs-lisp/re-builder.el' --- lisp/emacs-lisp/re-builder.el 2011-02-10 16:56:00 +0000 +++ lisp/emacs-lisp/re-builder.el 2011-04-04 09:35:16 +0000 @@ -1,4 +1,4 @@ -;;; re-builder.el --- building Regexps with visual feedback +;;; re-builder.el --- building Regexps with visual feedback -*- lexical-binding: t -*- ;; Copyright (C) 1999-2011 Free Software Foundation, Inc. @@ -506,7 +506,7 @@ (reb-update-regexp) (reb-update-overlays subexp)) -(defun reb-auto-update (beg end lenold &optional force) +(defun reb-auto-update (_beg _end _lenold &optional force) "Called from `after-update-functions' to update the display. BEG, END and LENOLD are passed in from the hook. An actual update is only done if the regexp has changed or if the === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2011-03-21 16:42:16 +0000 +++ lisp/help-fns.el 2011-04-04 09:35:16 +0000 @@ -1,4 +1,4 @@ -;;; help-fns.el --- Complex help functions +;;; help-fns.el --- Complex help functions -*- lexical-binding: t -*- ;; Copyright (C) 1985-1986, 1993-1994, 1998-2011 ;; Free Software Foundation, Inc. @@ -879,7 +879,7 @@ (insert (cond ((null value) "default") ((char-table-p value) "deeper char-table ...") - (t (condition-case err + (t (condition-case nil (category-set-mnemonics value) (error "invalid")))))) === modified file 'lisp/hexl.el' --- lisp/hexl.el 2011-01-25 04:08:28 +0000 +++ lisp/hexl.el 2011-04-04 09:35:16 +0000 @@ -1,4 +1,4 @@ -;;; hexl.el --- edit a file in a hex dump format using the hexl filter +;;; hexl.el --- edit a file in a hex dump format using the hexl filter -*- lexical-binding: t -*- ;; Copyright (C) 1989, 1994, 1998, 2001-2011 Free Software Foundation, Inc. @@ -355,7 +355,7 @@ (hexl-mode--setq-local 'require-final-newline nil) - + (hexl-mode--setq-local 'font-lock-defaults '(hexl-font-lock-keywords t)) (hexl-mode--setq-local 'revert-buffer-function @@ -437,7 +437,7 @@ (if (not (eq major-mode 'hexl-mode)) (hexl-mode))) -(defun hexl-revert-buffer-function (ignore-auto noconfirm) +(defun hexl-revert-buffer-function (_ignore-auto _noconfirm) (let ((coding-system-for-read 'no-conversion) revert-buffer-function) ;; Call the original `revert-buffer' without code conversion; also @@ -492,7 +492,7 @@ ;; since some of them may affect the minor modes. (dolist (mm mms) (funcall (car mm) (if (cdr mm) 1 -1)))) - + (force-mode-line-update)) (defun hexl-maybe-dehexlify-buffer () === modified file 'lisp/linum.el' --- lisp/linum.el 2011-01-25 04:08:28 +0000 +++ lisp/linum.el 2011-04-04 09:35:16 +0000 @@ -1,4 +1,4 @@ -;;; linum.el --- display line numbers in the left margin +;;; linum.el --- display line numbers in the left margin -*- lexical-binding: t -*- ;; Copyright (C) 2008-2011 Free Software Foundation, Inc. @@ -174,14 +174,14 @@ (setq line (1+ line))) (set-window-margins win width (cdr (window-margins win))))) -(defun linum-after-change (beg end len) +(defun linum-after-change (beg end _len) ;; update overlays on deletions, and after newlines are inserted (when (or (= beg end) (= end (point-max)) (string-match-p "\n" (buffer-substring-no-properties beg end))) (linum-update-current))) -(defun linum-after-scroll (win start) +(defun linum-after-scroll (win _start) (linum-update (window-buffer win))) ;; (defun linum-after-size (frame) ------------------------------------------------------------ revno: 103820 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-04-04 11:28:26 +0200 message: lisp/dired.el: Update autoloads. diff: === modified file 'lisp/dired.el' --- lisp/dired.el 2011-03-21 16:42:16 +0000 +++ lisp/dired.el 2011-04-04 09:28:26 +0000 @@ -3629,7 +3629,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "2d805d6766bd7970cd446413b4ed4ce0") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "0488aa71a7abdb8dcc9ce90201114ebc") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -3766,7 +3766,7 @@ \(fn COMMAND &optional ARG FILE-LIST)" t nil) (autoload 'dired-run-shell-command "dired-aux" "\ -Not documented + \(fn COMMAND)" nil nil) @@ -3785,7 +3785,7 @@ \(fn &optional ARG FMT)" t nil) (autoload 'dired-compress-file "dired-aux" "\ -Not documented + \(fn FILE)" nil nil) @@ -3834,12 +3834,12 @@ \(fn &optional ARG TEST-FOR-SUBDIR)" t nil) (autoload 'dired-add-file "dired-aux" "\ -Not documented + \(fn FILENAME &optional MARKER-CHAR)" nil nil) (autoload 'dired-remove-file "dired-aux" "\ -Not documented + \(fn FILE)" nil nil) @@ -3849,12 +3849,12 @@ \(fn FILE)" nil nil) (autoload 'dired-copy-file "dired-aux" "\ -Not documented + \(fn FROM TO OK-FLAG)" nil nil) (autoload 'dired-rename-file "dired-aux" "\ -Not documented + \(fn FILE NEWNAME OK-IF-ALREADY-EXISTS)" nil nil) ------------------------------------------------------------ revno: 103819 committer: Daiki Ueno branch nick: trunk timestamp: Mon 2011-04-04 15:16:23 +0900 message: Use lexical binding in ep[ga]*.el. * epa-dired.el: * epa-mail.el: * epa-hook.el: * epa-file.el: * epa.el: * epg.el: Use lexical binding. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-03 21:23:23 +0000 +++ lisp/ChangeLog 2011-04-04 06:16:23 +0000 @@ -1,3 +1,12 @@ +2011-04-04 Daiki Ueno + + * epa-dired.el: + * epa-mail.el: + * epa-hook.el: + * epa-file.el: + * epa.el: + * epg.el: Use lexical binding. + 2011-04-03 Chong Yidong * dired-aux.el (dired-create-files): Add docstring (Bug#7970). === modified file 'lisp/epa-dired.el' --- lisp/epa-dired.el 2011-01-25 04:08:28 +0000 +++ lisp/epa-dired.el 2011-04-04 06:16:23 +0000 @@ -1,4 +1,4 @@ -;;; epa-dired.el --- the EasyPG Assistant, dired extension +;;; epa-dired.el --- the EasyPG Assistant, dired extension -*- lexical-binding: t -*- ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. ;; Author: Daiki Ueno === modified file 'lisp/epa-file.el' --- lisp/epa-file.el 2011-02-12 23:40:43 +0000 +++ lisp/epa-file.el 2011-04-04 06:16:23 +0000 @@ -1,4 +1,4 @@ -;;; epa-file.el --- the EasyPG Assistant, transparent file encryption +;;; epa-file.el --- the EasyPG Assistant, transparent file encryption -*- lexical-binding: t -*- ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. ;; Author: Daiki Ueno === modified file 'lisp/epa-hook.el' --- lisp/epa-hook.el 2011-01-25 04:08:28 +0000 +++ lisp/epa-hook.el 2011-04-04 06:16:23 +0000 @@ -1,4 +1,4 @@ -;;; epa-hook.el --- preloaded code to enable epa-file.el +;;; epa-hook.el --- preloaded code to enable epa-file.el -*- lexical-binding: t -*- ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. ;; Author: Daiki Ueno === modified file 'lisp/epa-mail.el' --- lisp/epa-mail.el 2011-01-25 04:08:28 +0000 +++ lisp/epa-mail.el 2011-04-04 06:16:23 +0000 @@ -1,4 +1,4 @@ -;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer +;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer -*- lexical-binding: t -*- ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. ;; Author: Daiki Ueno @@ -117,7 +117,7 @@ (save-excursion (let ((verbose current-prefix-arg) (context (epg-make-context epa-protocol)) - recipients-string recipients recipient-key) + recipients-string recipients recipient-key sign) (goto-char (point-min)) (save-restriction (narrow-to-region (point) === modified file 'lisp/epa.el' --- lisp/epa.el 2011-01-26 08:36:39 +0000 +++ lisp/epa.el 2011-04-04 06:16:23 +0000 @@ -1,4 +1,4 @@ -;;; epa.el --- the EasyPG Assistant +;;; epa.el --- the EasyPG Assistant -*- lexical-binding: t -*- ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. @@ -269,7 +269,7 @@ :action 'epa--key-widget-action :help-echo 'epa--key-widget-help-echo) -(defun epa--key-widget-action (widget &optional event) +(defun epa--key-widget-action (widget &optional _event) (save-selected-window (epa--show-key (widget-get widget :value)))) @@ -460,7 +460,7 @@ (list nil))) (epa--list-keys name t)) -(defun epa--key-list-revert-buffer (&optional ignore-auto noconfirm) +(defun epa--key-list-revert-buffer (&optional _ignore-auto _noconfirm) (apply #'epa--list-keys epa-list-keys-arguments)) (defun epa--marked-keys () @@ -490,13 +490,13 @@ - `\\[epa-mark-key]' to mark a key on the line - `\\[epa-unmark-key]' to unmark a key on the line\n")) (widget-create 'link - :notify (lambda (&rest ignore) (abort-recursive-edit)) + :notify (lambda (&rest _ignore) (abort-recursive-edit)) :help-echo (substitute-command-keys "Click here or \\[abort-recursive-edit] to cancel") "Cancel") (widget-create 'link - :notify (lambda (&rest ignore) (exit-recursive-edit)) + :notify (lambda (&rest _ignore) (exit-recursive-edit)) :help-echo (substitute-command-keys "Click here or \\[exit-recursive-edit] to finish") @@ -649,7 +649,7 @@ (format "Passphrase for %s %s: " key-id (cdr entry)) (format "Passphrase for %s: " key-id))))))) -(defun epa-progress-callback-function (context what char current total +(defun epa-progress-callback-function (_context what _char current total handback) (message "%s%d%% (%d/%d)" (or handback (concat what ": ")) @@ -964,7 +964,7 @@ (eval-and-compile (if (fboundp 'select-safe-coding-system) (defalias 'epa--select-safe-coding-system 'select-safe-coding-system) - (defun epa--select-safe-coding-system (from to) + (defun epa--select-safe-coding-system (_from _to) buffer-file-coding-system))) ;;;###autoload === modified file 'lisp/epg.el' --- lisp/epg.el 2011-02-12 23:40:43 +0000 +++ lisp/epg.el 2011-04-04 06:16:23 +0000 @@ -1,4 +1,4 @@ -;;; epg.el --- the EasyPG Library +;;; epg.el --- the EasyPG Library -*- lexical-binding: t -*- ;; Copyright (C) 1999-2000, 2002-2011 Free Software Foundation, Inc. ;; Author: Daiki Ueno @@ -1223,7 +1223,7 @@ (defalias 'epg--decode-coding-string 'decode-coding-string) (defalias 'epg--decode-coding-string 'identity))) -(defun epg--status-USERID_HINT (context string) +(defun epg--status-USERID_HINT (_context string) (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string) (let* ((key-id (match-string 1 string)) (user-id (match-string 2 string)) @@ -1238,14 +1238,14 @@ (setq epg-user-id-alist (cons (cons key-id user-id) epg-user-id-alist)))))) -(defun epg--status-NEED_PASSPHRASE (context string) +(defun epg--status-NEED_PASSPHRASE (_context string) (if (string-match "\\`\\([^ ]+\\)" string) (setq epg-key-id (match-string 1 string)))) -(defun epg--status-NEED_PASSPHRASE_SYM (context string) +(defun epg--status-NEED_PASSPHRASE_SYM (_context _string) (setq epg-key-id 'SYM)) -(defun epg--status-NEED_PASSPHRASE_PIN (context string) +(defun epg--status-NEED_PASSPHRASE_PIN (_context _string) (setq epg-key-id 'PIN)) (eval-and-compile @@ -1308,11 +1308,11 @@ (if encoded-passphrase-with-new-line (epg--clear-string encoded-passphrase-with-new-line)))))) -(defun epg--prompt-GET_BOOL (context string) +(defun epg--prompt-GET_BOOL (_context string) (let ((entry (assoc string epg-prompt-alist))) (y-or-n-p (if entry (cdr entry) (concat string "? "))))) -(defun epg--prompt-GET_BOOL-untrusted_key.override (context string) +(defun epg--prompt-GET_BOOL-untrusted_key.override (_context _string) (y-or-n-p (if (and (equal (car epg-last-status) "USERID_HINT") (string-match "\\`\\([^ ]+\\) \\(.*\\)" (cdr epg-last-status))) @@ -1467,31 +1467,31 @@ signature (string-to-number (match-string 7 string) 16))))) -(defun epg--status-TRUST_UNDEFINED (context string) +(defun epg--status-TRUST_UNDEFINED (context _string) (let ((signature (car (epg-context-result-for context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'undefined)))) -(defun epg--status-TRUST_NEVER (context string) +(defun epg--status-TRUST_NEVER (context _string) (let ((signature (car (epg-context-result-for context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'never)))) -(defun epg--status-TRUST_MARGINAL (context string) +(defun epg--status-TRUST_MARGINAL (context _string) (let ((signature (car (epg-context-result-for context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'marginal)) (epg-signature-set-validity signature 'marginal)))) -(defun epg--status-TRUST_FULLY (context string) +(defun epg--status-TRUST_FULLY (context _string) (let ((signature (car (epg-context-result-for context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'full)))) -(defun epg--status-TRUST_ULTIMATE (context string) +(defun epg--status-TRUST_ULTIMATE (context _string) (let ((signature (car (epg-context-result-for context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) @@ -1541,10 +1541,10 @@ (string-to-number (match-string 3 string))) (epg-context-result-for context 'encrypted-to))))) -(defun epg--status-DECRYPTION_FAILED (context string) +(defun epg--status-DECRYPTION_FAILED (context _string) (epg-context-set-result-for context 'decryption-failed t)) -(defun epg--status-DECRYPTION_OKAY (context string) +(defun epg--status-DECRYPTION_OKAY (context _string) (epg-context-set-result-for context 'decryption-okay t)) (defun epg--status-NODATA (context string) @@ -1566,13 +1566,13 @@ (epg--time-from-seconds string))) (epg-context-result-for context 'error)))) -(defun epg--status-KEYREVOKED (context string) +(defun epg--status-KEYREVOKED (context _string) (epg-context-set-result-for context 'key (cons '(key-revoked) (epg-context-result-for context 'error)))) -(defun epg--status-BADARMOR (context string) +(defun epg--status-BADARMOR (context _string) (epg-context-set-result-for context 'error (cons '(bad-armor) @@ -1589,7 +1589,7 @@ (match-string 2 string))) (epg-context-result-for context 'error))))) -(defun epg--status-NO_RECP (context string) +(defun epg--status-NO_RECP (context _string) (epg-context-set-result-for context 'error (cons '(no-recipients) @@ -1626,13 +1626,13 @@ (cons 'fingerprint (match-string 2 string))) (epg-context-result-for context 'generate-key))))) -(defun epg--status-KEY_NOT_CREATED (context string) +(defun epg--status-KEY_NOT_CREATED (context _string) (epg-context-set-result-for context 'error (cons '(key-not-created) (epg-context-result-for context 'error)))) -(defun epg--status-IMPORTED (context string) +(defun epg--status-IMPORTED (_context string) (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string) (let* ((key-id (match-string 1 string)) (user-id (match-string 2 string)) @@ -1694,7 +1694,7 @@ (epg-context-result-for context 'import-status))) (epg-context-set-result-for context 'import-status nil))) -(defun epg-passphrase-callback-function (context key-id handback) +(defun epg-passphrase-callback-function (context key-id _handback) (if (eq key-id 'SYM) (read-passwd "Passphrase for symmetric encryption: " (eq (epg-context-operation context) 'encrypt))