From a4963f79fb5a11306d1d1b91eb663860b733b79f Mon Sep 17 00:00:00 2001 From: Bill Wohler Date: Sun, 17 Jul 2011 13:45:52 -0700 Subject: * mh-compat.el (mh-pop-to-buffer-same-window): Delete. * mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder) (mh-make-folder): Revert to switch-to-buffer, as the Emacs folks decided that it was fine to use it in programs. --- lisp/mh-e/ChangeLog | 7 +++++++ lisp/mh-e/mh-compat.el | 12 ------------ lisp/mh-e/mh-folder.el | 8 ++++---- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 431c15b2346..f367ea55922 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,10 @@ +2011-07-17 Bill Wohler + + * mh-compat.el (mh-pop-to-buffer-same-window): Delete. + * mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder) + (mh-make-folder): Revert to switch-to-buffer, as the Emacs folks + decided that it was fine to use it in programs. + 2011-07-16 Bill Wohler Release MH-E version 8.2.92. diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 16dfe05b094..07c558f60cc 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -251,18 +251,6 @@ The argument STRING is ignored." (buffer-substring-no-properties (match-beginning num) (match-end num))) -(defun-mh mh-pop-to-buffer-same-window - pop-to-buffer-same-window (&optional buffer-or-name norecord label) - "Pop to buffer specified by BUFFER-OR-NAME in the selected window. -Another window will be used only if the buffer can't be shown in -the selected window, usually because it is dedicated to another -buffer. Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are -as for `pop-to-buffer'. This macro is used by Emacs versions that -lack the `pop-to-buffer-same-window' function, introduced in -Emacs 24. The function `switch-to-buffer' is used instead and -LABEL is ignored." - (switch-to-buffer buffer-or-name norecord)) - (defun-mh mh-replace-regexp-in-string replace-regexp-in-string (regexp rep string &optional fixedcase literal subexp start) "Replace REGEXP with REP everywhere in STRING and return result. diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el index 1d9a79d0deb..40febd641de 100644 --- a/lisp/mh-e/mh-folder.el +++ b/lisp/mh-e/mh-folder.el @@ -795,7 +795,7 @@ instead." (setq threading-needed-flag mh-show-threads-flag) (setq mh-previous-window-config config)) ((not (eq (current-buffer) (get-buffer folder))) - (mh-pop-to-buffer-same-window folder) + (switch-to-buffer folder) (setq mh-previous-window-config config)))) (mh-get-new-mail file) (when (and threading-needed-flag @@ -855,7 +855,7 @@ From a program, edit MESSAGE; nil means edit current message." ;; Just show the edit buffer... (delete-other-windows) - (mh-pop-to-buffer-same-window edit-buffer))) + (switch-to-buffer edit-buffer))) ;;;###mh-autoload (defun mh-next-button (&optional backward-flag) @@ -1705,7 +1705,7 @@ DONT-EXEC-PENDING is non-nil." (unless dont-exec-pending (mh-process-or-undo-commands folder) (mh-reset-threads-and-narrowing)) - (mh-pop-to-buffer-same-window folder))) + (switch-to-buffer folder))) (mh-regenerate-headers range) (if (zerop (buffer-size)) (if (equal range "all") @@ -1786,7 +1786,7 @@ Also removes all content from the folder buffer." (defun mh-make-folder (name) "Create a new mail folder called NAME. Make it the current folder." - (mh-pop-to-buffer-same-window name) + (switch-to-buffer name) (setq buffer-read-only nil) (erase-buffer) (if mh-adaptive-cmd-note-flag -- cgit v1.2.1