Re: address@hidden: Recentf and gzipped elisp source files]

[David PONCE]

Hi,

Richard M. Stallman wrote:
> Please DTRT and ack.
> 
> ------- Start of forwarded message -------
[...]
> Since the change by which Emacs lisp source files are automatically
> gzipped if possible, these are not listed in the recentf menu under
> the entry "emacs-lisp" when recentf-menu-filter is set to
> recentf-arrange-by-mode, although such files are visited in
> emacs-lisp-mode; rather, they are listed under the entry "others".
[...]

Please, could you try the patch below.  It fixes the problem for me.

David


2005-11-24  David Ponce  <address@hidden>

        * recentf.el (recentf-arrange-by-rule): Handle a special
        `auto-mode-alist'-like "strip suffix" rule.
        (recentf-build-mode-rules): Handle second level auto-mode entries.

Index: recentf.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/recentf.el,v
retrieving revision 1.48
diff -c -r1.48 recentf.el
*** recentf.el  14 Oct 2005 09:04:38 -0000      1.48
--- recentf.el  24 Nov 2005 09:44:59 -0000
***************
*** 813,826 ****
  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))
--- 813,832 ----
  Arrange them in sub-menus following rules in `recentf-arrange-rules'."
    (if (not recentf-arrange-rules)
        l
!     (let* ((strip (assq t recentf-arrange-rules))
!            (menus (mapcar #'(lambda (r) (list (car r)))
!                           (remq strip recentf-arrange-rules)))
!            menu others min file rules elts count)
!       ;; Group menu items in the sub-menus defined in rules.
        (dolist (elt l)
          (setq file  (recentf-menu-element-value elt)
                rules recentf-arrange-rules
                elts  menus
                menu  nil)
+         ;; Apply the strip suffix rule.
+         (while (recentf-match-rule-p (cdr strip) file)
+           (setq file (substring file 0 (match-beginning 0))))
+         ;; Search in which group to put the menu item.
          (while (and (not menu) rules)
            (when (recentf-match-rule-p (cdar rules) file)
              (setq menu (car elts))
***************
*** 828,836 ****
               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))
--- 834,844 ----
               menu (cons elt (recentf-menu-element-value menu))))
            (setq rules (cdr rules)
                  elts  (cdr elts)))
+         ;; Put unmatched menu-items in an "other" bin.
          (unless menu
            (push elt others)))
!       ;; Setup the sub-menus from the groups of menu-items.  Count
!       ;; sub-menu elements, and apply sub-filter to menu-items.
        (setq l nil
              min (if (natnump recentf-arrange-by-rules-min-items)
                      recentf-arrange-by-rules-min-items 0))
***************
*** 845,851 ****
               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
--- 853,859 ----
               menu (recentf-apply-menu-filter
                     recentf-arrange-by-rule-subfilter (nreverse elts)))
              (push menu l))))
!       ;; Add items in the "other" bin.
        (if (and (stringp recentf-arrange-by-rule-others) others)
            (nreverse
             (cons
***************
*** 857,864 ****
          (nconc
           (nreverse l)
           (recentf-apply-menu-filter
!           recentf-arrange-by-rule-subfilter (nreverse others)))))
!     ))
  
  ;;; Predefined rule based menu filters
  ;;
--- 865,871 ----
          (nconc
           (nreverse l)
           (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))))
--- 877,896 ----
      (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))))