aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2021-10-08 21:02:14 +0200
committerStefan Kangas2021-10-08 21:02:14 +0200
commite73c9ac4ed4ce0a4b423dae6acbfb384c1afbce0 (patch)
tree37de10e595caec49ce301ae0994c6a3a9bafe6e2
parent519f9e144f1c1719156d98b67d5e5d78eb932f72 (diff)
downloademacs-e73c9ac4ed4ce0a4b423dae6acbfb384c1afbce0.tar.gz
emacs-e73c9ac4ed4ce0a4b423dae6acbfb384c1afbce0.zip
Remove Emacs 20 compat code from sql.el
* lisp/progmodes/sql.el (sql-input-ring-separator) (sql-product-font-lock): Remove Emacs 20 compat code.
-rw-r--r--lisp/progmodes/sql.el17
1 files changed, 1 insertions, 16 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 454279ca17f..d0e0a1154e5 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -963,12 +963,7 @@ If set to \"\\n\", each line in the history file will be interpreted as
963one command. Multi-line commands are split into several commands when 963one command. Multi-line commands are split into several commands when
964the input ring is initialized from a history file. 964the input ring is initialized from a history file.
965 965
966This variable used to initialize `comint-input-ring-separator'. 966This variable used to initialize `comint-input-ring-separator'."
967`comint-input-ring-separator' is part of Emacs 21; if your Emacs
968does not have it, setting `sql-input-ring-separator' will have no
969effect. In that case multiline commands will be split into several
970commands when the input history is read, as if you had set
971`sql-input-ring-separator' to \"\\n\"."
972 :type 'string) 967 :type 'string)
973 968
974;; The usual hooks 969;; The usual hooks
@@ -2832,16 +2827,6 @@ configured."
2832 (font-lock-mode-internal nil) 2827 (font-lock-mode-internal nil)
2833 (font-lock-mode-internal t)) 2828 (font-lock-mode-internal t))
2834 2829
2835 (add-hook 'font-lock-mode-hook
2836 (lambda ()
2837 ;; Provide defaults for new font-lock faces.
2838 (defvar font-lock-builtin-face
2839 (if (boundp 'font-lock-preprocessor-face)
2840 font-lock-preprocessor-face
2841 font-lock-keyword-face))
2842 (defvar font-lock-doc-face font-lock-string-face))
2843 nil t)
2844
2845 ;; Setup imenu; it needs the same syntax-alist. 2830 ;; Setup imenu; it needs the same syntax-alist.
2846 (when imenu 2831 (when imenu
2847 (setq imenu-syntax-alist syntax-alist)))) 2832 (setq imenu-syntax-alist syntax-alist))))