[Emacs-diffs] Changes to emacs/lisp/recentf.el

[David Ponce]

Index: emacs/lisp/recentf.el
diff -c emacs/lisp/recentf.el:1.47 emacs/lisp/recentf.el:1.48
*** emacs/lisp/recentf.el:1.47  Fri Oct  7 07:52:31 2005
--- emacs/lisp/recentf.el       Fri Oct 14 09:04:38 2005
***************
*** 985,990 ****
--- 985,1038 ----
                              t)))))
      l))
  
+ ;;; Hooks
+ ;;
+ (defun recentf-track-opened-file ()
+   "Insert the name of the file just opened or written into the recent list."
+   (and buffer-file-name
+        (recentf-add-file buffer-file-name))
+   ;; Must return nil because it is run from `write-file-functions'.
+   nil)
+ 
+ (defun recentf-track-closed-file ()
+   "Update the recent list when a buffer is killed.
+ That is, remove a non kept file from the recent list."
+   (and buffer-file-name
+        (recentf-remove-if-non-kept buffer-file-name)))
+ 
+ (defun recentf-update-menu ()
+   "Update the recentf menu from the current recent list."
+   (let ((cache (cons default-directory recentf-list)))
+     ;; Does nothing, if nothing has changed.
+     (unless (equal recentf-data-cache cache)
+       (setq recentf-data-cache cache)
+       (condition-case err
+           (easy-menu-add-item
+            (recentf-menu-bar) recentf-menu-path
+            (easy-menu-create-menu recentf-menu-title
+                                   (recentf-make-menu-items))
+            recentf-menu-before)
+         (error
+          (message "recentf update menu failed: %s"
+                   (error-message-string err)))))))
+ 
+ (defconst recentf-used-hooks
+   '(
+     (find-file-hook       recentf-track-opened-file)
+     (write-file-functions recentf-track-opened-file)
+     (kill-buffer-hook     recentf-track-closed-file)
+     (menu-bar-update-hook recentf-update-menu)
+     (kill-emacs-hook      recentf-save-list)
+     )
+   "Hooks used by recentf.")
+ 
+ (defsubst recentf-enabled-p ()
+   "Return non-nil if recentf mode is currently enabled."
+   (memq 'recentf-update-menu menu-bar-update-hook))
+ 
+ ;;; Commands
+ ;;
+ 
  ;;; Common dialog stuff
  ;;
  (defun recentf-cancel-dialog (&rest ignore)
***************
*** 1011,1017 ****
    (let ((km (copy-keymap recentf--shortcuts-keymap)))
      (set-keymap-parent km widget-keymap)
      (define-key km "q" 'recentf-cancel-dialog)
!     (define-key km [down-mouse-1] 'widget-button-click)
      km)
    "Keymap used in recentf dialogs.")
  
--- 1059,1065 ----
    (let ((km (copy-keymap recentf--shortcuts-keymap)))
      (set-keymap-parent km widget-keymap)
      (define-key km "q" 'recentf-cancel-dialog)
!     (define-key km [follow-link] "\C-m")
      km)
    "Keymap used in recentf dialogs.")
  
***************
*** 1038,1091 ****
      (widget-setup)
      (switch-to-buffer (current-buffer))))
  
- ;;; Hooks
- ;;
- (defun recentf-track-opened-file ()
-   "Insert the name of the file just opened or written into the recent list."
-   (and buffer-file-name
-        (recentf-add-file buffer-file-name))
-   ;; Must return nil because it is run from `write-file-functions'.
-   nil)
- 
- (defun recentf-track-closed-file ()
-   "Update the recent list when a buffer is killed.
- That is, remove a non kept file from the recent list."
-   (and buffer-file-name
-        (recentf-remove-if-non-kept buffer-file-name)))
- 
- (defun recentf-update-menu ()
-   "Update the recentf menu from the current recent list."
-   (let ((cache (cons default-directory recentf-list)))
-     ;; Does nothing, if nothing has changed.
-     (unless (equal recentf-data-cache cache)
-       (setq recentf-data-cache cache)
-       (condition-case err
-           (easy-menu-add-item
-            (recentf-menu-bar) recentf-menu-path
-            (easy-menu-create-menu recentf-menu-title
-                                   (recentf-make-menu-items))
-            recentf-menu-before)
-         (error
-          (message "recentf update menu failed: %s"
-                   (error-message-string err)))))))
- 
- (defconst recentf-used-hooks
-   '(
-     (find-file-hook       recentf-track-opened-file)
-     (write-file-functions recentf-track-opened-file)
-     (kill-buffer-hook     recentf-track-closed-file)
-     (menu-bar-update-hook recentf-update-menu)
-     (kill-emacs-hook      recentf-save-list)
-     )
-   "Hooks used by recentf.")
- 
- (defsubst recentf-enabled-p ()
-   "Return non-nil if recentf mode is currently enabled."
-   (memq 'recentf-update-menu menu-bar-update-hook))
- 
- ;;; Commands
- ;;
- 
  ;;; Edit list dialog
  ;;
  (defvar recentf-edit-list nil)
--- 1086,1091 ----
***************
*** 1140,1146 ****
       :notify 'recentf-cancel-dialog
       "Cancel")
      (recentf-dialog-goto-first 'checkbox)))
! 
  ;;; Open file dialog
  ;;
  (defun recentf-open-files-action (widget &rest ignore)
--- 1140,1146 ----
       :notify 'recentf-cancel-dialog
       "Cancel")
      (recentf-dialog-goto-first 'checkbox)))
! 
  ;;; Open file dialog
  ;;
  (defun recentf-open-files-action (widget &rest ignore)
***************
*** 1252,1258 ****
      (when recentf--files-with-key
        (kill-buffer (current-buffer)))
      (funcall recentf-menu-action file)))
! 
  ;;; Save/load/cleanup the recent list
  ;;
  (defconst recentf-save-file-header
--- 1252,1258 ----
      (when recentf--files-with-key
        (kill-buffer (current-buffer)))
      (funcall recentf-menu-action file)))
! 
  ;;; Save/load/cleanup the recent list
  ;;
  (defconst recentf-save-file-header
***************
*** 1316,1322 ****
          (message "File %s removed from the recentf list" f)))
      (message "Cleaning up the recentf list...done (%d removed)" n)
      (setq recentf-list (nreverse newlist))))
! 
  (defvar recentf-mode-map (make-sparse-keymap)
    "Keymap to use in recentf mode.")
  
--- 1316,1324 ----
          (message "File %s removed from the recentf list" f)))
      (message "Cleaning up the recentf list...done (%d removed)" n)
      (setq recentf-list (nreverse newlist))))
! 
! ;;; The minor mode
! ;;
  (defvar recentf-mode-map (make-sparse-keymap)
    "Keymap to use in recentf mode.")