diff options
| author | Glenn Morris | 2018-04-20 18:55:04 -0400 |
|---|---|---|
| committer | Glenn Morris | 2018-04-20 18:55:04 -0400 |
| commit | 18de2ada243653ece98b18044233e5d29eee5903 (patch) | |
| tree | dbac02f9fa7ee6e7f6bd592bd2f775be4cdcf5f6 /lisp/erc | |
| parent | 9c3eeba4db26ddaeead100beea7a96f9fa640918 (diff) | |
| download | emacs-18de2ada243653ece98b18044233e5d29eee5903.tar.gz emacs-18de2ada243653ece98b18044233e5d29eee5903.zip | |
More alias-related tedium
* lisp/comint.el (comint-scroll-to-bottom-on-output):
* lisp/completion.el (cmpl-syntax-table):
* lisp/erc/erc-button.el (erc-button-google-url):
* lisp/font-lock.el (font-lock-reference-face):
* lisp/hfy-cmap.el (hfy-fallback-colour-map, hfy-rgb-txt-colour-map):
* lisp/isearch.el (isearch-regexp-function, isearch-new-word):
* lisp/startup.el (argv):
* lisp/version.el (emacs-bzr-version):
* lisp/org/org.el (org-CUA-compatible)
(org-popup-calendar-for-date-prompt):
Move aliases before targets, to silence new compiler warning.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc-button.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 749ae5db5a2..7599053e9d3 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el | |||
| @@ -121,6 +121,9 @@ longer than `erc-fill-column'." | |||
| 121 | :group 'erc-button | 121 | :group 'erc-button |
| 122 | :type 'string) | 122 | :type 'string) |
| 123 | 123 | ||
| 124 | (define-obsolete-variable-alias 'erc-button-google-url | ||
| 125 | 'erc-button-search-url "27.1") | ||
| 126 | |||
| 124 | (defcustom erc-button-search-url "http://duckduckgo.com/?q=%s" | 127 | (defcustom erc-button-search-url "http://duckduckgo.com/?q=%s" |
| 125 | "URL used to search for a term. | 128 | "URL used to search for a term. |
| 126 | %s is replaced by the search string." | 129 | %s is replaced by the search string." |
| @@ -128,9 +131,6 @@ longer than `erc-fill-column'." | |||
| 128 | :group 'erc-button | 131 | :group 'erc-button |
| 129 | :type 'string) | 132 | :type 'string) |
| 130 | 133 | ||
| 131 | (define-obsolete-variable-alias 'erc-button-google-url | ||
| 132 | 'erc-button-search-url "27.1") | ||
| 133 | |||
| 134 | (defcustom erc-button-alist | 134 | (defcustom erc-button-alist |
| 135 | ;; Since the callback is only executed when the user is clicking on | 135 | ;; Since the callback is only executed when the user is clicking on |
| 136 | ;; a button, it makes no sense to optimize performance by | 136 | ;; a button, it makes no sense to optimize performance by |