From: Trust me I am a Doctor <pillule@riseup.net>
To: martin rudalics <rudalics@gmx.at>
Cc: 49275@debbugs.gnu.org
Subject: bug#49275: 28.0.50; [PATCH] improve-switch-to-prev-buffer-skip
Date: Wed, 21 Jul 2021 11:59:52 +0200 [thread overview]
Message-ID: <87bl6wdlzn.fsf@riseup.net> (raw)
In-Reply-To: <e4e2ed1e-21e0-99c7-1b5c-1e2cde6c4590@gmx.at>
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
martin rudalics <rudalics@gmx.at> writes:
> Sorry but this is still not right. It now gets me
>
> In switch-to-prev-buffer:
> ../../lisp/window.el:4724:27: Warning: ‘not’ called with 2 args, but requires
> 1
> ../../lisp/window.el:4724:27: Warning: reference to free variable ‘functionp’
> ../../lisp/window.el:4724:27: Warning: reference to free variable
> ‘switch-to-prev-buffer-skip-p’
>
> In switch-to-next-buffer:
> ../../lisp/window.el:4846:27: Warning: ‘not’ called with 2 args, but requires
> 1
> ../../lisp/window.el:4846:27: Warning: reference to free variable ‘functionp’
> ../../lisp/window.el:4846:27: Warning: reference to free variable
> ‘switch-to-prev-buffer-skip-p’
>
> martin
Sorry that was the same buggy one.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: this one is corrected --]
[-- Type: text/x-diff, Size: 1985 bytes --]
From b1375219d247d87ac72a41fb4f1887a9a40039fc Mon Sep 17 00:00:00 2001
From: Trust me I am a doctor <pillule@riseup.net>
Date: Sun, 27 Jun 2021 02:27:48 +0200
Subject: [PATCH] Make switch-to-prev-buffer-skip more reliable
* lisp/window.el (switch-to-prev-buffer): It was fall-backing to the
first skipped buffer, what I know is it is most probably undesirable
when 'switch-to-prev-buffer-skip' is a function. So we only do it when
it is not a function.
(switch-to-next-buffer): Tiddo, and also fix a bug where this function
was returning the same buffer, as it never should do.
---
lisp/window.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/window.el b/lisp/window.el
index c0511bec4c..9315107f1f 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4721,8 +4721,8 @@ switch-to-prev-buffer
window new-buffer (nth 1 entry) (nth 2 entry))
(throw 'found t)))))
- (when skipped
- ;; Show first skipped buffer.
+ (when (and skipped (not (functionp switch-to-prev-buffer-skip)))
+ ;; Show first skipped buffer, unless skip was a function.
(setq new-buffer skipped)
(set-window-buffer-start-and-point window new-buffer)))
@@ -4831,6 +4831,7 @@ switch-to-next-buffer
;; nreverse here!)
(dolist (entry (reverse (window-prev-buffers window)))
(when (and (not (eq new-buffer (car entry)))
+ (not (eq old-buffer (car entry)))
(setq new-buffer (car entry))
(or (buffer-live-p new-buffer)
(not (setq killed-buffers
@@ -4842,8 +4843,8 @@ switch-to-next-buffer
window new-buffer (nth 1 entry) (nth 2 entry))
(throw 'found t))))
- (when skipped
- ;; Show first skipped buffer.
+ (when (and skipped (not (functionp switch-to-prev-buffer-skip)))
+ ;; Show first skipped buffer, unless skip was a function.
(setq new-buffer skipped)
(set-window-buffer-start-and-point window new-buffer)))
--
2.20.1
[-- Attachment #3: Type: text/plain, Size: 5 bytes --]
--
next prev parent reply other threads:[~2021-07-21 9:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 15:56 bug#49275: 28.0.50; [PATCH] improve-switch-to-prev-buffer-skip Trust me I am a Doctor
2021-06-30 7:37 ` martin rudalics
2021-07-08 12:43 ` Trust me I am a Doctor
2021-07-18 8:27 ` martin rudalics
2021-07-21 9:59 ` Trust me I am a Doctor [this message]
2021-08-18 8:01 ` martin rudalics
2021-08-18 18:27 ` Trust me I am a Doctor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bl6wdlzn.fsf@riseup.net \
--to=pillule@riseup.net \
--cc=49275@debbugs.gnu.org \
--cc=rudalics@gmx.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.