From: Andreas Gerler Date: Sun, 26 Nov 2023 15:34:11 +0000 (+0100) Subject: update bookmark+ X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=54225dda3a5b240b9f5149f5dff06c2174f0b016;p=emacsconfig.git update bookmark+ Signed-off-by: Andreas Gerler --- diff --git a/lisp/bookmark+-1.el b/lisp/bookmark+-1.el index e8ea6df9..5e68f467 100644 --- a/lisp/bookmark+-1.el +++ b/lisp/bookmark+-1.el @@ -2769,7 +2769,7 @@ From Lisp code: (bookmark-store bname (cdr record) (consp parg) no-refresh-p (not interactivep)) (when (and interactivep bmkp-prompt-for-tags-flag) (bmkp-add-tags bname (bmkp-read-tags-completing) 'NO-UPDATE-P)) ; Do not update here. - (case (and (boundp 'bmkp-auto-light-when-set) bmkp-auto-light-when-set) + (cl-case (and (boundp 'bmkp-auto-light-when-set) bmkp-auto-light-when-set) (autonamed-bookmark (when (bmkp-autonamed-bookmark-p bname) (bmkp-light-bookmark bname))) (non-autonamed-bookmark (unless (bmkp-autonamed-bookmark-p bname) @@ -2885,7 +2885,7 @@ DISPLAY-FUNCTION is as in `bookmark-jump'." (when (and (bmkp-autonamed-bookmark-for-buffer-p bookmark (buffer-name)) (not bmkp-use-w32-browser-p)) (setq bookmark (bmkp-update-autonamed-bookmark bookmark))) - (case (and (boundp 'bmkp-auto-light-when-jump) bmkp-auto-light-when-jump) + (cl-case (and (boundp 'bmkp-auto-light-when-jump) bmkp-auto-light-when-jump) (autonamed-bookmark (when (bmkp-autonamed-bookmark-p bookmark) (bmkp-light-bookmark bookmark nil nil nil 'USE-POINT))) (non-autonamed-bookmark (unless (bmkp-autonamed-bookmark-p bookmark) @@ -3585,7 +3585,7 @@ contain a `%s' construct, so that it can be passed along with FILE to (when start (delete-region 1 (1- start))) ; Delete old header. (goto-char 1) (bookmark-insert-file-format-version-stamp coding-system-for-write)) - (let ((version-control (case bookmark-version-control + (let ((version-control (cl-case bookmark-version-control ((nil) nil) (never 'never) (nospecial version-control) @@ -5508,7 +5508,7 @@ Non-interactively, optional arg MSG-P means display progress messages." (print-level nil) (print-circle bmkp-propertize-bookmark-names-flag) (print-gensym bmkp-propertize-bookmark-names-flag) - (version-control (case bookmark-version-control + (version-control (cl-case bookmark-version-control ((nil) nil) (never 'never) (nospecial version-control) @@ -6456,7 +6456,7 @@ and return only the tags for the currently loaded bookmarks." bmk-tags) (when (or (eq opt-tags 'current) current-only-p) (setq opt-tags '(current))) (dolist (entry opt-tags) - (typecase entry + (cl-typecase entry (cons ; A bookmark file (when (eq 'bmkfile (car entry)) (setq entry (cdr entry) @@ -7227,10 +7227,10 @@ Optional arg TEST is the test function. If nil, test with `equal'. See `make-hash-table' for possible values of TEST." (setq test (or test #'equal)) (let ((htable (make-hash-table :test test))) - (loop for elt in sequence + (cl-loop for elt in sequence unless (gethash elt htable) do (puthash elt elt htable) - finally return (loop for i being the hash-values in htable collect i)))) + finally return (cl-loop for i being the hash-values in htable collect i)))) (defun bmkp-remove-dups (list &optional use-eq) "Copy of LIST with duplicate elements removed. @@ -10954,7 +10954,7 @@ BOOKMARK is a bookmark name or a bookmark record." (let* ((man-args (bookmark-prop-get bookmark 'man-args)) ;; `Man-notify-method' binding needs to be in effect during the calls to both ;; `Man-getpage-in-background' and `accept-process-output'. - (Man-notify-method (case bmkp-jump-display-function + (Man-notify-method (cl-case bmkp-jump-display-function ((nil display-buffer) 'quiet) (bmkp--pop-to-buffer-same-window 'pushy) ((bmkp-select-buffer-other-window @@ -11023,7 +11023,7 @@ BOOKMARK is a bookmark name or a bookmark record." (switches (bookmark-prop-get bookmark 'dired-switches)) (subdirs (bookmark-prop-get bookmark 'dired-subdirs)) (hidden-dirs (bookmark-prop-get bookmark 'dired-hidden-dirs))) - (case bmkp-jump-display-function + (cl-case bmkp-jump-display-function ((nil bmkp--pop-to-buffer-same-window display-buffer) (dired dir switches)) ((bmkp-select-buffer-other-window pop-to-buffer switch-to-buffer-other-window) @@ -13874,7 +13874,7 @@ The first arg is a cons as returned by `bmkp-get-external-annotation'. I MSG-P is non-nil then echo the annotation type." (let ((ann (car annotation.type)) (type (cdr annotation.type))) - (case type + (cl-case type (FILE (find-file-other-window ann)) (URL (browse-url ann)) (BOOKMARK (bookmark-jump-other-window ann)) diff --git a/lisp/bookmark+-bmu.el b/lisp/bookmark+-bmu.el index 9fe5a12e..270ef558 100644 --- a/lisp/bookmark+-bmu.el +++ b/lisp/bookmark+-bmu.el @@ -2579,7 +2579,7 @@ From Lisp, non-nil optional arg MSG-P means show progress messages." (error (throw 'bmkp-bmenu-read-filter-input nil))) (unless (or (not (fboundp 'characterp)) (characterp char)) ; E.g. `M-x', `M-:' (throw 'bmkp-bmenu-read-filter-input nil)) - (case char + (cl-case char ((?\e ?\r) (throw 'bmkp-bmenu-read-filter-input nil)) ; Break and exit. (?\C-g (setq inhibit-quit nil) (throw 'bmkp-bmenu-read-filter-input 'QUIT)) ; Quit. @@ -4494,7 +4494,7 @@ Save the command definition in `bmkp-bmenu-commands-file'." (print-level nil) (print-circle bmkp-propertize-bookmark-names-flag) (print-gensym bmkp-propertize-bookmark-names-flag) - (version-control (case bookmark-version-control + (version-control (cl-case bookmark-version-control ((nil) nil) (never 'never) (nospecial version-control) @@ -4559,7 +4559,7 @@ Use the command at any time to restore them." (print-level nil) (print-circle bmkp-propertize-bookmark-names-flag) (print-gensym bmkp-propertize-bookmark-names-flag) - (version-control (case bookmark-version-control + (version-control (cl-case bookmark-version-control ((nil) nil) (never 'never) (nospecial version-control) @@ -4661,7 +4661,7 @@ the omit list and the sort & filter information." (print-level nil) (print-circle bmkp-propertize-bookmark-names-flag) (print-gensym bmkp-propertize-bookmark-names-flag) - (version-control (case bookmark-version-control + (version-control (cl-case bookmark-version-control ((nil) nil) (never 'never) (nospecial version-control) @@ -4788,7 +4788,7 @@ If you use this function non-interactively, be sure to load library (print-level nil) (print-circle bmkp-propertize-bookmark-names-flag) (print-gensym bmkp-propertize-bookmark-names-flag) - (version-control (case bookmark-version-control + (version-control (cl-case bookmark-version-control ((nil) nil) (never 'never) (nospecial version-control) diff --git a/lisp/bookmark+-key.el b/lisp/bookmark+-key.el index bc8e7079..5b2db9e5 100644 --- a/lisp/bookmark+-key.el +++ b/lisp/bookmark+-key.el @@ -126,7 +126,7 @@ "Set prefix key option SYMBOL to key-sequence VALUE." (set pref-keys-option keys) (let* ((g-map (current-global-map)) - (b-map (case pref-keys-option + (b-map (cl-case pref-keys-option (bmkp-bookmark-map-prefix-keys 'bookmark-map) (bmkp-jump-map-prefix-keys 'bmkp-jump-map) (bmkp-jump-other-window-map-prefix-keys 'bmkp-jump-other-window-map)))) diff --git a/lisp/bookmark+-lit.el b/lisp/bookmark+-lit.el index 9149688e..0637faf8 100644 --- a/lisp/bookmark+-lit.el +++ b/lisp/bookmark+-lit.el @@ -1431,7 +1431,7 @@ If STYLE is `none' then: (when (and (< emacs-major-version 22) (not (rassq style bmkp-light-styles-alist))) (message "Fringe styles not supported before Emacs 22 - changing to `line' style") (setq style 'line)) - (case style + (cl-case style (region (and (bmkp-region-bookmark-p bookmark) (let ((end (bmkp-get-end-position bookmark))) (if (not ov)