[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog allout.el apropos.el chist...
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog allout.el apropos.el chist... |
|
Date: |
Fri, 13 Nov 2009 22:19:58 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/11/13 22:19:57
Modified files:
lisp : ChangeLog allout.el apropos.el chistory.el
dabbrev.el dired-aux.el dired.el disp-table.el
dos-w32.el echistory.el ediff-diff.el
ediff-mult.el ediff-util.el ediff-vers.el
ediff.el ehelp.el emerge.el epa.el epg.el
ezimage.el facemenu.el faces.el files.el
filesets.el find-dired.el finder.el
generic-x.el help-fns.el help-mode.el
hippie-exp.el ido.el informat.el ledit.el
macros.el menu-bar.el mouse-copy.el mouse.el
novice.el printing.el ps-bdf.el ps-print.el
ps-samp.el saveplace.el sb-image.el
scroll-bar.el shadowfile.el simple.el
speedbar.el strokes.el term.el terminal.el
time-stamp.el type-break.el userlock.el
vc-rcs.el whitespace.el window.el x-dnd.el
Log message:
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16618&r2=1.16619
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/allout.el?cvsroot=emacs&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/apropos.el?cvsroot=emacs&r1=1.144&r2=1.145
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/chistory.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dabbrev.el?cvsroot=emacs&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired-aux.el?cvsroot=emacs&r1=1.196&r2=1.197
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired.el?cvsroot=emacs&r1=1.441&r2=1.442
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/disp-table.el?cvsroot=emacs&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dos-w32.el?cvsroot=emacs&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/echistory.el?cvsroot=emacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-diff.el?cvsroot=emacs&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-mult.el?cvsroot=emacs&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-util.el?cvsroot=emacs&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-vers.el?cvsroot=emacs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff.el?cvsroot=emacs&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ehelp.el?cvsroot=emacs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emerge.el?cvsroot=emacs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epa.el?cvsroot=emacs&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epg.el?cvsroot=emacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ezimage.el?cvsroot=emacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/facemenu.el?cvsroot=emacs&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/faces.el?cvsroot=emacs&r1=1.452&r2=1.453
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1100&r2=1.1101
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/filesets.el?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/find-dired.el?cvsroot=emacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/finder.el?cvsroot=emacs&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/generic-x.el?cvsroot=emacs&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-fns.el?cvsroot=emacs&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-mode.el?cvsroot=emacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/hippie-exp.el?cvsroot=emacs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ido.el?cvsroot=emacs&r1=1.160&r2=1.161
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/informat.el?cvsroot=emacs&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ledit.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/macros.el?cvsroot=emacs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/menu-bar.el?cvsroot=emacs&r1=1.369&r2=1.370
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mouse-copy.el?cvsroot=emacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mouse.el?cvsroot=emacs&r1=1.362&r2=1.363
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/novice.el?cvsroot=emacs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/printing.el?cvsroot=emacs&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ps-bdf.el?cvsroot=emacs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ps-print.el?cvsroot=emacs&r1=1.230&r2=1.231
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ps-samp.el?cvsroot=emacs&r1=2.4&r2=2.5
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/saveplace.el?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/sb-image.el?cvsroot=emacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/scroll-bar.el?cvsroot=emacs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/shadowfile.el?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.1026&r2=1.1027
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/speedbar.el?cvsroot=emacs&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/strokes.el?cvsroot=emacs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term.el?cvsroot=emacs&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/terminal.el?cvsroot=emacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/time-stamp.el?cvsroot=emacs&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/type-break.el?cvsroot=emacs&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/userlock.el?cvsroot=emacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-rcs.el?cvsroot=emacs&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/whitespace.el?cvsroot=emacs&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/window.el?cvsroot=emacs&r1=1.184&r2=1.185
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/x-dnd.el?cvsroot=emacs&r1=1.37&r2=1.38
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16618
retrieving revision 1.16619
diff -u -b -r1.16618 -r1.16619
--- ChangeLog 13 Nov 2009 17:03:30 -0000 1.16618
+++ ChangeLog 13 Nov 2009 22:19:45 -0000 1.16619
@@ -1,12 +1,94 @@
+2009-11-13 Stefan Monnier <address@hidden>
+
+ * x-dnd.el (x-dnd-maybe-call-test-function):
+ * window.el (split-window-vertically):
+ * whitespace.el (whitespace-help-on):
+ * vc-rcs.el (vc-rcs-consult-headers):
+ * userlock.el (ask-user-about-lock-help)
+ (ask-user-about-supersession-help):
+ * type-break.el (type-break-force-mode-line-update):
+ * time-stamp.el (time-stamp-conv-warn):
+ * terminal.el (te-set-output-log, te-more-break, te-filter)
+ (te-sentinel,terminal-emulator):
+ * term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
+ (term-write-input-ring, term-check-source, term-start-output-log):
+ (term-display-buffer-line, term-dynamic-list-completions):
+ (term-ansi-make-term, serial-term):
+ * subr.el (selective-display):
+ * strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
+ (strokes-encode-buffer, strokes-xpm-for-compressed-string):
+ * speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
+ (speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
+ (speedbar-remove-localized-speedbar-support)
+ (speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
+ (speedbar-update-special-contents, speedbar-buffer-buttons-engine)
+ (speedbar-buffers-line-directory):
+ * simple.el (shell-command-on-region, append-to-buffer)
+ (prepend-to-buffer):
+ * shadowfile.el (shadow-save-todo-file):
+ * scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
+ (scroll-bar-maybe-set-window-start):
+ * sb-image.el (speedbar-image-dump):
+ * saveplace.el (save-place-alist-to-file, save-places-to-alist)
+ (load-save-place-alist-from-file):
+ * ps-samp.el (ps-print-message-from-summary):
+ * ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
+ (ps-background-image, ps-begin-job, ps-do-despool):
+ * ps-bdf.el (bdf-find-file, bdf-read-font-info):
+ * printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
+ (pr-ps-message-from-summary, pr-lpr-message-from-summary):
+ (pr-call-process, pr-file-list, pr-interface-save):
+ * novice.el (disabled-command-function)
+ (enable-command, disable-command):
+ * mouse.el (mouse-buffer-menu-alist):
+ * mouse-copy.el (mouse-kill-preserving-secondary):
+ * macros.el (kbd-macro-query):
+ * ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
+ * informat.el (batch-info-validate):
+ * ido.el (ido-copy-current-word, ido-initiate-auto-merge):
+ * hippie-exp.el (try-expand-dabbrev-visible):
+ * help-mode.el (help-make-xrefs):
+ * help-fns.el (describe-variable):
+ * generic-x.el (bat-generic-mode-run-as-comint):
+ * finder.el (finder-mouse-select):
+ * find-dired.el (find-dired-sentinel):
+ * filesets.el (filesets-file-close):
+ * files.el (list-directory):
+ * faces.el (list-faces-display, describe-face):
+ * facemenu.el (list-colors-display):
+ * ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
+ * epg.el (epg--process-filter, epg-cancel):
+ * epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
+ (epa--read-signature-type):
+ * emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
+ (emerge-file-names):
+ * ehelp.el (electric-helpify):
+ * ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
+ * ediff-vers.el (rcs-ediff-view-revision):
+ * ediff-util.el (ediff-setup):
+ * ediff-mult.el (ediff-append-custom-diff):
+ * ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
+ (ediff-wordify):
+ * echistory.el (Electric-command-history-redo-expression):
+ * dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
+ * disp-table.el (describe-display-table):
+ * dired.el (dired-find-buffer-nocreate):
+ * dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
+ * dabbrev.el (dabbrev--same-major-mode-p):
+ * chistory.el (list-command-history):
+ * apropos.el (apropos-documentation):
+ * allout.el (allout-obtain-passphrase):
+ (allout-copy-exposed-to-buffer):
+ (allout-verify-passphrase): Use with-current-buffer.
+
2009-11-13 Glenn Morris <address@hidden>
* Makefile.in (ELCFILES): Regenerate.
2009-11-13 Michael Albinus <address@hidden>
- * net/dbus.el (dbus-registered-objects-table): Renamed from
- `dbus-registered-functions-table', because it contains also
- properties.
+ * net/dbus.el (dbus-registered-objects-table): Rename from
+ `dbus-registered-functions-table', because it contains also properties.
(dbus-unregister-object): Unregister also properties.
(dbus-get-property, dbus-set-property, dbus-get-all-properties):
Use a timeout of 500 msec, in order to not block.
@@ -448,8 +530,8 @@
* custom.el (custom-declare-group): Purecopy standard-value.
(custom-declare-group): Purecopy custom-prefix.
- * international/mule.el (load-with-code-conversion): Call
- do-after-load-evaluation unconditionally.
+ * international/mule.el (load-with-code-conversion):
+ Call do-after-load-evaluation unconditionally.
* emacs-lisp/bytecomp.el (byte-compile-output-file-form): Handle
defvaralias.
Index: allout.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/allout.el,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- allout.el 2 Oct 2009 03:48:38 -0000 1.117
+++ allout.el 13 Nov 2009 22:19:49 -0000 1.118
@@ -5605,7 +5605,7 @@
(goto-char beg)
(allout-topic-flat-index))
'(1))))
- (save-excursion (set-buffer tobuf)(erase-buffer))
+ (with-current-buffer tobuf (erase-buffer))
(allout-process-exposed 'allout-insert-listified
beg
end
@@ -6283,8 +6283,7 @@
;; Symmetric hereon:
- (save-excursion
- (set-buffer allout-buffer)
+ (with-current-buffer allout-buffer
(let* ((hint (if (and (not (string= allout-passphrase-hint-string ""))
(or (equal allout-passphrase-hint-handling 'always)
(and (equal allout-passphrase-hint-handling
@@ -6481,8 +6480,7 @@
"True if passphrase successfully decrypts verifier, nil otherwise.
\"Otherwise\" includes absence of passphrase verifier."
- (save-excursion
- (set-buffer allout-buffer)
+ (with-current-buffer allout-buffer
(and (boundp 'allout-passphrase-verifier-string)
allout-passphrase-verifier-string
(allout-encrypt-string (allout-get-encryption-passphrase-verifier)
Index: apropos.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/apropos.el,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- apropos.el 2 Oct 2009 03:48:39 -0000 1.144
+++ apropos.el 13 Nov 2009 22:19:49 -0000 1.145
@@ -736,8 +736,7 @@
(apropos-sort-by-scores apropos-documentation-sort-by-scores)
f v sf sv)
(unwind-protect
- (save-excursion
- (set-buffer standard-input)
+ (with-current-buffer standard-input
(apropos-documentation-check-doc-file)
(if do-all
(mapatoms
Index: chistory.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/chistory.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- chistory.el 5 Jan 2009 03:18:47 -0000 1.29
+++ chistory.el 13 Nov 2009 22:19:50 -0000 1.30
@@ -116,8 +116,7 @@
(prin1 (car history))
(terpri))
(setq history (cdr history))))
- (save-excursion
- (set-buffer "*Command History*")
+ (with-current-buffer "*Command History*"
(goto-char (point-min))
(if (eobp)
(error "No command history")
Index: dabbrev.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dabbrev.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- dabbrev.el 26 Aug 2009 03:07:25 -0000 1.95
+++ dabbrev.el 13 Nov 2009 22:19:50 -0000 1.96
@@ -62,8 +62,7 @@
;; the article for expansion):
;; (set (make-local-variable 'dabbrev-friend-buffer-function)
;; (lambda (buffer)
-;; (save-excursion
-;; (set-buffer buffer)
+;; (with-current-buffer buffer
;; (memq major-mode '(news-reply-mode gnus-article-mode)))))
@@ -594,8 +593,7 @@
;;; Checks if OTHER-BUFFER has the same major mode as current buffer.
(defun dabbrev--same-major-mode-p (other-buffer)
(eq major-mode
- (save-excursion
- (set-buffer other-buffer)
+ (with-current-buffer other-buffer
major-mode)))
;;; Back over all abbrev type characters and then moves forward over
Index: dired-aux.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -b -r1.196 -r1.197
--- dired-aux.el 8 Nov 2009 00:32:22 -0000 1.196
+++ dired-aux.el 13 Nov 2009 22:19:50 -0000 1.197
@@ -1251,8 +1251,7 @@
(let ((expanded-from-dir (expand-file-name from-dir))
(blist (buffer-list)))
(while blist
- (save-excursion
- (set-buffer (car blist))
+ (with-current-buffer (car blist)
(if (and buffer-file-name
(dired-in-this-tree buffer-file-name expanded-from-dir))
(let ((modflag (buffer-modified-p))
@@ -1530,8 +1529,7 @@
;; non-dired buffer may want to profit from this function, e.g. vm-uudecode
(if dired-dwim-target
(let* ((other-buf (window-buffer (next-window)))
- (other-dir (save-excursion
- (set-buffer other-buf)
+ (other-dir (with-current-buffer other-buf
(and (eq major-mode 'dired-mode)
(dired-current-directory)))))
(or other-dir this-dir))
Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -b -r1.441 -r1.442
--- dired.el 12 Nov 2009 22:38:02 -0000 1.441
+++ dired.el 13 Nov 2009 22:19:50 -0000 1.442
@@ -819,8 +819,7 @@
(while blist
(if (null (buffer-name (cdr (car blist))))
(setq blist (cdr blist))
- (save-excursion
- (set-buffer (cdr (car blist)))
+ (with-current-buffer (cdr (car blist))
(if (and (eq major-mode mode)
dired-directory ;; nil during find-alternate-file
(equal dirname
Index: disp-table.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/disp-table.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- disp-table.el 29 Aug 2009 02:25:06 -0000 1.77
+++ disp-table.el 13 Nov 2009 22:19:50 -0000 1.78
@@ -87,8 +87,7 @@
(princ "\nVertical window border glyph: ")
(prin1 (display-table-slot dt 'vertical-border))
(princ "\nCharacter display glyph sequences:\n")
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(let ((vector (make-vector 256 nil))
(i 0))
(while (< i 256)
Index: dos-w32.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dos-w32.el,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- dos-w32.el 28 Aug 2009 04:21:17 -0000 1.59
+++ dos-w32.el 13 Nov 2009 22:19:50 -0000 1.60
@@ -197,8 +197,7 @@
(find-file filename)))
(defun find-file-not-found-set-buffer-file-coding-system ()
- (save-excursion
- (set-buffer (current-buffer))
+ (with-current-buffer (current-buffer)
(let ((coding buffer-file-coding-system))
;; buffer-file-coding-system is already set by
;; find-operation-coding-system, which was called from
Index: echistory.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/echistory.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- echistory.el 5 Jan 2009 03:18:57 -0000 1.28
+++ echistory.el 13 Nov 2009 22:19:50 -0000 1.29
@@ -34,8 +34,7 @@
With prefix arg NOCONFIRM, execute current line as-is without editing."
(interactive "P")
(let (todo)
- (save-excursion
- (set-buffer "*Command History*")
+ (with-current-buffer "*Command History*"
(beginning-of-line)
(setq todo (read (current-buffer)))
(if (boundp 'electric-history-in-progress)
Index: ediff-diff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-diff.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- ediff-diff.el 31 Jan 2009 22:10:29 -0000 1.76
+++ ediff-diff.el 13 Nov 2009 22:19:50 -0000 1.77
@@ -1225,8 +1225,7 @@
(unwind-protect
(let ((directory default-directory)
proc)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(erase-buffer)
(setq default-directory directory)
(if (or (memq system-type '(emx ms-dos windows-nt windows-95))
@@ -1283,8 +1282,7 @@
(if (and (memq (process-status process) '(exit signal))
(buffer-name (process-buffer process)))
(progn
- (save-excursion
- (set-buffer (process-buffer process))
+ (with-current-buffer (process-buffer process)
(setq mode-line-process nil))
(delete-process process))))
@@ -1354,8 +1352,7 @@
ediff-forward-word-function)
ediff-forward-word-function))
inbuf-syntax-tbl sv-point diff-string)
- (save-excursion
- (set-buffer in-buffer)
+ (with-current-buffer in-buffer
(setq inbuf-syntax-tbl
(if control-buf
(ediff-with-current-buffer control-buf
Index: ediff-mult.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- ediff-mult.el 31 Jan 2009 22:10:29 -0000 1.66
+++ ediff-mult.el 13 Nov 2009 22:19:50 -0000 1.67
@@ -1639,8 +1639,7 @@
(cond ((ediff-buffer-live-p custom-diff-buf)
;; for live session buffers we do them first because the user may
;; have changed them with respect to the underlying files
- (save-excursion
- (set-buffer meta-diff-buff)
+ (with-current-buffer meta-diff-buff
(goto-char (point-max))
(insert-buffer-substring custom-diff-buf)
(insert "\n")))
@@ -1649,8 +1648,8 @@
ediff-merge-directories
ediff-merge-directories-with-ancestor))
;; get diffs by calling shell command on ediff-custom-diff-program
- (save-excursion
- (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
+ (with-current-buffer
+ (setq tmp-buf (get-buffer-create ediff-tmp-buffer))
(erase-buffer)
(shell-command
(format
@@ -1662,8 +1661,7 @@
)
t)
)
- (save-excursion
- (set-buffer meta-diff-buff)
+ (with-current-buffer meta-diff-buff
(goto-char (point-max))
(insert-buffer-substring tmp-buf)
(insert "\n")))
Index: ediff-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- ediff-util.el 8 Jun 2009 15:04:22 -0000 1.98
+++ ediff-util.el 13 Nov 2009 22:19:50 -0000 1.99
@@ -343,8 +343,7 @@
(setq buffer-C
(get-buffer-create
(ediff-unique-buffer-name "*ediff-merge" "*")))
- (save-excursion
- (set-buffer buffer-C)
+ (with-current-buffer buffer-C
(insert-buffer-substring buf)
(goto-char (point-min))
(funcall (ediff-with-current-buffer buf major-mode))
Index: ediff-vers.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- ediff-vers.el 28 Aug 2009 16:29:29 -0000 1.46
+++ ediff-vers.el 13 Nov 2009 22:19:51 -0000 1.47
@@ -123,8 +123,7 @@
(fundamental-mode))
(let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
(delete-windows-on output-buffer)
- (save-excursion
- (set-buffer output-buffer)
+ (with-current-buffer output-buffer
(apply 'call-process "co" nil t nil
;; -q: quiet (no diagnostics)
(append switches rcs-default-co-switches
Index: ediff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- ediff.el 2 Oct 2009 03:48:40 -0000 1.109
+++ ediff.el 13 Nov 2009 22:19:51 -0000 1.110
@@ -977,8 +977,7 @@
(buffer-B
(ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
reg-A-beg reg-A-end reg-B-beg reg-B-end)
- (save-excursion
- (set-buffer buffer-A)
+ (with-current-buffer buffer-A
(setq reg-A-beg (region-beginning)
reg-A-end (region-end))
(set-buffer buffer-B)
@@ -1018,8 +1017,7 @@
(buffer-B
(ediff-clone-buffer-for-region-comparison buffer-B "-Region.B-"))
reg-A-beg reg-A-end reg-B-beg reg-B-end)
- (save-excursion
- (set-buffer buffer-A)
+ (with-current-buffer buffer-A
(setq reg-A-beg (region-beginning)
reg-A-end (region-end))
;; enlarge the region to hold full lines
Index: ehelp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ehelp.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- ehelp.el 28 Aug 2009 17:02:56 -0000 1.52
+++ ehelp.el 13 Nov 2009 22:19:51 -0000 1.53
@@ -321,8 +321,7 @@
;;>> suspend updating of the tick in order to allow
;;>> things like momentary-string-display)
(and b
- (save-excursion
- (set-buffer b)
+ (with-current-buffer b
(set-buffer-modified-p t)))
(fset 'help-print-return-message 'ignore)
(call-interactively fun)
@@ -333,8 +332,7 @@
(not (buffer-modified-p b)))))
(fset 'help-print-return-message p)
(and b (buffer-name b)
- (save-excursion
- (set-buffer b)
+ (with-current-buffer b
(set-buffer-modified-p m))))))
(with-electric-help 'ignore name t))))
Index: emerge.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emerge.el,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- emerge.el 6 Oct 2009 02:42:32 -0000 1.62
+++ emerge.el 13 Nov 2009 22:19:51 -0000 1.63
@@ -2060,8 +2060,7 @@
(A-end (1- (aref diff-vector 1)))
;; so further kills don't append
this-command)
- (save-excursion
- (set-buffer emerge-A-buffer)
+ (with-current-buffer emerge-A-buffer
(copy-region-as-kill A-begin A-end))))
(defun emerge-copy-as-kill-B ()
@@ -2074,8 +2073,7 @@
(B-end (1- (aref diff-vector 3)))
;; so further kills don't append
this-command)
- (save-excursion
- (set-buffer emerge-B-buffer)
+ (with-current-buffer emerge-B-buffer
(copy-region-as-kill B-begin B-end))))
(defun emerge-insert-A (arg)
@@ -2170,8 +2168,7 @@
(princ (buffer-name))))
(princ "\n")))
(princ emerge-output-description)
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode)))))
(defun emerge-join-differences (arg)
@@ -3020,8 +3017,7 @@
;; minor-mode indicator))
;; (princ (documentation minor-mode)))))
;; (setq minor-modes (cdr minor-modes))))
-;; (save-excursion
-;; (set-buffer standard-output)
+;; (with-current-buffer standard-output
;; (help-mode))
;; (help-print-return-message)))
Index: epa.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- epa.el 29 Sep 2009 02:26:23 -0000 1.19
+++ epa.el 13 Nov 2009 22:19:51 -0000 1.20
@@ -463,8 +463,7 @@
(apply #'epa--list-keys epa-list-keys-arguments))
(defun epa--marked-keys ()
- (or (save-excursion
- (set-buffer epa-keys-buffer)
+ (or (with-current-buffer epa-keys-buffer
(goto-char (point-min))
(let (keys key)
(while (re-search-forward "^\\*" nil t)
@@ -479,11 +478,10 @@
(list key))))))
(defun epa--select-keys (prompt keys)
- (save-excursion
(unless (and epa-keys-buffer
(buffer-live-p epa-keys-buffer))
(setq epa-keys-buffer (generate-new-buffer "*Keys*")))
- (set-buffer epa-keys-buffer)
+ (with-current-buffer epa-keys-buffer
(epa-key-list-mode)
(let ((inhibit-read-only t)
buffer-read-only)
@@ -615,8 +613,7 @@
(setq epa-info-buffer (generate-new-buffer "*Info*")))
(if (get-buffer-window epa-info-buffer)
(delete-window (get-buffer-window epa-info-buffer)))
- (save-excursion
- (set-buffer epa-info-buffer)
+ (with-current-buffer epa-info-buffer
(let ((inhibit-read-only t)
buffer-read-only)
(erase-buffer)
@@ -716,8 +713,7 @@
(setq type 'detached))
((eq c ??)
(with-output-to-temp-buffer "*Help*"
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(insert "\
n - Create a normal signature
c - Create a cleartext signature
Index: epg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epg.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- epg.el 23 Sep 2009 00:22:08 -0000 1.18
+++ epg.el 13 Nov 2009 22:19:51 -0000 1.19
@@ -1143,8 +1143,7 @@
(goto-char (point-max))
(insert input)))
(if (buffer-live-p (process-buffer process))
- (save-excursion
- (set-buffer (process-buffer process))
+ (with-current-buffer (process-buffer process)
(goto-char (point-max))
(insert input)
(unless epg-process-filter-running
@@ -1927,8 +1926,7 @@
(defun epg-cancel (context)
(if (buffer-live-p (process-buffer (epg-context-process context)))
- (save-excursion
- (set-buffer (process-buffer (epg-context-process context)))
+ (with-current-buffer (process-buffer (epg-context-process context))
(epg-context-set-result-for
epg-context 'error
(cons '(quit)
Index: ezimage.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ezimage.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ezimage.el 5 Jan 2009 03:19:07 -0000 1.13
+++ ezimage.el 13 Nov 2009 22:19:51 -0000 1.14
@@ -300,8 +300,7 @@
See `ezimage-expand-image-button-alist' for details."
(interactive)
(with-output-to-temp-buffer "*Ezimage Images*"
- (save-excursion
- (set-buffer "*Ezimage Images*")
+ (with-current-buffer "*Ezimage Images*"
(goto-char (point-max))
(insert "Ezimage image cache.\n\n")
(let ((start (point)) (end nil))
@@ -324,8 +323,7 @@
See `ezimage-expand-image-button-alist' for details."
(interactive)
(with-output-to-temp-buffer "*Ezimage Images*"
- (save-excursion
- (set-buffer "*Ezimage Images*")
+ (with-current-buffer "*Ezimage Images*"
(goto-char (point-max))
(insert "Ezimage image cache.\n\n")
(let ((start (point)) (end nil))
Index: facemenu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/facemenu.el,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- facemenu.el 11 Nov 2009 05:49:12 -0000 1.113
+++ facemenu.el 13 Nov 2009 22:19:51 -0000 1.114
@@ -494,8 +494,7 @@
(if lc
(setcdr lc nil)))))
(with-help-window (or buffer-name "*Colors*")
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(setq truncate-lines t)
(if temp-buffer-show-function
(list-colors-print list)
Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -b -r1.452 -r1.453
--- faces.el 11 Nov 2009 19:01:10 -0000 1.452
+++ faces.el 13 Nov 2009 22:19:51 -0000 1.453
@@ -1273,8 +1273,7 @@
(setq max-length (1+ max-length)
line-format (format "%%-%ds" max-length))
(with-help-window "*Faces*"
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(setq truncate-lines t)
(insert
(substitute-command-keys
@@ -1362,8 +1361,7 @@
(if (not (listp face))
(setq face (list face)))
(with-help-window (help-buffer)
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(dolist (f face)
(if (stringp f) (setq f (intern f)))
;; We may get called for anonymous faces (i.e., faces
Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1100
retrieving revision 1.1101
diff -u -b -r1.1100 -r1.1101
--- files.el 12 Nov 2009 06:55:42 -0000 1.1100
+++ files.el 13 Nov 2009 22:19:51 -0000 1.1101
@@ -5411,8 +5411,7 @@
(princ "Directory ")
(princ dirname)
(terpri)
- (save-excursion
- (set-buffer "*Directory*")
+ (with-current-buffer "*Directory*"
(let ((wildcard (not (file-directory-p dirname))))
(insert-directory dirname switches wildcard (not wildcard)))))
;; Finishing with-output-to-temp-buffer seems to clobber default-directory.
Index: filesets.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/filesets.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- filesets.el 13 Sep 2009 02:14:28 -0000 1.48
+++ filesets.el 13 Nov 2009 22:19:52 -0000 1.49
@@ -1552,8 +1552,7 @@
if `buffer-modified-p' returns nil.
SAVE-FUNCTION takes no argument, but works on the current buffer."
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(if (buffer-modified-p)
(funcall save-function))
(if (not (buffer-modified-p))
Index: find-dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/find-dired.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- find-dired.el 11 Nov 2009 05:49:12 -0000 1.68
+++ find-dired.el 13 Nov 2009 22:19:52 -0000 1.69
@@ -291,8 +291,7 @@
(let ((buf (process-buffer proc))
(inhibit-read-only t))
(if (buffer-name buf)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(let ((buffer-read-only nil))
(save-excursion
(goto-char (point-max))
Index: finder.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/finder.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- finder.el 5 Nov 2009 03:23:34 -0000 1.83
+++ finder.el 13 Nov 2009 22:19:52 -0000 1.84
@@ -332,8 +332,7 @@
(defun finder-mouse-select (event)
"Select item in a finder buffer with the mouse."
(interactive "e")
- (save-excursion
- (set-buffer (window-buffer (posn-window (event-start event))))
+ (with-current-buffer (window-buffer (posn-window (event-start event)))
(goto-char (posn-point (event-start event)))
(finder-select)))
Index: generic-x.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/generic-x.el,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- generic-x.el 1 Sep 2009 07:24:18 -0000 1.58
+++ generic-x.el 13 Nov 2009 22:19:52 -0000 1.59
@@ -546,9 +546,7 @@
(require 'comint)
(let* ((file (buffer-file-name))
(buf-name (concat "*" file "*")))
- (save-excursion
- (set-buffer
- (get-buffer-create buf-name))
+ (with-current-buffer (get-buffer-create buf-name)
(erase-buffer)
(comint-mode)
(comint-exec
Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- help-fns.el 21 Oct 2009 18:54:58 -0000 1.145
+++ help-fns.el 13 Nov 2009 22:19:52 -0000 1.146
@@ -789,8 +789,7 @@
(terpri)
(princ output))))
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
;; Return the text we displayed.
(buffer-string))))))))
Index: help-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-mode.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- help-mode.el 11 Sep 2009 03:39:48 -0000 1.68
+++ help-mode.el 13 Nov 2009 22:19:52 -0000 1.69
@@ -413,8 +413,7 @@
help buffers. Variable `help-back-label' specifies the text for
that."
(interactive "b")
- (save-excursion
- (set-buffer (or buffer (current-buffer)))
+ (with-current-buffer (or buffer (current-buffer))
(goto-char (point-min))
;; Skip the header-type info, though it might be useful to parse
;; it at some stage (e.g. "function in `library'").
Index: hippie-exp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/hippie-exp.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- hippie-exp.el 11 Nov 2009 05:49:13 -0000 1.42
+++ hippie-exp.el 13 Nov 2009 22:19:52 -0000 1.43
@@ -1000,8 +1000,7 @@
(while (and (not (equal he-search-string ""))
(marker-position he-search-loc)
(not expansion))
- (save-excursion
- (set-buffer (marker-buffer he-search-loc))
+ (with-current-buffer (marker-buffer he-search-loc)
(goto-char he-search-loc)
(setq expansion (he-dabbrev-search he-search-string ()
(window-end he-search-window)))
Index: ido.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ido.el,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- ido.el 15 Oct 2009 01:50:23 -0000 1.160
+++ ido.el 13 Nov 2009 22:19:53 -0000 1.161
@@ -2975,8 +2975,7 @@
(defun ido-copy-current-word (all)
"Insert current word (file or directory name) from current buffer."
(interactive "P")
- (let ((word (save-excursion
- (set-buffer ido-entry-buffer)
+ (let ((word (with-current-buffer ido-entry-buffer
(let ((p (point)) start-line end-line start-name name)
(if (and mark-active (/= p (mark)))
(setq start-name (mark))
@@ -4184,8 +4183,7 @@
ido-text-init contents
ido-rotate-temp t
ido-exit 'refresh)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(ido-tidy))
(throw 'ido contents))))
Index: informat.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/informat.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- informat.el 5 Jan 2009 03:19:26 -0000 1.34
+++ informat.el 13 Nov 2009 22:19:53 -0000 1.35
@@ -497,8 +497,7 @@
nil ;(message "Checking validity of info file %s... OK"
file)
(message
"----------------------------------------------------------------------")
(message ">> PROBLEMS IN INFO FILE %s" file)
- (save-excursion
- (set-buffer loss-name)
+ (with-current-buffer loss-name
(princ (buffer-substring-no-properties
(point-min) (point-max))))
(message
"----------------------------------------------------------------------")
Index: ledit.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ledit.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- ledit.el 5 Jan 2009 03:19:28 -0000 1.31
+++ ledit.el 13 Nov 2009 22:19:53 -0000 1.32
@@ -94,8 +94,7 @@
(if ledit-save-files
(save-some-buffers))
(if (get-buffer ledit-buffer)
- (save-excursion
- (set-buffer ledit-buffer)
+ (with-current-buffer ledit-buffer
(goto-char (point-min))
(write-region (point-min) (point-max) ledit-zap-file)
(erase-buffer)))
@@ -108,8 +107,7 @@
(if ledit-save-files
(save-some-buffers))
(if (get-buffer ledit-buffer)
- (save-excursion
- (set-buffer ledit-buffer)
+ (with-current-buffer ledit-buffer
(goto-char (point-min))
(insert "(declare (macros t))\n")
(write-region (point-min) (point-max) ledit-compile-file)
Index: macros.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/macros.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- macros.el 5 Jan 2009 03:19:31 -0000 1.56
+++ macros.el 13 Nov 2009 22:19:53 -0000 1.57
@@ -209,8 +209,7 @@
\\[exit] Stop the macro entirely right now.
\\[recenter] Redisplay the screen, then ask again.
\\[edit] Enter recursive edit; ask again when you exit from that."))
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode)))))))))))
;;;###autoload
Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -b -r1.369 -r1.370
--- menu-bar.el 11 Nov 2009 05:57:54 -0000 1.369
+++ menu-bar.el 13 Nov 2009 22:19:53 -0000 1.370
@@ -1857,8 +1857,7 @@
;;nil means the buffer shouldn't be listed. You can redefine this."
;; (if (string-match "\\` " (buffer-name buffer))
;; nil
-;; (save-excursion
-;; (set-buffer buffer)
+;; (with-current-buffer buffer
;; (let ((size (buffer-size)))
;; (format "%s%s %-19s %6s %-15s %s"
;; (if (buffer-modified-p) "*" " ")
Index: mouse-copy.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mouse-copy.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- mouse-copy.el 5 Jan 2009 03:19:34 -0000 1.18
+++ mouse-copy.el 13 Nov 2009 22:19:53 -0000 1.19
@@ -200,8 +200,7 @@
(window-buffer (posn-window (event-start click)))
(current-buffer)))
(error "Select or click on the buffer where the secondary selection
is")))
- (save-excursion
- (set-buffer (overlay-buffer mouse-secondary-overlay))
+ (with-current-buffer (overlay-buffer mouse-secondary-overlay)
(kill-region (overlay-start mouse-secondary-overlay)
(overlay-end mouse-secondary-overlay)))
;; (delete-overlay mouse-secondary-overlay)
Index: mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mouse.el,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -b -r1.362 -r1.363
--- mouse.el 6 Nov 2009 05:16:28 -0000 1.362
+++ mouse.el 13 Nov 2009 22:19:53 -0000 1.363
@@ -1975,12 +1975,10 @@
(format "%%-%ds %%s%%s %%s" maxlen)
(buffer-name elt)
(if (buffer-modified-p elt) "*" " ")
- (save-excursion
- (set-buffer elt)
+ (with-current-buffer elt
(if buffer-read-only "%" " "))
(or (buffer-file-name elt)
- (save-excursion
- (set-buffer elt)
+ (with-current-buffer elt
(if list-buffers-directory
(expand-file-name
list-buffers-directory)))
Index: novice.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/novice.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- novice.el 5 Jan 2009 03:19:37 -0000 1.52
+++ novice.el 13 Nov 2009 22:19:53 -0000 1.53
@@ -85,8 +85,7 @@
n to cancel--don't try the command, and it remains disabled.
SPC to try the command just this once, but leave it disabled.
! to try it, and enable all disabled commands for this session only.")
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode)))
(fit-window-to-buffer (get-buffer-window "*Disabled Command*"))
(message "Type y, n, ! or SPC (the space bar): ")
@@ -135,9 +134,8 @@
(eq system-type 'windows-nt)
(file-exists-p "~/_emacs"))
(setq init-file "~/_emacs")))
- (save-excursion
- (set-buffer (find-file-noselect
- (substitute-in-file-name init-file)))
+ (with-current-buffer (find-file-noselect
+ (substitute-in-file-name init-file))
(goto-char (point-min))
(if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
(delete-region
@@ -175,9 +173,8 @@
(eq system-type 'windows-nt)
(file-exists-p "~/_emacs"))
(setq init-file "~/_emacs")))
- (save-excursion
- (set-buffer (find-file-noselect
- (substitute-in-file-name init-file)))
+ (with-current-buffer (find-file-noselect
+ (substitute-in-file-name init-file))
(goto-char (point-min))
(if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
(delete-region
Index: printing.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/printing.el,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- printing.el 21 Aug 2009 07:24:29 -0000 1.63
+++ printing.el 13 Nov 2009 22:19:53 -0000 1.64
@@ -3953,8 +3953,7 @@
For more information, type \\[pr-interface-help]."
(interactive)
- (save-excursion
- (set-buffer (or buffer (current-buffer)))
+ (with-current-buffer (or buffer (current-buffer))
(pr-create-interface)))
@@ -4457,8 +4456,7 @@
(if (string= pr-ps-command "")
;; default action
(let ((ps-spool-buffer (get-buffer-create ps-spool-buffer-name)))
- (save-excursion
- (set-buffer ps-spool-buffer)
+ (with-current-buffer ps-spool-buffer
(erase-buffer)
(insert-file-contents-literally file))
(pr-despool-print))
@@ -5028,8 +5026,7 @@
(symbol-value summary-buffer))
(symbol-value summary-default))))
(and (get-buffer buf)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(pr-mode-print n-up filename header-list)))))
@@ -5039,8 +5036,7 @@
(symbol-value summary-buffer))
(symbol-value summary-default))))
(and (get-buffer buf)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(pr-mode-lpr header-list)))))
@@ -5633,8 +5629,7 @@
status)
(setq args (pr-remove-nil-from-list args))
;; *Printing Command Output* == show command & args
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(goto-char (point-max))
(insert (format "%s %S\n" cmd args)))
;; *Printing Command Output* == show any return message from command
@@ -5645,8 +5640,7 @@
((quit error)
(error-message-string data)))))
;; *Printing Command Output* == show exit status
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(goto-char (point-max))
(insert (format "Exit status: %s\n\n" status)))
;; message if error status
@@ -5839,8 +5833,7 @@
(blist (buffer-list))
found)
(while (and (not found) blist)
- (save-excursion
- (set-buffer (car blist))
+ (with-current-buffer (car blist)
(and (eq major-mode 'dired-mode)
(save-excursion
(goto-char (point-min))
@@ -5864,9 +5857,8 @@
pop-up-frames)
(and (or buffer
(file-readable-p file))
- (save-excursion
- (set-buffer (or buffer
- (find-file-noselect file)))
+ (with-current-buffer (or buffer
+ (find-file-noselect file))
(funcall fun)
(or buffer
(kill-buffer (current-buffer))))))))
@@ -6047,8 +6039,7 @@
(defmacro pr-interface-save (&rest body)
- `(save-excursion
- (set-buffer pr-i-buffer)
+ `(with-current-buffer pr-i-buffer
,@body))
Index: ps-bdf.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ps-bdf.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- ps-bdf.el 10 Jan 2009 21:56:18 -0000 1.37
+++ ps-bdf.el 13 Nov 2009 22:19:54 -0000 1.38
@@ -95,8 +95,7 @@
(and (file-readable-p bdfname)
(let ((buf (generate-new-buffer " *bdf-work*"))
(coding-system-for-read 'no-conversion))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(insert-file-contents bdfname)
buf))))
@@ -225,8 +224,7 @@
(message "Reading %s..." bdfname)
(error "BDF file %s doesn't exist" bdfname))
(unwind-protect
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(goto-char (point-min))
(search-forward "\nFONTBOUNDINGBOX")
(setq font-bounding-box
Index: ps-print.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ps-print.el,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- ps-print.el 26 Oct 2009 06:43:40 -0000 1.230
+++ ps-print.el 13 Nov 2009 22:19:54 -0000 1.231
@@ -4734,8 +4734,7 @@
(ps-output 'prologue (if (stringp args) (list args) args)))
(defun ps-flush-output ()
- (save-excursion
- (set-buffer ps-spool-buffer)
+ (with-current-buffer ps-spool-buffer
(goto-char (point-max))
(while ps-output-head
(let ((it (car ps-output-head)))
@@ -4756,8 +4755,7 @@
(defun ps-insert-file (fname)
(ps-flush-output)
- (save-excursion
- (set-buffer ps-spool-buffer)
+ (with-current-buffer ps-spool-buffer
(goto-char (point-max))
(insert-file-contents fname)))
@@ -4840,8 +4838,7 @@
(defun ps-get-boundingbox ()
- (save-excursion
- (set-buffer ps-spool-buffer)
+ (with-current-buffer ps-spool-buffer
(save-excursion
(if (re-search-forward ps-boundingbox-re nil t)
(vector (string-to-number ; lower x
@@ -4909,8 +4906,7 @@
;; coordinate adjustment to center image
;; around x and y position
(let ((box (ps-get-boundingbox)))
- (save-excursion
- (set-buffer ps-spool-buffer)
+ (with-current-buffer ps-spool-buffer
(save-excursion
(if (re-search-backward "^--back--" nil t)
(replace-match
@@ -5795,8 +5791,7 @@
ps-line-number-step
ps-zebra-stripe-height))))
;; spooling buffer
- (save-excursion
- (set-buffer ps-spool-buffer)
+ (with-current-buffer ps-spool-buffer
(goto-char (point-max))
(and (re-search-backward "^%%Trailer$" nil t)
(delete-region (match-beginning 0) (point-max))))
@@ -6573,8 +6568,7 @@
(and ps-razzle-dazzle (message "Wrote %s" filename)))
;; Else, spool to the printer
(and ps-razzle-dazzle (message "Printing..."))
- (save-excursion
- (set-buffer ps-spool-buffer)
+ (with-current-buffer ps-spool-buffer
(let* ((coding-system-for-write 'raw-text-unix)
(ps-printer-name (or ps-printer-name
(and (boundp 'printer-name)
Index: ps-samp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ps-samp.el,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -b -r2.4 -r2.5
--- ps-samp.el 5 Jan 2009 03:19:41 -0000 2.4
+++ ps-samp.el 13 Nov 2009 22:19:54 -0000 2.5
@@ -72,8 +72,7 @@
(symbol-value summary-buffer))
summary-default)))
(and (get-buffer ps-buf)
- (save-excursion
- (set-buffer ps-buf)
+ (with-current-buffer ps-buf
(ps-spool-buffer-with-faces)))))
;; Look in an article or mail message for the Subject: line. To be
Index: saveplace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/saveplace.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- saveplace.el 5 Jan 2009 03:19:43 -0000 1.48
+++ saveplace.el 13 Nov 2009 22:19:54 -0000 1.49
@@ -205,8 +205,7 @@
(defun save-place-alist-to-file ()
(let ((file (expand-file-name save-place-file))
(coding-system-for-write 'utf-8))
- (save-excursion
- (set-buffer (get-buffer-create " *Saved Places*"))
+ (with-current-buffer (get-buffer-create " *Saved Places*")
(delete-region (point-min) (point-max))
(when save-place-forget-unreadable-files
(save-place-forget-unreadable-files))
@@ -236,10 +235,9 @@
;; make sure that the alist does not get overwritten, and then
;; load it if it exists:
(if (file-readable-p file)
- (save-excursion
;; don't want to use find-file because we have been
;; adding hooks to it.
- (set-buffer (get-buffer-create " *Saved Places*"))
+ (with-current-buffer (get-buffer-create " *Saved Places*")
(delete-region (point-min) (point-max))
(insert-file-contents file)
(goto-char (point-min))
@@ -275,8 +273,7 @@
;; put this into a save-excursion in case someone is counting on
;; another function in kill-emacs-hook to act on the last buffer
;; they were in:
- (save-excursion
- (set-buffer (car buf-list))
+ (with-current-buffer (car buf-list)
;; save-place checks buffer-file-name too, but we can avoid
;; overhead of function call by checking here too.
(and buffer-file-name (save-place-to-alist))
Index: sb-image.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/sb-image.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- sb-image.el 5 Jan 2009 03:19:43 -0000 1.11
+++ sb-image.el 13 Nov 2009 22:19:54 -0000 1.12
@@ -85,8 +85,7 @@
See `speedbar-expand-image-button-alist' for details."
(interactive)
(with-output-to-temp-buffer "*Speedbar Images*"
- (save-excursion
- (set-buffer "*Speedbar Images*")
+ (with-current-buffer "*Speedbar Images*"
(goto-char (point-max))
(insert "Speedbar image cache.\n\n")
(let ((start (point)) (end nil))
Index: scroll-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/scroll-bar.el,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- scroll-bar.el 24 Feb 2009 16:11:10 -0000 1.62
+++ scroll-bar.el 13 Nov 2009 22:19:54 -0000 1.63
@@ -156,7 +156,7 @@
;;;; Buffer navigation using the scroll bar.
-;;; This was used for up-events on button 2, but no longer.
+;; This was used for up-events on button 2, but no longer.
(defun scroll-bar-set-window-start (event)
"Set the window start according to where the scroll bar is dragged.
EVENT should be a scroll bar click or drag event."
@@ -164,8 +164,7 @@
(let* ((end-position (event-end event))
(window (nth 0 end-position))
(portion-whole (nth 2 end-position)))
- (save-excursion
- (set-buffer (window-buffer window))
+ (with-current-buffer (window-buffer window)
(save-excursion
(goto-char (+ (point-min)
(scroll-bar-scale portion-whole
@@ -195,8 +194,7 @@
portion-start
next-portion-start
(current-start (window-start window)))
- (save-excursion
- (set-buffer (window-buffer window))
+ (with-current-buffer (window-buffer window)
(setq portion-start (scroll-bar-drag-position portion-whole))
(setq next-portion-start (max
(scroll-bar-drag-position next-portion-whole)
@@ -212,8 +210,7 @@
(let* ((start-position (event-start event))
(window (nth 0 start-position))
(portion-whole (nth 2 start-position)))
- (save-excursion
- (set-buffer (window-buffer window))
+ (with-current-buffer (window-buffer window)
;; Calculate position relative to the accessible part of the buffer.
(goto-char (+ (point-min)
(scroll-bar-scale portion-whole
@@ -339,7 +336,7 @@
;;;; Bindings.
-;;; For now, we'll set things up to work like xterm.
+;; For now, we'll set things up to work like xterm.
(cond ((and (boundp 'x-toolkit-scroll-bars) x-toolkit-scroll-bars)
(global-set-key [vertical-scroll-bar mouse-1]
'scroll-bar-toolkit-scroll))
Index: shadowfile.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/shadowfile.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- shadowfile.el 2 Oct 2009 03:48:42 -0000 1.45
+++ shadowfile.el 13 Nov 2009 22:19:54 -0000 1.46
@@ -707,8 +707,7 @@
(defun shadow-save-todo-file ()
(if (and shadow-todo-buffer (buffer-modified-p shadow-todo-buffer))
- (save-excursion
- (set-buffer shadow-todo-buffer)
+ (with-current-buffer shadow-todo-buffer
(condition-case nil ; have to continue even in case of
(basic-save-buffer) ; error, otherwise kill-emacs might
(error ; not work!
Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.1026
retrieving revision 1.1027
diff -u -b -r1.1026 -r1.1027
--- simple.el 13 Nov 2009 14:50:21 -0000 1.1026
+++ simple.el 13 Nov 2009 22:19:54 -0000 1.1027
@@ -2423,8 +2423,7 @@
;; Clear the output buffer, then run the command with
;; output there.
(let ((directory default-directory))
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(setq buffer-read-only nil)
(if (not output-buffer)
(setq default-directory directory))
@@ -3469,11 +3468,10 @@
(list (read-buffer "Append to buffer: " (other-buffer (current-buffer) t))
(region-beginning) (region-end)))
(let ((oldbuf (current-buffer)))
- (save-excursion
(let* ((append-to (get-buffer-create buffer))
(windows (get-buffer-window-list append-to t t))
point)
- (set-buffer append-to)
+ (with-current-buffer append-to
(setq point (point))
(barf-if-buffer-read-only)
(insert-buffer-substring oldbuf start end)
@@ -3490,8 +3488,7 @@
START and END specify the portion of the current buffer to be copied."
(interactive "BPrepend to buffer: \nr")
(let ((oldbuf (current-buffer)))
- (save-excursion
- (set-buffer (get-buffer-create buffer))
+ (with-current-buffer (get-buffer-create buffer)
(barf-if-buffer-read-only)
(save-excursion
(insert-buffer-substring oldbuf start end)))))
Index: speedbar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/speedbar.el,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- speedbar.el 29 Sep 2009 02:26:23 -0000 1.107
+++ speedbar.el 13 Nov 2009 22:19:55 -0000 1.108
@@ -1173,8 +1173,7 @@
(with-no-warnings
(specifier-instance has-modeline-p)))
speedbar-buffer)
- (save-excursion
- (set-buffer speedbar-buffer)
+ (with-current-buffer speedbar-buffer
(let* ((w (or (speedbar-frame-width) 20))
(p1 "<<")
(p5 ">>")
@@ -1246,8 +1245,7 @@
(current-buffer))
speedbar-special-mode-key-map)
(select-frame cf))))))
- (save-excursion
- (set-buffer speedbar-buffer)
+ (with-current-buffer speedbar-buffer
(use-local-map (or localmap
(speedbar-initial-keymap)
;; This creates a small keymap we can glom the
@@ -1859,8 +1857,7 @@
(if (stringp buffer) (setq buffer (get-buffer buffer)))
(if (not (buffer-live-p buffer))
nil
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(save-match-data
(let ((ms (symbol-name major-mode)) v)
(if (not (string-match "-mode$" ms))
@@ -1893,8 +1890,7 @@
(defun speedbar-remove-localized-speedbar-support (buffer)
"Remove any traces that BUFFER supports speedbar in a specialized way."
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(kill-local-variable 'speedbar-special-mode-expansion-list)
(kill-local-variable 'speedbar-special-mode-key-map)
(kill-local-variable 'speedbar-easymenu-definition-special)))
@@ -2383,7 +2379,7 @@
(or (speedbar-line-file)
(speedbar-line-directory))))
(methods (if (get-file-buffer f)
- (save-excursion (set-buffer (get-file-buffer f))
+ (with-current-buffer (get-file-buffer f)
speedbar-tag-hierarchy-method)
speedbar-tag-hierarchy-method))
(lst (if (fboundp 'copy-tree)
@@ -2612,9 +2608,8 @@
This should only be used by modes classified as special."
(let ((funclst speedbar-special-mode-expansion-list)
(specialbuff (current-buffer)))
- (save-excursion
(setq speedbar-desired-buffer specialbuff)
- (set-buffer speedbar-buffer)
+ (with-current-buffer speedbar-buffer
;; If we are leaving a directory, cache it.
(if (not speedbar-shown-directories)
;; Do nothing
@@ -3887,7 +3882,7 @@
(buffer-name (car bl))))
(expchar (if known ?+ ??))
(fn (if known 'speedbar-tag-file nil))
- (fname (save-excursion (set-buffer (car bl))
+ (fname (with-current-buffer (car bl)
(buffer-file-name))))
(speedbar-make-tag-line 'bracket expchar fn
(if fname (file-name-nondirectory fname))
@@ -3928,8 +3923,7 @@
"Add a note to the end of the last tag line.
Argument BUFFER is the buffer being tested."
(let (mod ro)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(setq mod (buffer-modified-p)
ro buffer-read-only))
(if ro (speedbar-insert-button "%" nil nil nil nil t))))
@@ -3943,9 +3937,8 @@
(speedbar-message "%s%s %S %d %s"
(if (buffer-modified-p buffer) "* " "")
item
- (save-excursion (set-buffer buffer) major-mode)
- (save-excursion (set-buffer buffer)
- (buffer-size))
+ (with-current-buffer buffer major-mode)
+ (with-current-buffer buffer (buffer-size))
(or (buffer-file-name buffer) "<No file>"))))))
(defun speedbar-buffers-line-directory (&optional depth)
@@ -3963,8 +3956,7 @@
(if (save-excursion
(end-of-line)
(eq start (point)))
- (or (save-excursion (set-buffer buffer)
- default-directory)
+ (or (with-current-buffer buffer default-directory)
"")
(buffer-file-name buffer))))))))
Index: strokes.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/strokes.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- strokes.el 2 Oct 2009 03:48:42 -0000 1.43
+++ strokes.el 13 Nov 2009 22:19:55 -0000 1.44
@@ -1536,8 +1536,7 @@
(defun strokes-xpm-to-compressed-string (&optional xpm-buffer)
"Convert XPM in XPM-BUFFER to compressed string representing the stroke.
XPM-BUFFER defaults to ` *strokes-xpm*'."
- (save-excursion
- (set-buffer (setq xpm-buffer (or xpm-buffer " *strokes-xpm*")))
+ (with-current-buffer (setq xpm-buffer (or xpm-buffer " *strokes-xpm*"))
(goto-char (point-min))
(search-forward "/* pixels */") ; skip past header junk
(forward-char 2)
@@ -1620,8 +1619,7 @@
Optional FORCE non-nil will ignore the buffer's read-only status."
(interactive)
;; (interactive "*bStrokify buffer: ")
- (save-excursion
- (set-buffer (setq buffer (get-buffer (or buffer (current-buffer)))))
+ (with-current-buffer (setq buffer (get-buffer (or buffer (current-buffer))))
(when (or (not buffer-read-only)
force
inhibit-read-only
@@ -1669,8 +1667,7 @@
;; buffer is killed?
;; (interactive "*bUnstrokify buffer: ")
(interactive)
- (save-excursion
- (set-buffer (setq buffer (or buffer (current-buffer))))
+ (with-current-buffer (setq buffer (or buffer (current-buffer)))
(when (or (not buffer-read-only)
force
inhibit-read-only
@@ -1706,9 +1703,8 @@
(defun strokes-xpm-for-compressed-string (compressed-string &optional bufname)
"Convert the stroke represented by COMPRESSED-STRING into an XPM.
Store XPM in buffer BUFNAME if supplied \(default is ` *strokes-xpm*'\)"
- (save-excursion
(or bufname (setq bufname " *strokes-xpm*"))
- (set-buffer (get-buffer-create bufname))
+ (with-current-buffer (get-buffer-create bufname)
(erase-buffer)
(insert compressed-string)
(goto-char (point-min))
Index: term.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term.el,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- term.el 24 Oct 2009 03:49:47 -0000 1.123
+++ term.el 13 Nov 2009 22:19:55 -0000 1.124
@@ -1347,8 +1347,7 @@
;; If no process, or nuked process, crank up a new one and put buffer in
;; term mode. Otherwise, leave buffer and existing process alone.
(cond ((not (term-check-proc buffer))
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(term-mode)) ; Install local vars, mode, keymap, ...
(term-exec buffer name program startfile switches)))
buffer))
@@ -1375,8 +1374,7 @@
Blasts any old process running in the buffer. Doesn't set the buffer mode.
You can use this to cheaply run a series of processes in the same term
buffer. The hook `term-exec-hook' is run after each exec."
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(let ((proc (get-buffer-process buffer))) ; Blast any old process.
(when proc (delete-process proc)))
;; Crank up a new process
@@ -1412,24 +1410,16 @@
(if (null (buffer-name buffer))
;; buffer killed
(set-process-buffer proc nil)
- (let ((obuf (current-buffer)))
- ;; save-excursion isn't the right thing if
- ;; process-buffer is current-buffer
- (unwind-protect
- (progn
+ (with-current-buffer buffer
;; Write something in the compilation buffer
;; and hack its mode line.
- (set-buffer buffer)
;; Get rid of local keymap.
(use-local-map nil)
- (term-handle-exit (process-name proc)
- msg)
+ (term-handle-exit (process-name proc) msg)
;; Since the buffer and mode line will show that the
;; process is dead, we can delete it now. Otherwise it
;; will stay around until M-x list-processes.
- (delete-process proc))
- (set-buffer obuf)))
- ))))
+ (delete-process proc))))))
(defun term-handle-exit (process-name msg)
"Write process exit (or other change) message MSG in the current buffer."
@@ -1557,8 +1547,7 @@
(count 0)
(ring (make-ring term-input-ring-size)))
(unwind-protect
- (save-excursion
- (set-buffer history-buf)
+ (with-current-buffer history-buf
(widen)
(erase-buffer)
(insert-file-contents file)
@@ -1601,8 +1590,7 @@
(index (ring-length ring)))
;; Write it all out into a buffer first. Much faster, but messier,
;; than writing it one line at a time.
- (save-excursion
- (set-buffer history-buf)
+ (with-current-buffer history-buf
(erase-buffer)
(while (> index 0)
(setq index (1- index))
@@ -2460,10 +2448,8 @@
(y-or-n-p (format "Save buffer %s first? "
(buffer-name buff))))
;; save BUFF.
- (let ((old-buffer (current-buffer)))
- (set-buffer buff)
- (save-buffer)
- (set-buffer old-buffer)))))
+ (with-current-buffer buff
+ (save-buffer)))))
;; (TERM-GET-SOURCE prompt prev-dir/file source-modes mustmatch-p)
@@ -3453,8 +3439,7 @@
(defun term-display-buffer-line (buffer line)
(let* ((window (display-buffer buffer t))
(pos))
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(save-restriction
(widen)
(goto-char (point-min))
@@ -3896,8 +3881,7 @@
(message "Output logging off."))
(if (get-buffer name)
nil
- (save-excursion
- (set-buffer (get-buffer-create name))
+ (with-current-buffer (get-buffer-create name)
(fundamental-mode)
(buffer-disable-undo (current-buffer))
(erase-buffer)))
@@ -4169,8 +4153,7 @@
(display-completion-list (sort completions 'string-lessp)))
(message "Hit space to flush")
(let (key first)
- (if (save-excursion
- (set-buffer (get-buffer "*Completions*"))
+ (if (with-current-buffer (get-buffer "*Completions*")
(setq key (read-key-sequence nil)
first (aref key 0))
(and (consp first)
@@ -4197,8 +4180,7 @@
;; If no process, or nuked process, crank up a new one and put buffer in
;; term mode. Otherwise, leave buffer and existing process alone.
(cond ((not (term-check-proc buffer))
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(term-mode)) ; Install local vars, mode, keymap, ...
(term-exec buffer name program startfile switches)))
buffer))
@@ -4383,8 +4365,7 @@
:coding 'no-conversion
:noquery t))
(buffer (process-buffer process)))
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(term-mode)
(term-char-mode)
(goto-char (point-max))
Index: terminal.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/terminal.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- terminal.el 9 Jan 2009 05:01:00 -0000 1.69
+++ terminal.el 13 Nov 2009 22:19:55 -0000 1.70
@@ -326,8 +326,7 @@
(message "Output logging off."))
(if (get-buffer name)
nil
- (save-excursion
- (set-buffer (get-buffer-create name))
+ (with-current-buffer (get-buffer-create name)
(fundamental-mode)
(buffer-disable-undo (current-buffer))
(erase-buffer)))
@@ -610,8 +609,7 @@
"%-"))
(set-process-filter te-process
(function (lambda (process string)
- (save-excursion
- (set-buffer (process-buffer process))
+ (with-current-buffer (process-buffer process)
(setq te-pending-output (nconc te-pending-output
(list string))))
(te-update-pending-output-display))))
@@ -874,11 +872,7 @@
(defun te-filter (process string)
- (let* ((obuf (current-buffer)))
- ;; can't use save-excursion, as that preserves point, which we don't want
- (unwind-protect
- (progn
- (set-buffer (process-buffer process))
+ (with-current-buffer (process-buffer process)
(goto-char te-saved-point)
(and (bufferp te-log-buffer)
(if (null (buffer-name te-log-buffer))
@@ -893,8 +887,7 @@
(te-process-output (eq (current-buffer)
(window-buffer (selected-window))))
(set-buffer (process-buffer process))
- (setq te-saved-point (point)))
- (set-buffer obuf))))
+ (setq te-saved-point (point))))
;; (A version of the following comment which might be distractingly offensive
;; to some readers has been moved to term-nasty.el.)
@@ -1043,8 +1036,7 @@
(cond ((eq (process-status process) 'run))
((null (buffer-name (process-buffer process)))) ;deleted
(t (let ((b (current-buffer)))
- (save-excursion
- (set-buffer (process-buffer process))
+ (with-current-buffer (process-buffer process)
(setq buffer-read-only nil)
(fundamental-mode)
(goto-char (point-max))
@@ -1097,8 +1089,7 @@
and is non-nil after the terminal buffer has been set up and the
subprocess started."
(interactive
- (cons (save-excursion
- (set-buffer (get-buffer-create "*terminal*"))
+ (cons (with-current-buffer (get-buffer-create "*terminal*")
(buffer-name (if (or (not (boundp 'te-process))
(null te-process)
(not (eq (process-status te-process)
Index: time-stamp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/time-stamp.el,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- time-stamp.el 19 Sep 2009 19:43:40 -0000 1.74
+++ time-stamp.el 13 Nov 2009 22:19:55 -0000 1.75
@@ -660,8 +660,7 @@
Suggests replacing OLD-FORM with NEW-FORM."
(cond
(time-stamp-conversion-warn
- (save-excursion
- (set-buffer (get-buffer-create "*Time-stamp-compatibility*"))
+ (with-current-buffer (get-buffer-create "*Time-stamp-compatibility*")
(goto-char (point-max))
(if (bobp)
(progn
Index: type-break.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/type-break.el,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- type-break.el 2 Oct 2009 03:48:42 -0000 1.53
+++ type-break.el 13 Nov 2009 22:19:56 -0000 1.54
@@ -1094,7 +1094,7 @@
(defun type-break-force-mode-line-update (&optional all)
"Force the mode-line of the current buffer to be redisplayed.
With optional non-nil ALL, force redisplay of all mode-lines."
- (and all (save-excursion (set-buffer (other-buffer))))
+ (and all (with-current-buffer (other-buffer)))
(set-buffer-modified-p (buffer-modified-p)))
;; If an exception occurs in Emacs while running the post command hook, the
@@ -1108,9 +1108,9 @@
;;; Timer wrapper functions
-;;;
-;;; These shield type-break from variations in the interval timer packages
-;;; for different versions of Emacs.
+;;
+;; These shield type-break from variations in the interval timer packages
+;; for different versions of Emacs.
(defun type-break-run-at-time (time repeat function)
(condition-case nil (or (require 'timer) (require 'itimer)) (error nil))
Index: userlock.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/userlock.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- userlock.el 5 Jan 2009 03:19:51 -0000 1.26
+++ userlock.el 13 Nov 2009 22:19:56 -0000 1.27
@@ -91,8 +91,7 @@
intruder if (s)he ever unmodifies the file and then changes it again.
You can <p>roceed; you edit at your own (and the other user's) risk.
You can <q>uit; don't modify this file.")
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode))))
(put
@@ -155,8 +154,7 @@
Usually, you should type `n' and then `M-x revert-buffer',
to get the latest version of the file, then make the change again.")
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode))))
;; arch-tag: a61c5b60-e1c8-44fd-894a-c617f4dfc639
Index: vc-rcs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-rcs.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- vc-rcs.el 11 Nov 2009 05:49:13 -0000 1.95
+++ vc-rcs.el 13 Nov 2009 22:19:56 -0000 1.96
@@ -1055,8 +1055,7 @@
(cond
((not (get-file-buffer file)) nil)
((let (status version locking-user)
- (save-excursion
- (set-buffer (get-file-buffer file))
+ (with-current-buffer (get-file-buffer file)
(goto-char (point-min))
(cond
;; search for $Id or $Header
Index: whitespace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/whitespace.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- whitespace.el 24 Oct 2009 21:51:06 -0000 1.95
+++ whitespace.el 13 Nov 2009 22:19:56 -0000 1.96
@@ -1942,8 +1942,7 @@
(unless (get-buffer whitespace-help-buffer-name)
(delete-other-windows)
(let ((buffer (get-buffer-create whitespace-help-buffer-name)))
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(erase-buffer)
(insert whitespace-help-text)
(whitespace-insert-option-mark
Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- window.el 15 Oct 2009 06:18:02 -0000 1.184
+++ window.el 13 Nov 2009 22:19:56 -0000 1.185
@@ -1270,8 +1270,7 @@
(setq size (+ (window-height) size)))
(setq new-window (split-window nil size))
(unless split-window-keep-point
- (save-excursion
- (set-buffer (window-buffer))
+ (with-current-buffer (window-buffer)
(goto-char (window-start))
(setq moved (vertical-motion (window-height)))
(set-window-start new-window (point))
Index: x-dnd.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/x-dnd.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- x-dnd.el 6 Nov 2009 05:16:28 -0000 1.37
+++ x-dnd.el 13 Nov 2009 22:19:57 -0000 1.38
@@ -175,10 +175,10 @@
(let ((buffer (when (window-live-p window)
(window-buffer window)))
(current-state (x-dnd-get-state-for-frame window)))
- (when (or (not (equal buffer (aref current-state 0)))
- (not (equal window (aref current-state 1)))
- (not (equal action (aref current-state 3))))
- (save-excursion
+ (unless (and (equal buffer (aref current-state 0))
+ (equal window (aref current-state 1))
+ (equal action (aref current-state 3)))
+ (save-current-buffer
(when buffer (set-buffer buffer))
(let* ((action-type (funcall x-dnd-test-function
window
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog allout.el apropos.el chist...,
Stefan Monnier <=