[Emacs-diffs] emacs/lisp ChangeLog calendar/diary-lib.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/12/02 03:03:52

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : diary-lib.el 

Log message:
        (diary-list-entries): Replace superfluous save-excursion with
        save-current-buffer.
        Widen before searching.  (Bug#5093)
        (diary-list-sexp-entries): Remove superfluous save-excursion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16794&r2=1.16795
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/diary-lib.el?cvsroot=emacs&r1=1.195&r2=1.196

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16794
retrieving revision 1.16795
diff -u -b -r1.16794 -r1.16795
--- ChangeLog   2 Dec 2009 03:01:44 -0000       1.16794
+++ ChangeLog   2 Dec 2009 03:03:48 -0000       1.16795
@@ -1,3 +1,10 @@
+2009-12-02  Glenn Morris  <address@hidden>
+
+       * calendar/diary-lib.el (diary-list-entries): Replace superfluous
+       save-excursion with save-current-buffer.
+       Widen before searching.  (Bug#5093)
+       (diary-list-sexp-entries): Remove superfluous save-excursion.
+
 2009-12-02  Michael Welsh Duggan  <address@hidden>
 
        * woman.el (woman-make-bufname): Handle man-pages with "." in the

Index: calendar/diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -b -r1.195 -r1.196
--- calendar/diary-lib.el       5 Nov 2009 03:22:22 -0000       1.195
+++ calendar/diary-lib.el       2 Dec 2009 03:03:51 -0000       1.196
@@ -744,7 +744,7 @@
            (diary-buffer (find-buffer-visiting diary-file))
            diary-entries-list file-glob-attrs)
       (message "Preparing diary...")
-      (save-excursion
+      (save-current-buffer
         (if (not diary-buffer)
             (set-buffer (find-file-noselect diary-file t))
           (set-buffer diary-buffer)
@@ -765,6 +765,8 @@
         ;; d-s-p is passed to the diary display function.
         (let ((diary-saved-point (point)))
           (save-excursion
+            (save-restriction
+              (widen)                   ; bug#5093
             (setq file-glob-attrs (cadr (diary-pull-attrs nil "")))
             (with-syntax-table diary-syntax-table
               (goto-char (point-min))
@@ -795,7 +797,7 @@
                 (funcall (or diary-display-function
                              'diary-simple-display))))
             (run-hooks 'diary-hook)
-            diary-entries-list))))))
+              diary-entries-list)))))))
 
 (define-obsolete-function-alias 'list-diary-entries 'diary-list-entries "22.1")
 
@@ -1694,8 +1696,7 @@
         sexp-start sexp entry specifier entry-start line-start
         diary-entry temp literal)
     (goto-char (point-min))
-    (save-excursion
-      (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))))
+    (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
     (while (re-search-forward s-entry nil t)
       (backward-char 1)
       (setq sexp-start (point))