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

[David Ponce]

Index: emacs/lisp/recentf.el
diff -c emacs/lisp/recentf.el:1.48 emacs/lisp/recentf.el:1.49
*** emacs/lisp/recentf.el:1.48  Fri Oct 14 09:04:38 2005
--- emacs/lisp/recentf.el       Fri Nov 25 07:57:21 2005
***************
*** 813,851 ****
  Arrange them in sub-menus following rules in `recentf-arrange-rules'."
    (if (not recentf-arrange-rules)
        l
!     (let ((menus (mapcar #'(lambda (r) (list (car r)))
!                          recentf-arrange-rules))
!           menu others min file rules elts count)
        (dolist (elt l)
!         (setq file  (recentf-menu-element-value elt)
!               rules recentf-arrange-rules
!               elts  menus
!               menu  nil)
!         (while (and (not menu) rules)
!           (when (recentf-match-rule-p (cdar rules) file)
!             (setq menu (car elts))
              (recentf-set-menu-element-value
               menu (cons elt (recentf-menu-element-value menu))))
!           (setq rules (cdr rules)
!                 elts  (cdr elts)))
!         (unless menu
!           (push elt others)))
! 
!       (setq l nil
!             min (if (natnump recentf-arrange-by-rules-min-items)
!                     recentf-arrange-by-rules-min-items 0))
        (dolist (menu menus)
!         (when (setq elts (recentf-menu-element-value menu))
!           (setq count (length elts))
            (if (< count min)
!               (setq others (nconc elts others))
              (recentf-set-menu-element-item
               menu (format (recentf-menu-element-item menu) count))
              (recentf-set-menu-element-value
               menu (recentf-apply-menu-filter
!                    recentf-arrange-by-rule-subfilter (nreverse elts)))
!             (push menu l))))
! 
        (if (and (stringp recentf-arrange-by-rule-others) others)
            (nreverse
             (cons
--- 813,861 ----
  Arrange them in sub-menus following rules in `recentf-arrange-rules'."
    (if (not recentf-arrange-rules)
        l
!     (let* ((strip (assq t recentf-arrange-rules))
!            (rules (remq strip recentf-arrange-rules))
!            (menus (mapcar #'(lambda (r) (list (car r))) rules))
!            others l1 l2 menu file min count)
!       ;; Put menu items into sub-menus as defined by rules.
        (dolist (elt l)
!         (setq l1   menus ;; List of sub-menus
!               l2   rules ;; List of corresponding matchers.
!               file (recentf-menu-element-value elt)
!               menu nil)
!         ;; Apply the strip suffix rule.
!         (while (recentf-match-rule-p (cdr strip) file)
!           (setq file (substring file 0 (match-beginning 0))))
!         ;; Search which sub-menu to put the menu item into.
!         (while (and (not menu) l2)
!           (when (recentf-match-rule-p (cdar l2) file)
!             (setq menu (car l1))
              (recentf-set-menu-element-value
               menu (cons elt (recentf-menu-element-value menu))))
!           (setq l1 (cdr l1)
!                 l2 (cdr l2)))
!         ;; Put unmatched menu items in the `others' bin.
!         (or menu (push elt others)))
!       ;; Finalize the sub-menus.  That is, for each one:
!       ;; - truncate it depending on the value of
!       ;;   `recentf-arrange-by-rules-min-items',
!       ;; - replace %d by the number of menu items,
!       ;; - apply `recentf-arrange-by-rule-subfilter' to menu items.
!       (setq min (if (natnump recentf-arrange-by-rules-min-items)
!                     recentf-arrange-by-rules-min-items 0)
!             l2 nil)
        (dolist (menu menus)
!         (when (setq l1 (recentf-menu-element-value menu))
!           (setq count (length l1))
            (if (< count min)
!               (setq others (nconc l1 others))
              (recentf-set-menu-element-item
               menu (format (recentf-menu-element-item menu) count))
              (recentf-set-menu-element-value
               menu (recentf-apply-menu-filter
!                    recentf-arrange-by-rule-subfilter (nreverse l1)))
!             (push menu l2))))
!       ;; Add the menu items remaining in the `others' bin.
        (if (and (stringp recentf-arrange-by-rule-others) others)
            (nreverse
             (cons
***************
*** 853,864 ****
               (format recentf-arrange-by-rule-others (length others))
               (recentf-apply-menu-filter
                recentf-arrange-by-rule-subfilter (nreverse others)))
!             l))
          (nconc
!          (nreverse l)
           (recentf-apply-menu-filter
!           recentf-arrange-by-rule-subfilter (nreverse others)))))
!     ))
  
  ;;; Predefined rule based menu filters
  ;;
--- 863,873 ----
               (format recentf-arrange-by-rule-others (length others))
               (recentf-apply-menu-filter
                recentf-arrange-by-rule-subfilter (nreverse others)))
!             l2))
          (nconc
!          (nreverse l2)
           (recentf-apply-menu-filter
!           recentf-arrange-by-rule-subfilter (nreverse others)))))))
  
  ;;; Predefined rule based menu filters
  ;;
***************
*** 870,881 ****
      (dolist (mode auto-mode-alist)
        (setq regexp (car mode)
              mode   (cdr mode))
!       (when (symbolp mode)
!         (setq rule-name (symbol-name mode))
!         (if (string-match "\\(.*\\)-mode$" rule-name)
!             (setq rule-name (match-string 1 rule-name)))
!         (setq rule-name (concat rule-name " (%d)")
!               rule (assoc rule-name rules))
          (if rule
              (setcdr rule (cons regexp (cdr rule)))
            (push (list rule-name regexp) rules))))
--- 879,898 ----
      (dolist (mode auto-mode-alist)
        (setq regexp (car mode)
              mode   (cdr mode))
!       (when mode
!         (cond
!          ;; Build a special "strip suffix" rule from entries of the
!          ;; form (REGEXP FUNCTION NON-NIL).  Notice that FUNCTION is
!          ;; ignored by the menu filter.  So in some corner cases a
!          ;; wrong mode could be guessed.
!          ((and (consp mode) (cadr mode))
!           (setq rule-name t))
!          ((and mode (symbolp mode))
!           (setq rule-name (symbol-name mode))
!           (if (string-match "\\(.*\\)-mode$" rule-name)
!               (setq rule-name (match-string 1 rule-name)))
!           (setq rule-name (concat rule-name " (%d)"))))
!         (setq rule (assoc rule-name rules))
          (if rule
              (setcdr rule (cons regexp (cdr rule)))
            (push (list rule-name regexp) rules))))