diff options
| author | Artur Malabarba | 2015-06-22 16:20:46 +0100 |
|---|---|---|
| committer | Artur Malabarba | 2015-06-22 19:02:08 +0100 |
| commit | a9d9b66ebbf8a9797137c873bb2d194c529e9384 (patch) | |
| tree | 6843229e10a5a70444c8aa68269281f6fdfc96e9 | |
| parent | c4c531bbee86f45a18b2af168f705a3e53aa7327 (diff) | |
| download | emacs-a9d9b66ebbf8a9797137c873bb2d194c529e9384.tar.gz emacs-a9d9b66ebbf8a9797137c873bb2d194c529e9384.zip | |
* lisp/emacs-lisp/package.el: Rename hide-obsolete to toggle-hiding
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 22 |
2 files changed, 12 insertions, 12 deletions
| @@ -316,7 +316,7 @@ always respect that. | |||
| 316 | priority (as per `package-archive-priorities') only that one is | 316 | priority (as per `package-archive-priorities') only that one is |
| 317 | listed. This can be configured with `package-menu-hide-low-priority'. | 317 | listed. This can be configured with `package-menu-hide-low-priority'. |
| 318 | 318 | ||
| 319 | *** `package-menu-hide-obsolete' now toggles the hiding of packages. | 319 | *** `package-menu-toggle-hiding' now toggles the hiding of packages. |
| 320 | This includes the above-mentioned low-priority packages, as well as | 320 | This includes the above-mentioned low-priority packages, as well as |
| 321 | available packages whose version is lower than the currently installed | 321 | available packages whose version is lower than the currently installed |
| 322 | version (which were previously impossible to display). | 322 | version (which were previously impossible to display). |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 62900e08360..d6a3832016d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -237,8 +237,8 @@ This variable has three possible values: | |||
| 237 | archive: only criteria (a) is used; | 237 | archive: only criteria (a) is used; |
| 238 | t: both criteria are used. | 238 | t: both criteria are used. |
| 239 | 239 | ||
| 240 | This variable has no effect if `package-menu--hide-obsolete' is | 240 | This variable has no effect if `package-menu--hide-packages' is |
| 241 | nil, so it can be toggled with \\<package-menu-mode-map> \\[package-menu-hide-obsolete]." | 241 | nil, so it can be toggled with \\<package-menu-mode-map> \\[package-menu-toggle-hiding]." |
| 242 | :type '(choice (const :tag "Don't hide anything" nil) | 242 | :type '(choice (const :tag "Don't hide anything" nil) |
| 243 | (const :tag "Hide per package-archive-priorities" | 243 | (const :tag "Hide per package-archive-priorities" |
| 244 | archive) | 244 | archive) |
| @@ -2379,7 +2379,7 @@ will be deleted." | |||
| 2379 | (define-key map "x" 'package-menu-execute) | 2379 | (define-key map "x" 'package-menu-execute) |
| 2380 | (define-key map "h" 'package-menu-quick-help) | 2380 | (define-key map "h" 'package-menu-quick-help) |
| 2381 | (define-key map "?" 'package-menu-describe-package) | 2381 | (define-key map "?" 'package-menu-describe-package) |
| 2382 | (define-key map "(" #'package-menu-hide-obsolete) | 2382 | (define-key map "(" #'package-menu-toggle-hiding) |
| 2383 | (define-key map [menu-bar package-menu] (cons "Package" menu-map)) | 2383 | (define-key map [menu-bar package-menu] (cons "Package" menu-map)) |
| 2384 | (define-key menu-map [mq] | 2384 | (define-key menu-map [mq] |
| 2385 | '(menu-item "Quit" quit-window | 2385 | '(menu-item "Quit" quit-window |
| @@ -2538,26 +2538,26 @@ of these dependencies, similar to the list returned by | |||
| 2538 | (cond | 2538 | (cond |
| 2539 | ;; Installed obsolete packages are handled in the `dir' | 2539 | ;; Installed obsolete packages are handled in the `dir' |
| 2540 | ;; clause above. Here we handle available obsolete, which | 2540 | ;; clause above. Here we handle available obsolete, which |
| 2541 | ;; are displayed depending on `package-menu--hide-obsolete'. | 2541 | ;; are displayed depending on `package-menu--hide-packages'. |
| 2542 | ((and ins (version-list-<= version ins-v)) "avail-obso") | 2542 | ((and ins (version-list-<= version ins-v)) "avail-obso") |
| 2543 | (t | 2543 | (t |
| 2544 | (if (memq name package-menu--new-package-list) | 2544 | (if (memq name package-menu--new-package-list) |
| 2545 | "new" "available")))))))) | 2545 | "new" "available")))))))) |
| 2546 | 2546 | ||
| 2547 | (defvar package-menu--hide-obsolete t | 2547 | (defvar package-menu--hide-packages t |
| 2548 | "Whether available obsolete packages should be hidden. | 2548 | "Whether available obsolete packages should be hidden. |
| 2549 | Can be toggled with \\<package-menu-mode-map> \\[package-menu-hide-obsolete]. | 2549 | Can be toggled with \\<package-menu-mode-map> \\[package-menu-toggle-hiding]. |
| 2550 | Installed obsolete packages are always displayed.") | 2550 | Installed obsolete packages are always displayed.") |
| 2551 | 2551 | ||
| 2552 | (defun package-menu-hide-obsolete () | 2552 | (defun package-menu-toggle-hiding () |
| 2553 | "Toggle visibility of obsolete available packages." | 2553 | "Toggle visibility of obsolete available packages." |
| 2554 | (interactive) | 2554 | (interactive) |
| 2555 | (unless (derived-mode-p 'package-menu-mode) | 2555 | (unless (derived-mode-p 'package-menu-mode) |
| 2556 | (user-error "The current buffer is not a Package Menu")) | 2556 | (user-error "The current buffer is not a Package Menu")) |
| 2557 | (setq package-menu--hide-obsolete | ||
| 2558 | (not package-menu--hide-obsolete)) | ||
| 2559 | (message "%s available-obsolete packages" (if package-menu--hide-obsolete | 2557 | (message "%s available-obsolete packages" (if package-menu--hide-obsolete |
| 2560 | "Hiding" "Displaying")) | 2558 | "Hiding" "Displaying")) |
| 2559 | (setq package-menu--hide-packages | ||
| 2560 | (not package-menu--hide-packages)) | ||
| 2561 | (revert-buffer nil 'no-confirm)) | 2561 | (revert-buffer nil 'no-confirm)) |
| 2562 | 2562 | ||
| 2563 | (defun package--remove-hidden (pkg-list) | 2563 | (defun package--remove-hidden (pkg-list) |
| @@ -2567,8 +2567,8 @@ same name, sorted by decreasing `package-desc-priority-version'. | |||
| 2567 | Return a list of packages tied for the highest priority according | 2567 | Return a list of packages tied for the highest priority according |
| 2568 | to their archives." | 2568 | to their archives." |
| 2569 | (when pkg-list | 2569 | (when pkg-list |
| 2570 | ;; Variable toggled with `package-menu-hide-obsolete'. | 2570 | ;; Variable toggled with `package-menu-toggle-hiding'. |
| 2571 | (if (not package-menu--hide-obsolete) | 2571 | (if (not package-menu--hide-packages) |
| 2572 | pkg-list | 2572 | pkg-list |
| 2573 | (let ((installed (cadr (assq (package-desc-name (car pkg-list)) | 2573 | (let ((installed (cadr (assq (package-desc-name (car pkg-list)) |
| 2574 | package-alist)))) | 2574 | package-alist)))) |