[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 158d2a1: Remove some Emacs 19 compat code and references
From: |
Stefan Kangas |
Subject: |
master 158d2a1: Remove some Emacs 19 compat code and references |
Date: |
Sun, 25 Oct 2020 13:28:41 -0400 (EDT) |
branch: master
commit 158d2a1f50cfe233af83aa93501f51c9986918f3
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Remove some Emacs 19 compat code and references
* lisp/progmodes/sql.el:
* lisp/mh-e/mh-show.el (mh-display-msg): Remove Emacs 19 compat code.
* lisp/emacs-lisp/edebug.el (edebug-mark-marker): Make into
obsolete alias for mark-marker.
(edebug--display-1, edebug-bounce-point)
(edebug-outside-excursion): Adjust callers.
* lisp/net/snmp-mode.el:
* lisp/forms.el: Remove references to Emacs 19.
(forms-use-text-properties): Doc fix.
---
lisp/emacs-lisp/edebug.el | 17 ++++++++---------
lisp/forms.el | 10 ++++------
lisp/mh-e/mh-show.el | 3 +--
lisp/net/snmp-mode.el | 4 +---
lisp/progmodes/sql.el | 3 ---
5 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index f10dc13..fe73363 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2665,9 +2665,6 @@ See `edebug-behavior-alist' for implementations.")
(defvar edebug-previous-result nil) ;; Last result returned.
-;; Emacs 19 adds an arg to mark and mark-marker.
-(defalias 'edebug-mark-marker 'mark-marker)
-
(defun edebug--display (value offset-index arg-mode)
;; edebug--display-1 is too big, we should split it. This function
;; here was just introduced to avoid making edebug--display-1
@@ -2895,8 +2892,8 @@ See `edebug-behavior-alist' for implementations.")
;; But don't restore point if edebug-buffer is current buffer.
(if (not (eq edebug-buffer edebug-outside-buffer))
(goto-char edebug-outside-point))
- (if (marker-buffer (edebug-mark-marker))
- (set-marker (edebug-mark-marker) edebug-outside-mark))
+ (if (marker-buffer (mark-marker))
+ (set-marker (mark-marker) edebug-outside-mark))
)) ; unwind-protect
;; None of the following is done if quit or signal occurs.
@@ -3153,8 +3150,8 @@ before returning. The default is one second."
(goto-char edebug-outside-point)
(message "Current buffer: %s Point: %s Mark: %s"
(current-buffer) (point)
- (if (marker-buffer (edebug-mark-marker))
- (marker-position (edebug-mark-marker)) "<not set>"))
+ (if (marker-buffer (mark-marker))
+ (marker-position (mark-marker)) "<not set>"))
(sit-for arg)
(edebug-pop-to-buffer edebug-buffer (car edebug-window-data)))))
@@ -3725,8 +3722,8 @@ Return the result of the last expression."
;; for us.
(with-current-buffer edebug-outside-buffer ; of edebug-buffer
(goto-char edebug-outside-point)
- (if (marker-buffer (edebug-mark-marker))
- (set-marker (edebug-mark-marker) edebug-outside-mark))
+ (if (marker-buffer (mark-marker))
+ (set-marker (mark-marker) edebug-outside-mark))
,@body)
;; Back to edebug-buffer. Restore rest of inside context.
@@ -4667,5 +4664,7 @@ instrumentation for, defaulting to all functions."
(message "Removed edebug instrumentation from %s"
(mapconcat #'symbol-name functions ", ")))
+(define-obsolete-function-alias 'edebug-mark-marker #'mark-marker "28.1")
+
(provide 'edebug)
;;; edebug.el ends here
diff --git a/lisp/forms.el b/lisp/forms.el
index e9242ce..8974f99 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -168,10 +168,9 @@
;; modified (using text-property `read-only').
;; Also, the read-write fields are shown using a
;; distinct face, if possible.
-;; As of emacs 19.29, the `intangible' text property
-;; is used to prevent moving into read-only fields.
-;; This variable defaults to t if running Emacs 19 or
-;; later with text properties.
+;; The `intangible' text property is used to
+;; prevent moving into read-only fields.
+;; This variable defaults to t.
;; The default face to show read-write fields is
;; copied from face `region'.
;;
@@ -363,8 +362,7 @@ This variable is for use by the filter routines only.
The contents may NOT be modified.")
(defcustom forms-use-text-properties t
- "Non-nil means: use text properties.
-Defaults to t if this Emacs is capable of handling text properties."
+ "Non-nil means to use text properties. "
:group 'forms
:type 'boolean)
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 3c07d42..04551ac 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -219,8 +219,7 @@ Sets the current buffer to the show buffer."
(erase-buffer)
;; Changing contents, so this hook needs to be reinitialized.
;; pgp.el uses this.
- (if (boundp 'write-contents-hooks) ;Emacs 19
- (kill-local-variable 'write-contents-hooks))
+ (kill-local-variable 'write-contents-hooks)
(font-lock-mode -1)
(mh-show-mode)
(if formfile
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 441e6b1..76d9ced 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -24,9 +24,7 @@
;; INTRODUCTION
;; ------------
-;; This package provides a major mode for editing SNMP MIBs. It
-;; provides all the modern Emacs 19 bells and whistles: default
-;; fontification via font-lock, imenu search functions, etc.
+;; This package provides a major mode for editing SNMP MIBs.
;;
;; SNMP mode also uses tempo, a textual boilerplate insertion package
;; distributed with Emacs, to add in boilerplate SNMP MIB structures.
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index bfef2a6..6b0df2d 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -232,9 +232,6 @@
(require 'cl-lib)
(require 'comint)
-;; Need the following to allow GNU Emacs 19 to compile the file.
-(eval-when-compile
- (require 'regexp-opt))
(require 'custom)
(require 'thingatpt)
(require 'view)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 158d2a1: Remove some Emacs 19 compat code and references,
Stefan Kangas <=