[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog calendar/cal-hebrew.el cal...
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog calendar/cal-hebrew.el cal... |
Date: |
Tue, 03 Nov 2009 02:04:37 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/11/03 02:04:36
Modified files:
lisp : ChangeLog
lisp/calendar : cal-hebrew.el diary-lib.el
lisp/emulation : cua-gmrk.el cua-rect.el edt.el vi.el vip.el
viper-cmd.el viper-ex.el viper-keym.el
viper-util.el viper.el
lisp/erc : ChangeLog erc-truncate.el erc.el
lisp/eshell : em-unix.el esh-ext.el
lisp/mail : feedmail.el hashcash.el mailpost.el reporter.el
rfc822.el rmailsum.el smtpmail.el supercite.el
lisp/play : decipher.el dissociate.el fortune.el gomoku.el
landmark.el mpuz.el
lisp/term : ns-win.el
lisp/url : ChangeLog url-cid.el url-imap.el url-ldap.el
url-nfs.el url-util.el
Log message:
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16544&r2=1.16545
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/cal-hebrew.el?cvsroot=emacs&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/diary-lib.el?cvsroot=emacs&r1=1.192&r2=1.193
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/cua-gmrk.el?cvsroot=emacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/cua-rect.el?cvsroot=emacs&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/edt.el?cvsroot=emacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/vi.el?cvsroot=emacs&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/vip.el?cvsroot=emacs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-cmd.el?cvsroot=emacs&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-ex.el?cvsroot=emacs&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-keym.el?cvsroot=emacs&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-util.el?cvsroot=emacs&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper.el?cvsroot=emacs&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/ChangeLog?cvsroot=emacs&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc-truncate.el?cvsroot=emacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/erc/erc.el?cvsroot=emacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/em-unix.el?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/esh-ext.el?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/feedmail.el?cvsroot=emacs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/hashcash.el?cvsroot=emacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/mailpost.el?cvsroot=emacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/reporter.el?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rfc822.el?cvsroot=emacs&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailsum.el?cvsroot=emacs&r1=1.181&r2=1.182
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/smtpmail.el?cvsroot=emacs&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/supercite.el?cvsroot=emacs&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/decipher.el?cvsroot=emacs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/dissociate.el?cvsroot=emacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/fortune.el?cvsroot=emacs&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/gomoku.el?cvsroot=emacs&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/landmark.el?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/play/mpuz.el?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/ns-win.el?cvsroot=emacs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/ChangeLog?cvsroot=emacs&r1=1.185&r2=1.186
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-cid.el?cvsroot=emacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-imap.el?cvsroot=emacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-ldap.el?cvsroot=emacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-nfs.el?cvsroot=emacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-util.el?cvsroot=emacs&r1=1.32&r2=1.33
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16544
retrieving revision 1.16545
diff -u -b -r1.16544 -r1.16545
--- ChangeLog 3 Nov 2009 00:39:10 -0000 1.16544
+++ ChangeLog 3 Nov 2009 02:04:29 -0000 1.16545
@@ -1,3 +1,58 @@
+2009-11-03 Stefan Monnier <address@hidden>
+
+ * term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
+ * play/mpuz.el (mpuz-create-buffer):
+ * play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
+ (lm-print-y,s,noise, lm-print-w0, lm-init):
+ * play/gomoku.el (gomoku-prompt-for-move):
+ * play/fortune.el (fortune-in-buffer):
+ * play/dissociate.el (dissociated-press):
+ * play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
+ (decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
+ * mail/supercite.el (sc-eref-show):
+ * mail/smtpmail.el (smtpmail-send-it):
+ * mail/rmailsum.el (rmail-summary-next-labeled-message)
+ (rmail-summary-previous-labeled-message, rmail-summary-wipe)
+ (rmail-summary-undelete-many, rmail-summary-rmail-update)
+ (rmail-summary-goto-msg, rmail-summary-expunge)
+ (rmail-summary-get-new-mail, rmail-summary-search-backward)
+ (rmail-summary-add-label, rmail-summary-output-menu)
+ (rmail-summary-output-body):
+ * mail/rfc822.el (rfc822-addresses):
+ * mail/reporter.el (reporter-dump-variable, reporter-dump-state):
+ * mail/mailpost.el (post-mail-send-it):
+ * mail/hashcash.el (hashcash-generate-payment):
+ * mail/feedmail.el (feedmail-run-the-queue)
+ (feedmail-queue-send-edit-prompt-help-first)
+ (feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
+ (feedmail-deduce-address-list):
+ * eshell/esh-ext.el (eshell-remote-command):
+ * eshell/em-unix.el (eshell-occur-mode-mouse-goto):
+ * emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
+ (viper-wildcard-to-regexp, viper-glob-mswindows-files)
+ (viper-save-string-in-file, viper-valid-marker):
+ * emulation/viper-keym.el (viper-toggle-key):
+ * emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
+ (ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
+ (ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
+ * emulation/viper-cmd.el (viper-exec-form-in-vi)
+ (viper-exec-form-in-emacs, viper-brac-function):
+ * emulation/viper.el (viper-delocalize-var):
+ * emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
+ (vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
+ (vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
+ (ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
+ * emulation/vi.el (vi-switch-mode, vi-ex-cmd):
+ * emulation/edt.el (edt-electric-helpify):
+ * emulation/cua-rect.el (cua--rectangle-aux-replace):
+ * emulation/cua-gmrk.el (cua--insert-at-global-mark)
+ (cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
+ (cua-indent-to-global-mark-column):
+ * calendar/diary-lib.el (calendar-mark-1):
+ * calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
+ Use with-current-buffer.
+ * emulation/viper.el (viper-delocalize-var): Use dolist.
+
2009-11-03 Chong Yidong <address@hidden>
* comint.el (comint-replace-by-expanded-history-before-point):
@@ -27,8 +82,8 @@
* textmodes/sgml-mode.el (sgml-mode-facemenu-add-face-function):
Support face colors.
- * textmodes/tex-mode.el (tex-facemenu-add-face-function): New
- function. Support face colors (Bug#1168).
+ * textmodes/tex-mode.el (tex-facemenu-add-face-function):
+ New function. Support face colors (Bug#1168).
(tex-common-initialization): Use it.
* facemenu.el (facemenu-enable-faces-p): Enable facemenu if the
Index: calendar/cal-hebrew.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-hebrew.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- calendar/cal-hebrew.el 5 Jan 2009 03:20:33 -0000 1.70
+++ calendar/cal-hebrew.el 3 Nov 2009 02:04:34 -0000 1.71
@@ -646,8 +646,7 @@
passed to `calendar-mark-visible-date' as MARK."
;; FIXME not the same as the Bahai and Islamic cases, so can't use
;; calendar-mark-1.
- (save-excursion
- (set-buffer calendar-buffer)
+ (with-current-buffer calendar-buffer
(if (and (not (zerop month)) (not (zerop day)))
(if (not (zerop year))
;; Fully specified Hebrew date.
Index: calendar/diary-lib.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- calendar/diary-lib.el 5 Oct 2009 05:39:52 -0000 1.192
+++ calendar/diary-lib.el 3 Nov 2009 02:04:34 -0000 1.193
@@ -1506,8 +1506,7 @@
The function FROMABS converts absolute dates to the appropriate date system.
The function TOABS carries out the inverse operation. Optional argument
COLOR is passed to `calendar-mark-visible-date' as MARK."
- (save-excursion
- (set-buffer calendar-buffer)
+ (with-current-buffer calendar-buffer
(if (and (not (zerop month)) (not (zerop day)))
(if (not (zerop year))
;; Fully specified date.
Index: emulation/cua-gmrk.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/cua-gmrk.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- emulation/cua-gmrk.el 5 Jan 2009 03:21:14 -0000 1.18
+++ emulation/cua-gmrk.el 3 Nov 2009 02:04:34 -0000 1.19
@@ -110,8 +110,7 @@
(defun cua--insert-at-global-mark (str &optional msg)
;; Insert string at global marker and move marker
- (save-excursion
- (set-buffer (marker-buffer cua--global-mark-marker))
+ (with-current-buffer (marker-buffer cua--global-mark-marker)
(goto-char (marker-position cua--global-mark-marker))
(insert-for-yank str)
(cua--activate-global-mark))
@@ -123,8 +122,7 @@
(defun cua--delete-at-global-mark (arg &optional msg)
;; Delete chars at global marker
- (save-excursion
- (set-buffer (marker-buffer cua--global-mark-marker))
+ (with-current-buffer (marker-buffer cua--global-mark-marker)
(goto-char (marker-position cua--global-mark-marker))
(delete-char arg))
(if msg
@@ -190,8 +188,7 @@
(if (cua--global-mark-active)
(let ((src-buf (current-buffer))
(text (cua--extract-rectangle)))
- (save-excursion
- (set-buffer (marker-buffer cua--global-mark-marker))
+ (with-current-buffer (marker-buffer cua--global-mark-marker)
(goto-char (marker-position cua--global-mark-marker))
(if as-text
(while text
@@ -309,8 +306,7 @@
(interactive "*")
(if (cua--global-mark-active)
(let (col)
- (save-excursion
- (set-buffer (marker-buffer cua--global-mark-marker))
+ (with-current-buffer (marker-buffer cua--global-mark-marker)
(goto-char (marker-position cua--global-mark-marker))
(setq col (current-column)))
(if cua--rectangle
Index: emulation/cua-rect.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/cua-rect.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- emulation/cua-rect.el 9 Apr 2009 17:13:56 -0000 1.43
+++ emulation/cua-rect.el 3 Nov 2009 02:04:34 -0000 1.44
@@ -1198,8 +1198,7 @@
(- (cua--rectangle-right) (cua--rectangle-left) -1)))
(r (or setup-fct (cua--extract-rectangle)))
y z (tr 0))
- (save-excursion
- (set-buffer auxbuf)
+ (with-current-buffer auxbuf
(erase-buffer)
(if setup-fct
(funcall setup-fct)
Index: emulation/edt.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/edt.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- emulation/edt.el 2 Oct 2009 03:48:44 -0000 1.69
+++ emulation/edt.el 3 Nov 2009 02:04:34 -0000 1.70
@@ -2657,8 +2657,7 @@
(progn
(message "%s..." (capitalize (symbol-name fun)))
(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)
@@ -2669,8 +2668,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 'delete-other-windows name t))))
Index: emulation/vi.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/vi.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- emulation/vi.el 22 Aug 2009 19:42:58 -0000 1.34
+++ emulation/vi.el 3 Nov 2009 02:04:34 -0000 1.35
@@ -79,8 +79,7 @@
(if (null mode-cmd)
(with-output-to-temp-buffer "*Help*"
(princ (substitute-command-keys "Possible major modes to switch to:
\\{vi-tilde-map}"))
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode)))
(setq prefix-arg arg) ; prefix arg will be passed down
(command-execute mode-cmd nil) ; may need to save mode-line-format etc
@@ -499,8 +498,7 @@
;; (cond ((string-match "s"))))
(with-output-to-temp-buffer "*Help*"
(princ (documentation 'vi-ex-cmd))
- (save-excursion
- (set-buffer standard-output)
+ (with-current-buffer standard-output
(help-mode))))
(defun vi-undefined ()
Index: emulation/vip.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/vip.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- emulation/vip.el 9 Jan 2009 04:36:04 -0000 1.49
+++ emulation/vip.el 3 Nov 2009 02:04:34 -0000 1.50
@@ -419,10 +419,9 @@
(goto-char (point-min))
(if (y-or-n-p "Inhibit VIP startup message? ")
(progn
- (save-excursion
- (set-buffer
+ (with-current-buffer
(find-file-noselect
- (substitute-in-file-name vip-startup-file)))
+ (substitute-in-file-name vip-startup-file))
(goto-char (point-max))
(insert "\n(setq vip-inhibit-startup-message t)\n")
(save-buffer)
@@ -2158,8 +2157,7 @@
(defun vip-get-ex-token ()
"get an ex-token which is either an address or a command.
a token has type \(command, address, end-mark\) and value."
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(cond ((looking-at "[k#]")
(setq ex-token-type "command")
@@ -2262,8 +2260,7 @@
ex-g-variant nil))
(let ((com-str (or string (vip-read-string ":")))
(address nil) (cont t) (dot (point)))
- (save-window-excursion
- (set-buffer (get-buffer-create " *ex-working-space*"))
+ (with-current-buffer (get-buffer-create " *ex-working-space*")
(delete-region (point-min) (point-max))
(insert com-str "\n")
(goto-char (point-min)))
@@ -2282,8 +2279,7 @@
(setq cont nil))
(t
(vip-execute-ex-command)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(cond ((looking-at "|")
(forward-char 1))
@@ -2307,8 +2303,7 @@
(defun vip-get-ex-pat ()
"get a regular expression and set ex-variant if found"
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(if (looking-at "!")
(progn
@@ -2334,8 +2329,7 @@
(defun vip-get-ex-command ()
"get an ex command"
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(if (looking-at "/") (forward-char 1))
(skip-chars-forward " \t")
(cond ((looking-at "[a-z]")
@@ -2349,8 +2343,7 @@
(defun vip-get-ex-opt-gc ()
"get an ex option g or c"
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(if (looking-at "/") (forward-char 1))
(skip-chars-forward " \t")
(cond ((looking-at "g")
@@ -2458,8 +2451,7 @@
(setq ex-buffer nil)
(setq ex-count nil)
(setq ex-flag nil)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(if (looking-at "[a-zA-Z]")
(progn
@@ -2483,8 +2475,7 @@
(setq ex-variant nil
ex-count nil
ex-flag nil)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(if (looking-at "!")
(progn
@@ -2510,8 +2501,7 @@
ex-variant nil
ex-append nil
ex-offset nil)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(if (looking-at "!")
(progn
@@ -2680,8 +2670,7 @@
(goto-char (point-min))
(if ex-offset
(progn
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(delete-region (point-min) (point-max))
(insert ex-offset "\n")
(goto-char (point-min)))
@@ -2733,19 +2722,18 @@
(if (bobp) (setq cont nil)
(forward-line -1)
(end-of-line)))))
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(setq com-str (buffer-substring (1+ (point)) (1- (point-max)))))
(while marks
(goto-char (car marks))
- ; report progress of execution on a slow machine.
- ;(message "Executing global command...")
- ;(if (zerop (% mark-count 10))
- ;(message "Executing global command...%d" mark-count))
+ ;; report progress of execution on a slow machine.
+ ;;(message "Executing global command...")
+ ;;(if (zerop (% mark-count 10))
+ ;; (message "Executing global command...%d" mark-count))
(vip-ex com-str)
(setq mark-count (1- mark-count))
(setq marks (cdr marks)))))
- ;(message "Executing global command...done")))
+;;(message "Executing global command...done")))
(defun ex-line (com)
"ex line commands. COM is join, shift-right or shift-left."
@@ -2801,8 +2789,7 @@
(if (null ex-addresses)
(setq ex-addresses
(cons (point) nil)))
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(if (looking-at "[a-z]")
(progn
@@ -2821,8 +2808,7 @@
(defun ex-map ()
"ex map"
(let (char string)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(setq char (char-to-string (following-char)))
(forward-char 1)
@@ -2847,8 +2833,7 @@
(defun ex-unmap ()
"ex unmap"
(let (char)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(setq char (char-to-string (following-char)))
(forward-char 1)
@@ -2870,8 +2855,7 @@
(defun ex-quit ()
"ex quit"
(let (char)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(setq char (following-char)))
(if (= char ?!) (kill-emacs t) (save-buffers-kill-emacs))))
@@ -2883,8 +2867,7 @@
(goto-char point)
(if (not (= point 0)) (with-no-warnings (next-line 1)))
(beginning-of-line)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(if (looking-at "!")
(progn
@@ -2981,8 +2964,7 @@
(defun ex-tag ()
"ex tag"
(let (tag)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(set-mark (point))
(skip-chars-forward "^ |\t\n")
@@ -3045,8 +3027,7 @@
(defun ex-command ()
"execute shell command"
(let (command)
- (save-window-excursion
- (set-buffer " *ex-working-space*")
+ (with-current-buffer " *ex-working-space*"
(skip-chars-forward " \t")
(set-mark (point))
(end-of-line)
Index: emulation/viper-cmd.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-cmd.el,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- emulation/viper-cmd.el 2 Oct 2009 03:48:44 -0000 1.85
+++ emulation/viper-cmd.el 3 Nov 2009 02:04:34 -0000 1.86
@@ -903,8 +903,7 @@
(signal 'quit nil)))
(if (not (equal buff (current-buffer))) ; cmd switched buffer
- (save-excursion
- (set-buffer buff)
+ (with-current-buffer buff
(viper-set-mode-vars-for viper-current-state)))
(viper-set-mode-vars-for viper-current-state)
result))
@@ -917,8 +916,7 @@
(viper-set-mode-vars-for 'emacs-state)
(setq result (eval form))
(if (not (equal buff (current-buffer))) ; cmd switched buffer
- (save-excursion
- (set-buffer buff)
+ (with-current-buffer buff
(viper-set-mode-vars-for viper-current-state)))
(viper-set-mode-vars-for viper-current-state)
result))
@@ -4697,8 +4695,7 @@
(with-output-to-temp-buffer " *viper-info*"
(if (and buf pos)
(progn
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(setq line-no (1+ (count-lines (point-min) val)))
(goto-char pos)
(beginning-of-line)
Index: emulation/viper-ex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-ex.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- emulation/viper-ex.el 22 Aug 2009 21:59:44 -0000 1.77
+++ emulation/viper-ex.el 3 Nov 2009 02:04:34 -0000 1.78
@@ -946,16 +946,14 @@
;; Expand \% and \# in ex command
(defun ex-expand-filsyms (cmd buf)
(let (cf pf ret)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(setq cf buffer-file-name)
(setq pf (ex-next nil t))) ; this finds alternative file name
(if (and (null cf) (string-match "[^\\]%\\|\\`%" cmd))
(error "No current file to substitute for `%%'"))
(if (and (null pf) (string-match "[^\\]#\\|\\`#" cmd))
(error "No alternate file to substitute for `#'"))
- (save-excursion
- (set-buffer (get-buffer-create viper-ex-tmp-buf-name))
+ (with-current-buffer (get-buffer-create viper-ex-tmp-buf-name)
(erase-buffer)
(insert cmd)
(goto-char (point-min))
@@ -984,9 +982,8 @@
ex-cmdfile nil
ex-cmdfile-args "")
(save-excursion
- (save-window-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(skip-chars-forward " \t")
(if (looking-at "!")
(if (and (not (viper-looking-back "[ \t]"))
@@ -1289,9 +1286,8 @@
(switch-to-buffer file))
(if ex-offset
(progn
- (save-window-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(delete-region (point-min) (point-max))
(insert ex-offset "\n")
(goto-char (point-min)))
@@ -1372,9 +1368,8 @@
(if (bobp) (setq cont nil)
(forward-line -1)
(end-of-line)))))
- (save-window-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
;; com-str is the command string, i.e., g/pattern/ or v/pattern'
(setq com-str (buffer-substring (1+ (point)) (1- (point-max)))))
(while ex-g-marks
@@ -1453,9 +1448,8 @@
(setq char (string-to-char name))
(error "`%s': Spurious text \"%s\" after mark name"
name (substring name 1)))
- (save-window-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(skip-chars-forward " \t")
(if (looking-at "[a-z]")
(progn
@@ -1560,8 +1554,7 @@
(select-window wind)))
(save-window-excursion (select-window wind) (sit-for 1)))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(setq viper-related-files-and-buffers-ring old-ring))
(setq viper-local-search-start-marker (point-marker))
@@ -1588,9 +1581,8 @@
;; Ex quit command
(defun ex-quit ()
;; skip "!", if it is q!. In Viper q!, w!, etc., behave as q, w, etc.
- (save-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(if (looking-at "!") (forward-char 1)))
(if (< viper-expert-level 3)
(save-buffers-kill-emacs)
@@ -1837,9 +1829,8 @@
;; Optional 3d arg is a string that should replace ' ' to prevent its
;; special meaning
(defun ex-get-inline-cmd-args (regex-forw &optional chars-back replace-str)
- (save-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(goto-char (point-min))
(re-search-forward regex-forw nil t)
(let ((beg (point))
@@ -1987,9 +1978,8 @@
;; Ex tag command
(defun ex-tag ()
(let (tag)
- (save-window-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(skip-chars-forward " \t")
(set-mark (point))
(skip-chars-forward "^ |\t\n")
@@ -2148,9 +2138,8 @@
;; Execute shell command
(defun ex-command ()
(let (command)
- (save-window-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(skip-chars-forward " \t")
(setq command (buffer-substring (point) (point-max)))
(end-of-line))
@@ -2178,9 +2167,8 @@
If no args are given, then it runs the last compile command.
Type 'mak ' (including the space) to run make with no args."
(let (args)
- (save-window-excursion
- (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
- (set-buffer viper-ex-work-buf)
+ (with-current-buffer (setq viper-ex-work-buf
+ (get-buffer-create viper-ex-work-buf-name))
(setq args (buffer-substring (point) (point-max)))
(end-of-line))
;; Remove the newline that may (will?) be at the end of the args
Index: emulation/viper-keym.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-keym.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- emulation/viper-keym.el 31 Jan 2009 22:10:30 -0000 1.55
+++ emulation/viper-keym.el 3 Nov 2009 02:04:34 -0000 1.56
@@ -165,8 +165,7 @@
[(control ?z)])))
(mapc
(lambda (buf)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(when (and (boundp 'viper-insert-basic-map)
(keymapp viper-insert-basic-map))
(when old-value
Index: emulation/viper-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-util.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- emulation/viper-util.el 31 Jan 2009 22:10:30 -0000 1.87
+++ emulation/viper-util.el 3 Nov 2009 02:04:34 -0000 1.88
@@ -409,8 +409,7 @@
(command (cond (viper-ms-style-os-p (format "\"ls -1 -d %s\"" filespec))
(t (format "ls -1 -d %s" filespec))))
status)
- (save-excursion
- (set-buffer (get-buffer-create viper-ex-tmp-buf-name))
+ (with-current-buffer (get-buffer-create viper-ex-tmp-buf-name)
(erase-buffer)
(setq status
(if gshell-options
@@ -467,8 +466,7 @@
;; convert MS-DOS wildcards to regexp
(defun viper-wildcard-to-regexp (wcard)
- (save-excursion
- (set-buffer (get-buffer-create viper-ex-tmp-buf-name))
+ (with-current-buffer (get-buffer-create viper-ex-tmp-buf-name)
(erase-buffer)
(insert wcard)
(goto-char (point-min))
@@ -488,8 +486,7 @@
(defun viper-glob-mswindows-files (filespec)
(let ((case-fold-search t)
tmp tmp2)
- (save-excursion
- (set-buffer (get-buffer-create viper-ex-tmp-buf-name))
+ (with-current-buffer (get-buffer-create viper-ex-tmp-buf-name)
(erase-buffer)
(insert filespec)
(goto-char (point-min))
@@ -654,8 +651,7 @@
(buf (find-file-noselect (substitute-in-file-name custom-file)))
)
(message "%s" (or message ""))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(goto-char (point-min))
(if (re-search-forward regexp nil t)
(let ((reg-end (1- (match-end 0))))
@@ -678,8 +674,7 @@
;; match this pattern.
(defun viper-save-string-in-file (string custom-file &optional pattern)
(let ((buf (find-file-noselect (substitute-in-file-name custom-file))))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(let (buffer-read-only)
(goto-char (point-min))
(if pattern (delete-matching-lines pattern))
@@ -889,8 +884,7 @@
(if (and (markerp marker) (marker-buffer marker))
(let ((buf (marker-buffer marker))
(pos (marker-position marker)))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(and (<= pos (point-max)) (<= (point-min) pos))))))
(defsubst viper-mark-marker ()
Index: emulation/viper.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- emulation/viper.el 2 Oct 2009 03:48:44 -0000 1.124
+++ emulation/viper.el 3 Nov 2009 02:04:34 -0000 1.125
@@ -647,10 +647,9 @@
;; Remove local value in all existing buffers
;; This doesn't delocalize vars (which would have been desirable)
(defun viper-delocalize-var (symbol)
- (mapcar (lambda (buf) (save-excursion
- (set-buffer buf)
- (kill-local-variable symbol)))
- (buffer-list)))
+ (dolist (buf (buffer-list))
+ (with-current-buffer buf
+ (kill-local-variable symbol))))
(defun viper-go-away ()
Index: erc/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/erc/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- erc/ChangeLog 24 Oct 2009 03:54:58 -0000 1.103
+++ erc/ChangeLog 3 Nov 2009 02:04:34 -0000 1.104
@@ -1,3 +1,9 @@
+2009-11-03 Stefan Monnier <address@hidden>
+
+ * erc.el (erc-display-line-1, erc-process-away):
+ * erc-truncate.el (erc-truncate-buffer-to-size):
+ Use with-current-buffer.
+
2009-10-24 Glenn Morris <address@hidden>
* erc-dcc.el (pcomplete-erc-all-nicks):
Index: erc/erc-truncate.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/erc/erc-truncate.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- erc/erc-truncate.el 5 Jan 2009 03:21:41 -0000 1.9
+++ erc/erc-truncate.el 3 Nov 2009 02:04:34 -0000 1.10
@@ -66,8 +66,7 @@
(unless (get-buffer buffer)
(error "erc-truncate-buffer-to-size: %S is not a buffer" buffer)))
(when (> (buffer-size buffer) (+ size 512))
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
;; Note that when erc-insert-post-hook runs, the buffer is
;; narrowed to the new message. So do this delicate widening.
;; I am not sure, I think this was not recommended behavior in
Index: erc/erc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/erc/erc.el,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- erc/erc.el 22 Jul 2009 03:03:51 -0000 1.61
+++ erc/erc.el 3 Nov 2009 02:04:34 -0000 1.62
@@ -2358,8 +2358,7 @@
Afterwards, `erc-insert-modify' and `erc-insert-post-hook' get called.
If STRING is nil, the function does nothing."
(when string
- (save-excursion
- (set-buffer (or buffer (process-buffer erc-server-process)))
+ (with-current-buffer (or buffer (process-buffer erc-server-process))
(let ((insert-position (or (marker-position erc-insert-marker)
(point-max))))
(let ((string string) ;; FIXME! Can this be removed?
@@ -4513,8 +4512,7 @@
;; away must be set to NIL BEFORE sending anything to prevent
;; an infinite recursion
(setq erc-away nil)
- (save-excursion
- (set-buffer (erc-active-buffer))
+ (with-current-buffer (erc-active-buffer)
(when erc-public-away-p
(erc-send-action
(erc-default-target)
Index: eshell/em-unix.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/em-unix.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- eshell/em-unix.el 5 Jan 2009 03:21:45 -0000 1.44
+++ eshell/em-unix.el 3 Nov 2009 02:04:35 -0000 1.45
@@ -667,8 +667,7 @@
"In Occur mode, go to the occurrence whose line you click on."
(interactive "e")
(let (pos)
- (save-excursion
- (set-buffer (window-buffer (posn-window (event-end event))))
+ (with-current-buffer (window-buffer (posn-window (event-end event)))
(save-excursion
(goto-char (posn-point (event-end event)))
(setq pos (occur-mode-find-occurrence))))
Index: eshell/esh-ext.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/esh-ext.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- eshell/esh-ext.el 22 Jan 2009 06:33:06 -0000 1.32
+++ eshell/esh-ext.el 3 Nov 2009 02:04:35 -0000 1.33
@@ -194,10 +194,8 @@
(mapconcat 'shell-quote-argument
(append (list command) args) " ")
outbuf errbuf))
- (eshell-print (save-excursion (set-buffer outbuf)
- (buffer-string)))
- (eshell-error (save-excursion (set-buffer errbuf)
- (buffer-string))))
+ (eshell-print (with-current-buffer outbuf (buffer-string)))
+ (eshell-error (with-current-buffer errbuf (buffer-string))))
(eshell-close-handles exitcode 'nil)
(kill-buffer outbuf)
(kill-buffer errbuf))))
Index: mail/feedmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/feedmail.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- mail/feedmail.el 1 Sep 2009 03:25:10 -0000 1.37
+++ mail/feedmail.el 3 Nov 2009 02:04:35 -0000 1.38
@@ -1628,8 +1628,7 @@
(if (and already-buffer (not (file-exists-p maybe-file)))
;; we have gotten rid of the file associated with the
;; buffer, so update the buffer's notion of that
- (save-excursion
- (set-buffer already-buffer)
+ (with-current-buffer already-buffer
(setq buffer-file-name nil)))))
(error (setq messages-skipped (1+ messages-skipped))))
(kill-buffer blobby-buffer)
@@ -1801,7 +1800,8 @@
")
(and (stringp feedmail-prompt-before-queue-help-supplement)
(princ feedmail-prompt-before-queue-help-supplement))
- (save-excursion (set-buffer standard-output) (if (fboundp 'help-mode)
(help-mode)))))
+ (with-current-buffer standard-output
+ (if (fboundp 'help-mode) (help-mode)))))
(defun feedmail-look-at-queue-directory (queue-directory)
"Find out some things about a queue directory.
@@ -1970,7 +1970,7 @@
(mail-header-separator mail-header-separator)
)
(unwind-protect
- (save-excursion
+ (save-current-buffer
(set-buffer feedmail-error-buffer) (erase-buffer)
(set-buffer feedmail-prepped-text-buffer) (erase-buffer)
@@ -2075,18 +2075,17 @@
(if (and (not feedmail-queue-runner-is-active) (setq
also-file (buffer-file-name feedmail-raw-text-buffer)))
(progn ; if a file but not running the queue,
offer to delete it
(setq also-file (expand-file-name also-file))
- (if (or feedmail-queue-auto-file-nuke
- (y-or-n-p (format "FQM: Delete message file %s?
" also-file)))
- (save-excursion
+ (when (or feedmail-queue-auto-file-nuke
+ (y-or-n-p
+ (format "FQM: Delete message file %s? "
+ also-file)))
;; if we delete the affiliated file, get rid
;; of the file name association and make sure we
;; don't annoy people with a prompt on exit
(delete-file also-file)
- (set-buffer feedmail-raw-text-buffer)
+ (with-current-buffer feedmail-raw-text-buffer
(setq buffer-offer-save nil)
- (setq buffer-file-name nil)
- )
- )))
+ (setq buffer-file-name nil)))))
(goto-char (point-min))
;; re-insert and handle any Fcc fields (and, optionally, any
Bcc).
(if fcc (letf (((default-value 'buffer-file-type)
@@ -2197,18 +2196,19 @@
(mapcar
'(lambda (feedmail-spray-this-address)
(let ((spray-buffer (get-buffer-create " *FQM Outgoing Email
Spray*")))
- (save-excursion
- (set-buffer spray-buffer)
+ (with-current-buffer spray-buffer
(erase-buffer)
;; not life's most efficient methodology, but spraying isn't
;; an every-5-minutes event either
(insert-buffer-substring feedmail-prepped-text-buffer)
- ;; There's a good case to me made that each separate
transmission of
- ;; a message in the spray should have a distinct Message-Id:.
There
- ;; is also a less compelling argument in the other direction.
I think
- ;; they technically should have distinct Message-Id:s, but I
doubt that
- ;; anyone cares, practically. If someone complains about it,
I'll add
- ;; it.
+ ;; There's a good case to me made that each separate
+ ;; transmission of a message in the spray should
+ ;; have a distinct Message-Id:. There is also a less
+ ;; compelling argument in the other direction.
+ ;; I think they technically should have distinct
+ ;; Message-Id:s, but I doubt that anyone cares,
+ ;; practically. If someone complains about it, I'll
+ ;; add it.
(feedmail-fiddle-list-of-spray-fiddle-plexes
feedmail-spray-address-fiddle-plex-list)
;; this (let ) is just in case some buffer eater
;; is cheating and using the global variable name instead
@@ -2593,8 +2593,8 @@
(this-line)
(this-line-end))
(unwind-protect
- (save-excursion
- (set-buffer (get-buffer-create " *FQM scratch*")) (erase-buffer)
+ (with-current-buffer (get-buffer-create " *FQM scratch*")
+ (erase-buffer)
(insert-buffer-substring message-buffer header-start header-end)
(goto-char (point-min))
(let ((case-fold-search t))
Index: mail/hashcash.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/hashcash.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- mail/hashcash.el 5 Jan 2009 03:22:32 -0000 1.9
+++ mail/hashcash.el 3 Nov 2009 02:04:35 -0000 1.10
@@ -161,8 +161,7 @@
"Generate a hashcash payment by finding a VAL-bit collison on STR."
(if (and (> val 0)
hashcash-path)
- (save-excursion
- (set-buffer (get-buffer-create " *hashcash*"))
+ (with-current-buffer (get-buffer-create " *hashcash*")
(erase-buffer)
(apply 'call-process hashcash-path nil t nil
"-m" "-q" "-b" (number-to-string val) str
Index: mail/mailpost.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/mailpost.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- mail/mailpost.el 10 Apr 2008 14:10:18 -0000 1.16
+++ mail/mailpost.el 3 Nov 2009 02:04:35 -0000 1.17
@@ -36,8 +36,7 @@
delimline
(mailbuf (current-buffer)))
(unwind-protect
- (save-excursion
- (set-buffer tembuf)
+ (with-current-buffer tembuf
(erase-buffer)
(insert-buffer-substring mailbuf)
(goto-char (point-max))
@@ -73,8 +72,7 @@
(if (re-search-forward "^Subject:[ \t]*\n" delimline t)
(replace-match ""))
(if mail-interactive
- (save-excursion
- (set-buffer errbuf)
+ (with-current-buffer errbuf
(erase-buffer))))
(let ((m (default-file-modes)))
(unwind-protect
@@ -91,8 +89,7 @@
(if mail-interactive '("-watch") '("-nowatch"))
(list temfile)))
(if mail-interactive
- (save-excursion
- (set-buffer errbuf)
+ (with-current-buffer errbuf
(goto-char (point-min))
(while (re-search-forward "\n\n* *" nil t)
(replace-match "; "))
Index: mail/reporter.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/reporter.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- mail/reporter.el 5 Jan 2009 03:22:35 -0000 1.44
+++ mail/reporter.el 3 Nov 2009 02:04:35 -0000 1.45
@@ -174,8 +174,7 @@
MAILBUF is the mail buffer being composed."
(reporter-update-status)
(condition-case nil
- (let ((val (save-excursion
- (set-buffer reporter-eval-buffer)
+ (let ((val (with-current-buffer reporter-eval-buffer
(symbol-value varsym)))
(sym (symbol-name varsym))
(print-escape-newlines t)
@@ -201,8 +200,7 @@
(reporter-beautify-list maxwidth compact-p))))
(insert "\n"))
(void-variable
- (save-excursion
- (set-buffer mailbuf)
+ (with-current-buffer mailbuf
(mail-position-on-field "X-Reporter-Void-Vars-Found")
(end-of-line)
(insert (symbol-name varsym) " ")))
@@ -247,8 +245,7 @@
(condition-case fault
(let ((mailbuf (current-buffer))
(elbuf (get-buffer-create " *tmp-reporter-buffer*")))
- (save-excursion
- (set-buffer elbuf)
+ (with-current-buffer elbuf
(emacs-lisp-mode)
(erase-buffer)
(insert "(setq\n")
Index: mail/rfc822.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rfc822.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- mail/rfc822.el 5 Jan 2009 03:22:35 -0000 1.30
+++ mail/rfc822.el 3 Nov 2009 02:04:35 -0000 1.31
@@ -278,15 +278,15 @@
(list (substring header-text (match-beginning 1) (match-end 1)))
(let ((buf (generate-new-buffer " rfc822")))
(unwind-protect
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(make-local-variable 'case-fold-search)
(setq case-fold-search nil) ;For speed(?)
(insert header-text)
;; unfold continuation lines
(goto-char (point-min))
- (while (re-search-forward "\\([^\\]\\(\\\\\\\\\\)*\\)\n[ \t]" nil t)
+ (while (re-search-forward "\\([^\\]\\(\\\\\\\\\\)*\\)\n[ \t]"
+ nil t)
(replace-match "\\1 " t))
(goto-char (point-min))
Index: mail/rmailsum.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailsum.el,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- mail/rmailsum.el 10 Sep 2009 06:18:48 -0000 1.181
+++ mail/rmailsum.el 3 Nov 2009 02:04:35 -0000 1.182
@@ -643,8 +643,7 @@
With prefix argument N moves forward N messages with these labels."
(interactive "p\nsMove to next msg with labels: ")
(let (msg)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-next-labeled-message n labels)
(setq msg rmail-current-message))
(rmail-summary-goto-msg msg)))
@@ -654,8 +653,7 @@
With prefix argument N moves backward N messages with these labels."
(interactive "p\nsMove to previous msg with labels: ")
(let (msg)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-previous-labeled-message n labels)
(setq msg rmail-current-message))
(rmail-summary-goto-msg msg)))
@@ -809,8 +807,7 @@
(defun rmail-summary-undelete-many (&optional n)
"Undelete all deleted msgs, optional prefix arg N means undelete N prev
msgs."
(interactive "P")
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(let* ((init-msg (if n rmail-current-message rmail-total-messages))
(rmail-current-message init-msg)
(n (or n rmail-total-messages))
@@ -967,8 +964,7 @@
(rmail-show-message msg-num t))
(select-window owin))
(if (buffer-name rmail-buffer)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-show-message msg-num t))))))
(rmail-summary-update-highlight nil)))))
@@ -1206,7 +1202,7 @@
(curmsg (string-to-number
(buffer-substring (point)
(min (point-max) (+ 6 (point))))))
- (total (save-excursion (set-buffer buf) rmail-total-messages)))
+ (total (with-current-buffer buf rmail-total-messages)))
;; If message number N was specified, find that message's line
;; or set message-not-found.
;; If N wasn't specified or that message can't be found.
@@ -1368,7 +1364,7 @@
(defun rmail-summary-wipe ()
"Kill and wipe away Rmail summary, remaining within Rmail."
(interactive)
- (save-excursion (set-buffer rmail-buffer) (setq rmail-summary-buffer nil))
+ (with-current-buffer rmail-buffer (setq rmail-summary-buffer nil))
(let ((local-rmail-buffer rmail-buffer))
(kill-buffer (current-buffer))
;; Delete window if not only one.
@@ -1380,8 +1376,7 @@
(defun rmail-summary-expunge ()
"Actually erase all deleted messages and recompute summary headers."
(interactive)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(when (rmail-expunge-confirmed)
(rmail-only-expunge)))
(rmail-update-summary))
@@ -1405,8 +1400,7 @@
(list (if current-prefix-arg
(read-file-name "Get new mail from file: "))))
(let (msg)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-get-new-mail file-name)
;; Get the proper new message number.
(setq msg rmail-current-message))
@@ -1493,12 +1487,8 @@
(prefix-numeric-value current-prefix-arg))))
;; Don't use save-excursion because that prevents point from moving
;; properly in the summary buffer.
- (let ((buffer (current-buffer)))
- (unwind-protect
- (progn
- (set-buffer rmail-buffer)
- (rmail-search regexp (- n)))
- (set-buffer buffer))))
+ (with-current-buffer rmail-buffer
+ (rmail-search regexp (- n))))
(defun rmail-summary-search (regexp &optional n)
"Show message containing next match for REGEXP.
@@ -1556,21 +1546,17 @@
(defun rmail-summary-add-label (label)
"Add LABEL to labels associated with current Rmail message.
Completion is performed over known labels when reading."
- (interactive (list (save-excursion
- (set-buffer rmail-buffer)
+ (interactive (list (with-current-buffer rmail-buffer
(rmail-read-label "Add label"))))
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-add-label label)))
(defun rmail-summary-kill-label (label)
"Remove LABEL from labels associated with current Rmail message.
Completion is performed over known labels when reading."
- (interactive (list (save-excursion
- (set-buffer rmail-buffer)
+ (interactive (list (with-current-buffer rmail-buffer
(rmail-read-label "Kill label"))))
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(rmail-set-label label nil)))
;;;; *** Rmail Summary Mailing Commands ***
@@ -1737,8 +1723,7 @@
The variables `rmail-secondary-file-directory' and
`rmail-secondary-file-regexp' control which files are offered in the menu."
(interactive)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(let ((rmail-delete-after-output nil))
(call-interactively 'rmail-output-menu)))
(if rmail-delete-after-output
@@ -1767,8 +1752,7 @@
"Write this message body to the file FILE-NAME.
FILE-NAME defaults, interactively, from the Subject field of the message."
(interactive)
- (save-excursion
- (set-buffer rmail-buffer)
+ (with-current-buffer rmail-buffer
(let ((rmail-delete-after-output nil))
(if file-name
(rmail-output-body-to-file file-name)
Index: mail/smtpmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/smtpmail.el,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- mail/smtpmail.el 25 May 2009 01:11:46 -0000 1.110
+++ mail/smtpmail.el 3 Nov 2009 02:04:35 -0000 1.111
@@ -242,8 +242,7 @@
(let ((sendmail-coding-system smtpmail-code-conv-from))
(select-message-coding-system)))))
(unwind-protect
- (save-excursion
- (set-buffer tembuf)
+ (with-current-buffer tembuf
(erase-buffer)
;; Use the same `buffer-file-coding-system' as in the mail
;; buffer, otherwise any `write-region' invocations (e.g., in
Index: mail/supercite.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/supercite.el,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- mail/supercite.el 19 Mar 2009 06:19:24 -0000 1.73
+++ mail/supercite.el 3 Nov 2009 02:04:35 -0000 1.74
@@ -1669,9 +1669,8 @@
(if sc-electric-circular-p
0
(progn (error msg "follow") (1- last))))))
- (save-excursion
- (set-buffer sc-electric-bufname)
- (let ((buffer-read-only nil))
+ (with-current-buffer sc-electric-bufname
+ (let ((inhibit-read-only t))
(erase-buffer)
(goto-char (point-min))
(sc-eref-insert-selected)
Index: play/decipher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/play/decipher.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- play/decipher.el 4 Sep 2009 06:58:59 -0000 1.37
+++ play/decipher.el 3 Nov 2009 02:04:35 -0000 1.38
@@ -681,8 +681,7 @@
(interactive (list (upcase (following-char))))
(decipher-analyze)
(let (start end)
- (save-excursion
- (set-buffer (decipher-stats-buffer))
+ (with-current-buffer (decipher-stats-buffer)
(goto-char (point-min))
(or (re-search-forward (format "^%c: " cipher-char) nil t)
(error "Character `%c' is not used in ciphertext" cipher-char))
@@ -730,8 +729,7 @@
END-REGEXP matches the line after that which ends the display.
The ending line is included in the display unless it is blank."
(let (start end)
- (save-excursion
- (set-buffer (decipher-stats-buffer))
+ (with-current-buffer (decipher-stats-buffer)
(goto-char (point-min))
(re-search-forward start-regexp)
(beginning-of-line)
@@ -926,9 +924,8 @@
(aref decipher--after i)))
freq-list)
total-chars (+ total-chars (aref decipher--freqs i)))))
- (save-excursion
;; Switch to statistics buffer, creating it if necessary:
- (set-buffer (decipher-stats-buffer t))
+ (with-current-buffer (decipher-stats-buffer t)
;; This can't happen, but it never hurts to double-check:
(or (eq major-mode 'decipher-stats-mode)
(error "Buffer %s is not in Decipher-Stats mode" (buffer-name)))
@@ -1024,8 +1021,7 @@
;; See if decipher-stats-buffer exists:
((and (bufferp decipher-stats-buffer)
(buffer-name decipher-stats-buffer))
- (or (save-excursion
- (set-buffer decipher-stats-buffer)
+ (or (with-current-buffer decipher-stats-buffer
(eq major-mode 'decipher-stats-mode))
(error "Buffer %s is not in Decipher-Stats mode"
(buffer-name decipher-stats-buffer)))
@@ -1041,8 +1037,7 @@
;; We just lost track of the statistics buffer:
(get-buffer stats-name)
(generate-new-buffer stats-name))))
- (save-excursion
- (set-buffer decipher-stats-buffer)
+ (with-current-buffer decipher-stats-buffer
(decipher-stats-mode))
decipher-stats-buffer)
;; Give up:
@@ -1052,22 +1047,21 @@
(provide 'decipher)
-;;;(defun decipher-show-undo-list ()
-;;; "Display the undo list (for debugging purposes)."
-;;; (interactive)
-;;; (with-output-to-temp-buffer "*Decipher Undo*"
-;;; (let ((undo-list decipher-undo-list)
-;;; undo-rec undo-map)
-;;; (save-excursion
-;;; (set-buffer "*Decipher Undo*")
-;;; (while (setq undo-rec (pop undo-list))
-;;; (or (consp (car undo-rec))
-;;; (setq undo-rec (list undo-rec)))
-;;; (insert ?\()
-;;; (while (setq undo-map (pop undo-rec))
-;;; (insert (cdr undo-map) (car undo-map) ?\ ))
-;;; (delete-backward-char 1)
-;;; (insert ")\n"))))))
+;;(defun decipher-show-undo-list ()
+;; "Display the undo list (for debugging purposes)."
+;; (interactive)
+;; (with-output-to-temp-buffer "*Decipher Undo*"
+;; (let ((undo-list decipher-undo-list)
+;; undo-rec undo-map)
+;; (with-current-buffer "*Decipher Undo*"
+;; (while (setq undo-rec (pop undo-list))
+;; (or (consp (car undo-rec))
+;; (setq undo-rec (list undo-rec)))
+;; (insert ?\()
+;; (while (setq undo-map (pop undo-rec))
+;; (insert (cdr undo-map) (car undo-map) ?\ ))
+;; (delete-backward-char 1)
+;; (insert ")\n"))))))
;; arch-tag: 8f094d88-ffe1-4f99-afe3-a5e81dd939d9
;;; decipher.el ends here
Index: play/dissociate.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/play/dissociate.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- play/dissociate.el 5 Jan 2009 03:23:08 -0000 1.25
+++ play/dissociate.el 3 Nov 2009 02:04:35 -0000 1.26
@@ -62,8 +62,7 @@
(setq last-query-point (point-max))
t))))
(let (start end)
- (save-excursion
- (set-buffer inbuf)
+ (with-current-buffer inbuf
(setq start (point))
(if (eq move-function 'forward-char)
(progn
@@ -81,8 +80,7 @@
(end-of-line)
(and (> (current-column) fill-column)
(do-auto-fill)))))
- (save-excursion
- (set-buffer inbuf)
+ (with-current-buffer inbuf
(if (eobp)
(goto-char (point-min))
(let ((overlap
Index: play/fortune.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/play/fortune.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- play/fortune.el 5 Jan 2009 03:23:09 -0000 1.23
+++ play/fortune.el 3 Nov 2009 02:04:35 -0000 1.24
@@ -293,8 +293,7 @@
(fort-file (expand-file-name
(substitute-in-file-name
(or file fortune-file)))))
- (save-excursion
- (set-buffer fortune-buffer)
+ (with-current-buffer fortune-buffer
(toggle-read-only 0)
(erase-buffer)
Index: play/gomoku.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/play/gomoku.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- play/gomoku.el 21 Aug 2009 07:40:29 -0000 1.57
+++ play/gomoku.el 3 Nov 2009 02:04:35 -0000 1.58
@@ -939,6 +939,7 @@
"Your move?"))
;; This may seem silly, but if one omits the following line (or a similar
;; one), the cursor may very well go to some place where POINT is not.
+ ;; FIXME: this can't be right!! --Stef
(save-excursion (set-buffer (other-buffer))))
(defun gomoku-prompt-for-other-game ()
Index: play/landmark.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/play/landmark.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- play/landmark.el 4 Sep 2009 06:58:59 -0000 1.44
+++ play/landmark.el 3 Nov 2009 02:04:35 -0000 1.45
@@ -827,6 +827,7 @@
"Your move?"))
;; This may seem silly, but if one omits the following line (or a similar
;; one), the cursor may very well go to some place where POINT is not.
+ ;; FIXME: this can't be right!! --Stef
(save-excursion (set-buffer (other-buffer))))
(defun lm-prompt-for-other-game ()
@@ -1178,15 +1179,13 @@
(defun lm-print-wts ()
(interactive)
- (save-excursion
- (set-buffer "*lm-wts*")
+ (with-current-buffer "*lm-wts*"
(insert "==============================\n")
(mapc 'lm-print-wts-int lm-directions)))
(defun lm-print-moves (moves)
(interactive)
- (save-excursion
- (set-buffer "*lm-moves*")
+ (with-current-buffer "*lm-moves*"
(insert (format "%S\n" moves))))
@@ -1200,8 +1199,7 @@
(defun lm-print-y,s,noise ()
(interactive)
- (save-excursion
- (set-buffer "*lm-y,s,noise*")
+ (with-current-buffer "*lm-y,s,noise*"
(insert "==============================\n")
(mapc 'lm-print-y,s,noise-int lm-directions)))
@@ -1212,8 +1210,7 @@
(defun lm-print-smell ()
(interactive)
- (save-excursion
- (set-buffer "*lm-smell*")
+ (with-current-buffer "*lm-smell*"
(insert "==============================\n")
(insert (format "tree: %S \n" (get 'z 't)))
(mapc 'lm-print-smell-int lm-directions)))
@@ -1225,14 +1222,12 @@
(defun lm-print-w0 ()
(interactive)
- (save-excursion
- (set-buffer "*lm-w0*")
+ (with-current-buffer "*lm-w0*"
(insert "==============================\n")
(mapc 'lm-print-w0-int lm-directions)))
(defun lm-blackbox ()
- (save-excursion
- (set-buffer "*lm-blackbox*")
+ (with-current-buffer "*lm-blackbox*"
(insert "==============================\n")
(insert "I smell: ")
(mapc (lambda (direction)
@@ -1556,8 +1551,7 @@
(lm-plot-landmarks)
(if lm-debug
- (progn
- (save-excursion
+ (save-current-buffer
(set-buffer (get-buffer-create "*lm-w0*"))
(erase-buffer)
(set-buffer (get-buffer-create "*lm-moves*"))
@@ -1570,21 +1564,19 @@
(set-buffer (get-buffer-create "*lm-blackbox*"))
(erase-buffer)
(set-buffer (get-buffer-create "*lm-distance*"))
- (erase-buffer))))
+ (erase-buffer)))
(lm-set-landmark-signal-strengths)
- (mapc (lambda (direction)
+ (dolist (direction lm-directions)
(put direction 'y_t 0.0))
- lm-directions)
(if (not save-weights)
(progn
(mapc 'lm-fix-weights-for lm-directions)
- (mapc (lambda (direction)
- (put direction 'w0 lm-initial-w0))
- lm-directions))
+ (dolist (direction lm-directions)
+ (put direction 'w0 lm-initial-w0)))
(message "Weights preserved for this run."))
(if auto-start
Index: play/mpuz.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/play/mpuz.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- play/mpuz.el 4 Sep 2009 06:58:59 -0000 1.45
+++ play/mpuz.el 3 Nov 2009 02:04:35 -0000 1.46
@@ -298,8 +298,7 @@
(let ((buf (get-buffer-create "*Mult Puzzle*"))
(face '(face mpuz-text))
buffer-read-only)
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(erase-buffer)
(insert mpuz-framework)
(set-text-properties 13 42 face)
Index: term/ns-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- term/ns-win.el 2 Oct 2009 03:48:46 -0000 1.56
+++ term/ns-win.el 3 Nov 2009 02:04:35 -0000 1.57
@@ -1085,8 +1085,7 @@
(let* ((pos (event-end event))
(window (nth 0 pos))
(scale (nth 2 pos)))
- (save-excursion
- (set-buffer (window-buffer window))
+ (with-current-buffer (window-buffer window)
(cond
((eq (car scale) (cdr scale))
(goto-char (point-max)))
@@ -1169,8 +1168,7 @@
((eq window-pos 'vertical-line)
'default)
((consp window-pos)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(let ((p (car (compute-motion (window-start window)
(cons (nth 0 edges) (nth 1 edges))
(window-end window)
Index: url/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- url/ChangeLog 1 Oct 2009 02:06:55 -0000 1.185
+++ url/ChangeLog 3 Nov 2009 02:04:35 -0000 1.186
@@ -1,3 +1,11 @@
+2009-11-03 Stefan Monnier <address@hidden>
+
+ * url-util.el (url-insert-entities-in-string):
+ * url-nfs.el (url-nfs-unescape):
+ * url-ldap.el (url-ldap):
+ * url-imap.el (url-imap):
+ * url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
+
2009-10-01 Glenn Morris <address@hidden>
* url-http.el (url-dav-file-attributes): Fix declaration.
Index: url/url-cid.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-cid.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- url/url-cid.el 9 Jan 2009 03:19:39 -0000 1.14
+++ url/url-cid.el 3 Nov 2009 02:04:35 -0000 1.15
@@ -35,8 +35,7 @@
(setq part (mm-get-content-id cid))
(if (not part)
(message "Unknown CID encountered: %s" cid)
- (setq data (save-excursion
- (set-buffer (mm-handle-buffer part))
+ (setq data (with-current-buffer (mm-handle-buffer part)
(buffer-string))
content-type (mm-handle-type part)
encoding (symbol-name (mm-handle-encoding part)))
@@ -55,8 +54,7 @@
(cond
((fboundp 'mm-get-content-id)
;; Using Pterodactyl Gnus or later
- (save-excursion
- (set-buffer (generate-new-buffer " *url-cid*"))
+ (with-current-buffer (generate-new-buffer " *url-cid*")
(url-cid-gnus (url-filename url))))
(t
(message "Unable to handle CID URL: %s" url))))
Index: url/url-imap.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-imap.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- url/url-imap.el 5 Jan 2009 03:24:18 -0000 1.16
+++ url/url-imap.el 3 Nov 2009 02:04:35 -0000 1.17
@@ -52,8 +52,7 @@
(defun url-imap (url)
(unless (vectorp url)
(signal 'wrong-type-error (list "Need a pre-parsed URL." url)))
- (save-excursion
- (set-buffer (generate-new-buffer " *url-imap*"))
+ (with-current-buffer (generate-new-buffer " *url-imap*")
(mm-disable-multibyte)
(let* ((host (url-host url))
(port (url-port url))
Index: url/url-ldap.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-ldap.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- url/url-ldap.el 5 Jan 2009 03:24:19 -0000 1.14
+++ url/url-ldap.el 3 Nov 2009 02:04:35 -0000 1.15
@@ -121,8 +121,7 @@
(setq url (url-generic-parse-url (url-unhex-string url)))
(if (not (vectorp url))
(error "Argument is not a valid URL")))
- (save-excursion
- (set-buffer (generate-new-buffer " *url-ldap*"))
+ (with-current-buffer (generate-new-buffer " *url-ldap*")
(setq url-current-object url)
(insert "Content-type: text/html\r\n\r\n")
(if (not (fboundp 'ldap-search-internal))
Index: url/url-nfs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-nfs.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- url/url-nfs.el 5 Jan 2009 03:24:20 -0000 1.15
+++ url/url-nfs.el 3 Nov 2009 02:04:35 -0000 1.16
@@ -42,8 +42,7 @@
Each can be used any number of times.")
(defun url-nfs-unescape (format host port user pass file)
- (save-excursion
- (set-buffer (get-buffer-create " *nfs-parse*"))
+ (with-current-buffer (get-buffer-create " *nfs-parse*")
(erase-buffer)
(insert format)
(goto-char (point-min))
Index: url/url-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-util.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- url/url-util.el 10 Feb 2009 03:27:29 -0000 1.32
+++ url/url-util.el 3 Nov 2009 02:04:35 -0000 1.33
@@ -140,8 +140,7 @@
> ==> >
\" ==> ""
(if (string-match "[&<>\"]" string)
- (save-excursion
- (set-buffer (get-buffer-create " *entity*"))
+ (with-current-buffer (get-buffer-create " *entity*")
(erase-buffer)
(buffer-disable-undo (current-buffer))
(insert string)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog calendar/cal-hebrew.el cal...,
Stefan Monnier <=