Mercurial > emacs
changeset 106369:74b7ca95d469
(diary-list-entries): Replace superfluous save-excursion with
save-current-buffer.
Widen before searching. (Bug#5093)
(diary-list-sexp-entries): Remove superfluous save-excursion.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 02 Dec 2009 03:03:48 +0000 |
| parents | 6bd27233297a |
| children | 1656b89c39bf |
| files | lisp/ChangeLog lisp/calendar/diary-lib.el |
| diffstat | 2 files changed, 40 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Dec 02 03:02:10 2009 +0000 +++ b/lisp/ChangeLog Wed Dec 02 03:03:48 2009 +0000 @@ -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> * woman.el (woman-make-bufname): Handle man-pages with "." in the
--- a/lisp/calendar/diary-lib.el Wed Dec 02 03:02:10 2009 +0000 +++ b/lisp/calendar/diary-lib.el Wed Dec 02 03:03:48 2009 +0000 @@ -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,37 +765,39 @@ ;; d-s-p is passed to the diary display function. (let ((diary-saved-point (point))) (save-excursion - (setq file-glob-attrs (cadr (diary-pull-attrs nil ""))) - (with-syntax-table diary-syntax-table + (save-restriction + (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)) + (run-hooks 'diary-nongregorian-listing-hook + 'diary-list-entries-hook) (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)) - (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)))))) + (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") @@ -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))