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

[Eli Zaretskii]

Index: emacs/lisp/recentf.el
diff -c emacs/lisp/recentf.el:1.25 emacs/lisp/recentf.el:1.26
*** emacs/lisp/recentf.el:1.25  Mon Sep  1 11:45:14 2003
--- emacs/lisp/recentf.el       Mon Sep  8 15:00:17 2003
***************
*** 8,14 ****
  ;; Maintainer: FSF
  ;; Keywords: files
  
! (defconst recentf-version "$Revision: 1.25 $")
  
  ;; This file is part of GNU Emacs.
  
--- 8,14 ----
  ;; Maintainer: FSF
  ;; Keywords: files
  
! (defconst recentf-version "$Revision: 1.26 $")
  
  ;; This file is part of GNU Emacs.
  
***************
*** 98,104 ****
  
  (defcustom recentf-menu-path '("files")
    "*Path where to add the recentf menu.
! If nil add it at top level (see also `easy-menu-change')."
    :group 'recentf
    :type '(choice (const :tag "Top Level" nil)
                   (sexp :tag "Menu Path"))
--- 98,104 ----
  
  (defcustom recentf-menu-path '("files")
    "*Path where to add the recentf menu.
! If nil add it at top level (see also `easy-menu-add-item')."
    :group 'recentf
    :type '(choice (const :tag "Top Level" nil)
                   (sexp :tag "Menu Path"))
***************
*** 106,112 ****
  
  (defcustom recentf-menu-before "Open File..."
    "*Name of the menu before which the recentf menu will be added.
! If nil add it at end of menu (see also `easy-menu-change')."
    :group 'recentf
    :type '(choice (string :tag "Name")
                   (const :tag "Last" nil))
--- 106,112 ----
  
  (defcustom recentf-menu-before "Open File..."
    "*Name of the menu before which the recentf menu will be added.
! If nil add it at end of menu (see also `easy-menu-add-item')."
    :group 'recentf
    :type '(choice (string :tag "Name")
                   (const :tag "Last" nil))
***************
*** 520,529 ****
                :help (concat "Open " value)
                :active t))))
  
  (defun recentf-clear-data ()
    "Clear data used to build the recentf menu.
  This force a rebuild of the menu."
!   (easy-menu-remove-item nil recentf-menu-path recentf-menu-title)
    (setq recentf-data-cache nil))
  
  ;;; Predefined menu filters
--- 520,534 ----
                :help (concat "Open " value)
                :active t))))
  
+ (defsubst recentf-menu-bar ()
+   "Return the keymap of the global menu bar."
+   (lookup-key global-map [menu-bar]))
+ 
  (defun recentf-clear-data ()
    "Clear data used to build the recentf menu.
  This force a rebuild of the menu."
!   (easy-menu-remove-item (recentf-menu-bar)
!                          recentf-menu-path recentf-menu-title)
    (setq recentf-data-cache nil))
  
  ;;; Predefined menu filters
***************
*** 916,925 ****
      (unless (equal recentf-data-cache cache)
        (setq recentf-data-cache cache)
        (condition-case err
!           (easy-menu-change recentf-menu-path
!                             recentf-menu-title
!                             (recentf-make-menu-items)
!                             recentf-menu-before)
          (error
           (message "recentf update menu failed: %s"
                    (error-message-string err)))))))
--- 921,931 ----
      (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)))))))