Re: lisp/recentf.el

[Lute Kamstra]

Hi David,

>> Does someone see a problem with this change?
>
> This is a good idea, however I think the call to `recentf-dialog-mode'
> should be moved before to setup the widgets because they might use
> local variables.

Like this?

Lute.


Index: lisp/recentf.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/recentf.el,v
retrieving revision 1.37
diff -c -r1.37 recentf.el
*** lisp/recentf.el     31 May 2005 04:19:10 -0000      1.37
--- lisp/recentf.el     13 Jun 2005 13:49:20 -0000
***************
*** 923,931 ****
  
  \\{recentf-dialog-mode-map}"
    (interactive)
    (setq major-mode 'recentf-dialog-mode)
    (setq mode-name "recentf-dialog")
!   (use-local-map recentf-dialog-mode-map))
  
  ;;; Hooks
  ;;
--- 923,933 ----
  
  \\{recentf-dialog-mode-map}"
    (interactive)
+   (kill-all-local-variables)
    (setq major-mode 'recentf-dialog-mode)
    (setq mode-name "recentf-dialog")
!   (use-local-map recentf-dialog-mode-map)
!   (run-mode-hooks 'recentf-dialog-mode-hook))
  
  ;;; Hooks
  ;;
***************
*** 1002,1014 ****
        (get-buffer-create (format "*%s - Edit list*" recentf-menu-title))
      (switch-to-buffer (current-buffer))
      ;; Cleanup buffer
-     (kill-all-local-variables)
      (let ((inhibit-read-only t)
            (ol (overlay-lists)))
        (erase-buffer)
        ;; Delete all the overlays.
        (mapc 'delete-overlay (car ol))
        (mapc 'delete-overlay (cdr ol)))
      (setq recentf-edit-selected-items nil)
      ;; Insert the dialog header
      (widget-insert
--- 1004,1016 ----
        (get-buffer-create (format "*%s - Edit list*" recentf-menu-title))
      (switch-to-buffer (current-buffer))
      ;; Cleanup buffer
      (let ((inhibit-read-only t)
            (ol (overlay-lists)))
        (erase-buffer)
        ;; Delete all the overlays.
        (mapc 'delete-overlay (car ol))
        (mapc 'delete-overlay (cdr ol)))
+     (recentf-dialog-mode)
      (setq recentf-edit-selected-items nil)
      ;; Insert the dialog header
      (widget-insert
***************
*** 1045,1051 ****
       'push-button
       :notify 'recentf-cancel-dialog
       "Cancel")
-     (recentf-dialog-mode)
      (widget-setup)
      (goto-char (point-min))))
  
--- 1047,1052 ----
***************
*** 1101,1113 ****
    (with-current-buffer (get-buffer-create buffer-name)
      (switch-to-buffer (current-buffer))
      ;; Cleanup buffer
-     (kill-all-local-variables)
      (let ((inhibit-read-only t)
            (ol (overlay-lists)))
        (erase-buffer)
        ;; Delete all the overlays.
        (mapc 'delete-overlay (car ol))
        (mapc 'delete-overlay (cdr ol)))
      ;; Insert the dialog header
      (widget-insert "Click on a file to open it. ")
      (widget-insert "Click on Cancel or type \"q\" to quit.\n\n" )
--- 1102,1114 ----
    (with-current-buffer (get-buffer-create buffer-name)
      (switch-to-buffer (current-buffer))
      ;; Cleanup buffer
      (let ((inhibit-read-only t)
            (ol (overlay-lists)))
        (erase-buffer)
        ;; Delete all the overlays.
        (mapc 'delete-overlay (car ol))
        (mapc 'delete-overlay (cdr ol)))
+     (recentf-dialog-mode)
      ;; Insert the dialog header
      (widget-insert "Click on a file to open it. ")
      (widget-insert "Click on Cancel or type \"q\" to quit.\n\n" )
***************
*** 1123,1129 ****
       'push-button
       :notify 'recentf-cancel-dialog
       "Cancel")
-     (recentf-dialog-mode)
      (widget-setup)
      (goto-char (point-min))))
  
--- 1124,1129 ----