mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 06:00:41 -08:00
Code Issues Projects Releases Wiki Activity

(diary-list-entries): Replace superfluous save-excursion with

Browse source 
save-current-buffer.
Widen before searching.  (Bug#5093)
(diary-list-sexp-entries): Remove superfluous save-excursion.
This commit is contained in:
Glenn Morris 2009-12-02 03:03:48 +00:00
parent c79fb97624
commit 5813f6ef75
2 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2009-12-02 Glenn Morris <rgm@gnu.org>
* 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 <mwd@cert.org> 2009-12-02 Michael Welsh Duggan <mwd@cert.org>
* woman.el (woman-make-bufname): Handle man-pages with "." in the * woman.el (woman-make-bufname): Handle man-pages with "." in the

65
lisp/calendar/diary-lib.el
View file

@ -744,7 +744,7 @@ LIST-ONLY is non-nil, in which case it just returns the list."
(diary-buffer (find-buffer-visiting diary-file)) (diary-buffer (find-buffer-visiting diary-file))
diary-entries-list file-glob-attrs) diary-entries-list file-glob-attrs)
(message "Preparing diary...") (message "Preparing diary...")
(save-excursion (save-current-buffer
(if (not diary-buffer) (if (not diary-buffer)
(set-buffer (find-file-noselect diary-file t)) (set-buffer (find-file-noselect diary-file t))
(set-buffer diary-buffer) (set-buffer diary-buffer)
@ -765,37 +765,39 @@ LIST-ONLY is non-nil, in which case it just returns the list."
;; d-s-p is passed to the diary display function. ;; d-s-p is passed to the diary display function.
(let ((diary-saved-point (point))) (let ((diary-saved-point (point)))
(save-excursion (save-excursion
(setq file-glob-attrs (cadr (diary-pull-attrs nil ""))) (save-restriction
(with-syntax-table diary-syntax-table (widen) ; bug#5093
(setq file-glob-attrs (cadr (diary-pull-attrs nil "")))
(with-syntax-table diary-syntax-table
(goto-char (point-min))
(unless list-only
(let ((ol (make-overlay (point-min) (point-max) nil t nil)))
(set (make-local-variable 'diary-selective-display) t)
(overlay-put ol 'invisible 'diary)
(overlay-put ol 'evaporate t)))
(dotimes (idummy number)
(let ((sexp-found (diary-list-sexp-entries date))
(entry-found (diary-list-entries-2
date diary-nonmarking-symbol
file-glob-attrs list-only)))
(if diary-list-include-blanks
(or sexp-found entry-found
(diary-add-to-list date "" "" "" "")))
(setq date
(calendar-gregorian-from-absolute
(1+ (calendar-absolute-from-gregorian date)))))))
(goto-char (point-min)) (goto-char (point-min))
(run-hooks 'diary-nongregorian-listing-hook
'diary-list-entries-hook)
(unless list-only (unless list-only
(let ((ol (make-overlay (point-min) (point-max) nil t nil))) (if (and diary-display-function
(set (make-local-variable 'diary-selective-display) t) (listp diary-display-function))
(overlay-put ol 'invisible 'diary) ;; Backwards compatibility.
(overlay-put ol 'evaporate t))) (run-hooks 'diary-display-function)
(dotimes (idummy number) (funcall (or diary-display-function
(let ((sexp-found (diary-list-sexp-entries date)) 'diary-simple-display))))
(entry-found (diary-list-entries-2 (run-hooks 'diary-hook)
date diary-nonmarking-symbol diary-entries-list)))))))
file-glob-attrs list-only)))
(if diary-list-include-blanks
(or sexp-found entry-found
(diary-add-to-list date "" "" "" "")))
(setq date
(calendar-gregorian-from-absolute
(1+ (calendar-absolute-from-gregorian date)))))))
(goto-char (point-min))
(run-hooks 'diary-nongregorian-listing-hook
'diary-list-entries-hook)
(unless list-only
(if (and diary-display-function
(listp diary-display-function))
;; Backwards compatibility.
(run-hooks 'diary-display-function)
(funcall (or diary-display-function
'diary-simple-display))))
(run-hooks 'diary-hook)
diary-entries-list))))))
(define-obsolete-function-alias 'list-diary-entries 'diary-list-entries "22.1") (define-obsolete-function-alias 'list-diary-entries 'diary-list-entries "22.1")
@ -1694,8 +1696,7 @@ best if they are non-marking."
sexp-start sexp entry specifier entry-start line-start sexp-start sexp entry specifier entry-start line-start
diary-entry temp literal) diary-entry temp literal)
(goto-char (point-min)) (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) (while (re-search-forward s-entry nil t)
(backward-char 1) (backward-char 1)
(setq sexp-start (point)) (setq sexp-start (point))