diff options
| author | Spencer Baugh | 2023-10-21 10:41:42 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2023-10-29 13:21:03 +0200 |
| commit | 3dca52dd422c50ebf24a304e7c3d36cf5f1c55cf (patch) | |
| tree | d6d7d6fa292027a2328adbac2d65f28cecf5f82c /test | |
| parent | 27ccf2230bced7248a86e3741b45734bde77cb42 (diff) | |
| download | emacs-3dca52dd422c50ebf24a304e7c3d36cf5f1c55cf.tar.gz emacs-3dca52dd422c50ebf24a304e7c3d36cf5f1c55cf.zip | |
Remove the header line after disabling 'which-function-mode'
Previously, the header line would stay around even when after
disabling 'which-function-mode', although it may be empty. Now
the 'which-function-mode' element is properly removed from
'header-line-format', so the header line will disappear if
there's nothing else in 'header-line-format'.
Also, previously, when we ran (which-function-mode), we would
enable
'which-function-mode' for all buffers even if they didn't support
imenu. We didn't run the normal logic in 'which-func-ff-hook' to
disable 'which-func-mode' if imenu wasn't present. Now we do run
that logic, by just calling 'which-func-ff-hook'. This is
especially important when the header line is enabled, because
otherwise there's a very noticeable header line added to every
buffer, including e.g. *Help* and *Buffer List*.
Also, we now check that 'header-line-format' is a list before trying
to add to it; this makes us work properly when enabling and
disabling 'which-function-mode' for modes which set
'header-line-format' to a string or symbol, such as eww.
* lisp/progmodes/which-func.el (which-func-try-to-enable): Re-add
'which-func-format' to the header line.
(which-func--header-line-remove): New function.
(which-func--disable): Call 'which-func--header-line-remove'.
(which-function-mode): Call 'which-func-ff-hook' and
'which-func--header-line-remove'. (bug#66283)
* test/lisp/progmodes/which-func-tests.el: New test.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/progmodes/which-func-tests.el | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/test/lisp/progmodes/which-func-tests.el b/test/lisp/progmodes/which-func-tests.el new file mode 100644 index 00000000000..73709f1c5e5 --- /dev/null +++ b/test/lisp/progmodes/which-func-tests.el | |||
| @@ -0,0 +1,58 @@ | |||
| 1 | ;;; which-func-tests.el --- tests for which-func -*- lexical-binding: t; -*- | ||
| 2 | |||
| 3 | ;; Copyright (C) 2023 Free Software Foundation, Inc. | ||
| 4 | |||
| 5 | ;; Author: Spencer Baugh <sbaugh@catern.com> | ||
| 6 | |||
| 7 | ;; This file is part of GNU Emacs. | ||
| 8 | |||
| 9 | ;; This program is free software; you can redistribute it and/or modify | ||
| 10 | ;; it under the terms of the GNU General Public License as published by | ||
| 11 | ;; the Free Software Foundation, either version 3 of the License, or | ||
| 12 | ;; (at your option) any later version. | ||
| 13 | |||
| 14 | ;; This program is distributed in the hope that it will be useful, | ||
| 15 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 16 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 17 | ;; GNU General Public License for more details. | ||
| 18 | |||
| 19 | ;; You should have received a copy of the GNU General Public License | ||
| 20 | ;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. | ||
| 21 | |||
| 22 | ;;; Commentary: | ||
| 23 | |||
| 24 | ;;; Code: | ||
| 25 | (require 'ert) | ||
| 26 | (require 'which-func) | ||
| 27 | |||
| 28 | (ert-deftest which-func-tests-toggle () | ||
| 29 | (let ((which-func-display 'mode-and-header) buf-code buf-not) | ||
| 30 | (setq buf-code (find-file-noselect "which-func-tests.el")) | ||
| 31 | (setq buf-not (get-buffer-create "fundamental")) | ||
| 32 | (with-current-buffer buf-code | ||
| 33 | (should-not which-func-mode) (should-not header-line-format)) | ||
| 34 | (with-current-buffer buf-not | ||
| 35 | (should-not which-func-mode) (should-not header-line-format)) | ||
| 36 | (which-function-mode 1) | ||
| 37 | (with-current-buffer buf-code | ||
| 38 | (should which-func-mode) (should header-line-format)) | ||
| 39 | (with-current-buffer buf-not | ||
| 40 | (should-not which-func-mode) (should-not header-line-format)) | ||
| 41 | (which-function-mode -1) | ||
| 42 | ;; which-func-mode stays set even when which-function-mode is off. | ||
| 43 | (with-current-buffer buf-code | ||
| 44 | (should which-func-mode) (should-not header-line-format)) | ||
| 45 | (with-current-buffer buf-not | ||
| 46 | (should-not which-func-mode) (should-not header-line-format)) | ||
| 47 | (kill-buffer buf-code) | ||
| 48 | (kill-buffer buf-not) | ||
| 49 | (which-function-mode 1) | ||
| 50 | (setq buf-code (find-file-noselect "which-func-tests.el")) | ||
| 51 | (setq buf-not (get-buffer-create "fundamental")) | ||
| 52 | (with-current-buffer buf-code | ||
| 53 | (should which-func-mode) (should header-line-format)) | ||
| 54 | (with-current-buffer buf-not | ||
| 55 | (should-not which-func-mode) (should-not header-line-format)))) | ||
| 56 | |||
| 57 | (provide 'which-func-tests) | ||
| 58 | ;;; which-func-tests.el ends here | ||