[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 501808c 2/3: Replace some obsolete aliases in cod
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 501808c 2/3: Replace some obsolete aliases in code |
Date: |
Tue, 6 Mar 2018 20:19:03 -0500 (EST) |
branch: emacs-26
commit 501808ce690c93eac7df4b8f467ed940528d9229
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Replace some obsolete aliases in code
* lisp/emulation/viper.el (viper-set-hooks):
* lisp/epa-hook.el (auto-encryption-mode):
* lisp/term/pc-win.el (set-frame-font): Replace obsolete aliases.
* lisp/net/quickurl.el (quickurl--assoc-function): New.
(quickurl-assoc-function): Use it.
---
lisp/emulation/viper.el | 2 +-
lisp/epa-hook.el | 2 +-
lisp/net/quickurl.el | 7 ++++++-
lisp/term/pc-win.el | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 13a88ad..c8eca30 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -902,7 +902,7 @@ Two differences:
(viper-setup-ESC-to-escape t)
(add-hook 'change-major-mode-hook #'viper-major-mode-change-sentinel)
- (add-hook 'find-file-hooks #'set-viper-state-in-major-mode)
+ (add-hook 'find-file-hook #'set-viper-state-in-major-mode)
;; keep this because many modes we don't know about use this hook
(defvar text-mode-hook)
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index d99a3ef..135c956 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -95,7 +95,7 @@ the mode if ARG is omitted or nil."
:initialize 'custom-initialize-delay
(setq file-name-handler-alist
(delq epa-file-handler file-name-handler-alist))
- (remove-hook 'find-file-hooks 'epa-file-find-file-hook)
+ (remove-hook 'find-file-hook 'epa-file-find-file-hook)
(setq auto-mode-alist (delq epa-file-auto-mode-alist-entry
auto-mode-alist))
(when auto-encryption-mode
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 5321807..abfca38 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -116,8 +116,13 @@
:type 'function
:group 'quickurl)
-(defcustom quickurl-assoc-function #'assoc-ignore-case
+(defun quickurl--assoc-function (key alist)
+ "Default function for `quickurl-assoc-function'."
+ (assoc-string key alist t))
+
+(defcustom quickurl-assoc-function #'quickurl--assoc-function
"Function to use for alist lookup into `quickurl-urls'."
+ :version "26.1" ; was the obsolete assoc-ignore-case
:type 'function
:group 'quickurl)
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 83f5923..62734d9 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -372,7 +372,7 @@ Consult the selection. Treat empty strings as if they were
unset."
(fset 'iconify-or-deiconify-frame 'ignore)
;; From lisp/frame.el
-(fset 'set-default-font 'ignore)
+(fset 'set-frame-font 'ignore)
(fset 'set-mouse-color 'ignore) ; We cannot, I think.
(fset 'set-cursor-color 'ignore) ; Hardware determined by char under.
(fset 'set-border-color 'ignore) ; Not useful.