mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

Remove remaining Helper-help support from view-mode

Browse Source 
* lisp/view.el (view-old-Helper-return-blurb): Make obsolete.
(view--enable, view--disable): Delete remaining Helper-help support
code; view-mode stopped using it in 1995.
This commit is contained in:
Stefan Kangas 2022-07-04 14:10:04 +02:00
parent a525c9f5c9
commit a5f5f6c0ab
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/view.el
View File

@ -1,7 +1,6 @@
;;; view.el --- peruse file or buffer without editing -*- lexical-binding: t -*- ;;; view.el --- peruse file or buffer without editing -*- lexical-binding: t -*-
;; Copyright (C) 1985, 1989, 1994-1995, 1997, 2000-2022 Free Software ;; Copyright (C) 1985-2022 Free Software Foundation, Inc.
;; Foundation, Inc.
;; Author: K. Shane Hartman ;; Author: K. Shane Hartman
;; Maintainer: emacs-devel@gnu.org ;; Maintainer: emacs-devel@gnu.org
@ -26,9 +25,11 @@
;; This package provides the `view' minor mode documented in the Emacs ;; This package provides the `view' minor mode documented in the Emacs
;; user's manual. ;; user's manual.
;;
;; View mode entry and exit is done through the functions `view-mode-enter' ;; View mode entry and exit is done through the functions `view-mode-enter'
;; and `view-mode-exit'. Use these functions to enter or exit `view-mode' from ;; and `view-mode-exit'. Use these functions to enter or exit `view-mode' from
;; Emacs Lisp programs. ;; Emacs Lisp programs.
;;
;; We use both view- and View- as prefix for symbols. View- is used as ;; We use both view- and View- as prefix for symbols. View- is used as
;; prefix for commands that have a key binding. view- is used for commands ;; prefix for commands that have a key binding. view- is used for commands
;; without key binding. The purpose of this is to make it easier for a ;; without key binding. The purpose of this is to make it easier for a
@ -101,8 +102,6 @@ functions that enable or disable view mode.")
(defvar-local view-old-buffer-read-only nil) (defvar-local view-old-buffer-read-only nil)
(defvar-local view-old-Helper-return-blurb nil)
(defvar-local view-page-size nil (defvar-local view-page-size nil
"Default number of lines to scroll by View page commands. "Default number of lines to scroll by View page commands.
If nil that means use the window size.") If nil that means use the window size.")
@ -454,15 +453,7 @@ Entry to view-mode runs the normal hook `view-mode-hook'."
(setq view-page-size nil (setq view-page-size nil
view-half-page-size nil view-half-page-size nil
view-old-buffer-read-only buffer-read-only view-old-buffer-read-only buffer-read-only
buffer-read-only t) buffer-read-only t))
(if (boundp 'Helper-return-blurb)
(setq view-old-Helper-return-blurb (and (boundp 'Helper-return-blurb)
Helper-return-blurb)
Helper-return-blurb
(format "continue viewing %s"
(if (buffer-file-name)
(file-name-nondirectory (buffer-file-name))
(buffer-name))))))
(define-obsolete-function-alias 'view-mode-enable 'view-mode "24.4") (define-obsolete-function-alias 'view-mode-enable 'view-mode "24.4")
@ -482,8 +473,6 @@ Entry to view-mode runs the normal hook `view-mode-hook'."
;; so that View mode stays off if read-only-mode is called. ;; so that View mode stays off if read-only-mode is called.
(if (local-variable-p 'view-read-only) (if (local-variable-p 'view-read-only)
(kill-local-variable 'view-read-only)) (kill-local-variable 'view-read-only))
(if (boundp 'Helper-return-blurb)
(setq Helper-return-blurb view-old-Helper-return-blurb))
(if buffer-read-only (if buffer-read-only
(setq buffer-read-only view-old-buffer-read-only))) (setq buffer-read-only view-old-buffer-read-only)))
@ -988,6 +977,9 @@ If TIMES is negative, search backwards."
(and (zerop times) (and (zerop times)
(looking-at ".*"))) (looking-at ".*")))
(defvar-local view-old-Helper-return-blurb nil)
(make-obsolete 'view-old-Helper-return-blurb nil "29.1")
(provide 'view) (provide 'view)
;;; view.el ends here ;;; view.el ends here