diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/erc-button.el | 11 | ||||
| -rw-r--r-- | lisp/erc/erc-match.el | 3 | ||||
| -rw-r--r-- | lisp/isearch.el | 7 | ||||
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 3 | ||||
| -rw-r--r-- | lisp/simple.el | 2 | ||||
| -rw-r--r-- | lisp/startup.el | 4 | ||||
| -rw-r--r-- | lisp/tab-line.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 3 |
8 files changed, 14 insertions, 23 deletions
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 6e30b3a7935..e4f5a190913 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -41,6 +41,7 @@ (require 'erc) (require 'wid-edit) (require 'erc-fill) +(require 'browse-url) ;;; Minor Mode @@ -87,12 +88,9 @@ above them." :type 'face :group 'erc-faces) -(defcustom erc-button-url-regexp - (concat "\\(www\\.\\|\\(s?https?\\|" - "ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\)" - "\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?" - "[-a-zA-Z0-9_=!?#$@~`%&*+\\/:;.,()]+[-a-zA-Z0-9_=#$@~`%&*+\\/()]") +(defcustom erc-button-url-regexp browse-url-button-regexp "Regular expression that matches URLs." + :version "27.1" :group 'erc-button :type 'regexp) @@ -223,14 +221,11 @@ PAR is a number of a regexp grouping whose text will be passed to (defvar erc-button-syntax-table (let ((table (make-syntax-table))) - (modify-syntax-entry ?\( "w" table) - (modify-syntax-entry ?\) "w" table) (modify-syntax-entry ?\[ "w" table) (modify-syntax-entry ?\] "w" table) (modify-syntax-entry ?\{ "w" table) (modify-syntax-entry ?\} "w" table) (modify-syntax-entry ?` "w" table) - (modify-syntax-entry ?' "w" table) (modify-syntax-entry ?^ "w" table) (modify-syntax-entry ?- "w" table) (modify-syntax-entry ?_ "w" table) diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 7a824cce9f8..8b9ab331288 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -246,14 +246,11 @@ and other miscellaneous functions." ;; just put it in erc.el (defvar erc-match-syntax-table (let ((table (make-syntax-table))) - (modify-syntax-entry ?\( "w" table) - (modify-syntax-entry ?\) "w" table) (modify-syntax-entry ?\[ "w" table) (modify-syntax-entry ?\] "w" table) (modify-syntax-entry ?\{ "w" table) (modify-syntax-entry ?\} "w" table) (modify-syntax-entry ?` "w" table) - (modify-syntax-entry ?' "w" table) (modify-syntax-entry ?^ "w" table) (modify-syntax-entry ?- "w" table) (modify-syntax-entry ?_ "w" table) diff --git a/lisp/isearch.el b/lisp/isearch.el index c9873937252..ddf9190dc6d 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1225,6 +1225,9 @@ used to set the value of `isearch-regexp-function'." isearch-pre-scroll-point nil isearch-pre-move-point nil + isearch-lazy-count-current nil + isearch-lazy-count-total nil + ;; Save the original value of `minibuffer-message-timeout', and ;; set it to nil so that isearch's messages don't get timed out. isearch-original-minibuffer-message-timeout minibuffer-message-timeout @@ -3776,7 +3779,7 @@ by other Emacs features." isearch-lazy-highlight-window-end)))))) ;; something important did indeed change (lazy-highlight-cleanup t (not (equal isearch-string ""))) ;stop old timer - (when isearch-lazy-count + (when (and isearch-lazy-count isearch-mode (null isearch-message-function)) (when (or (equal isearch-string "") ;; Check if this place was reached by a condition above ;; other than changed window boundaries (that shouldn't @@ -3794,7 +3797,7 @@ by other Emacs features." (clrhash isearch-lazy-count-hash) (setq isearch-lazy-count-current nil isearch-lazy-count-total nil) - (funcall (or isearch-message-function #'isearch-message)))) + (isearch-message))) (setq isearch-lazy-highlight-window-start-changed nil) (setq isearch-lazy-highlight-window-end-changed nil) (setq isearch-lazy-highlight-error isearch-error) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 774e3324c2e..2617a6e4cce 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -933,7 +933,8 @@ Paragraphs are separated only by blank lines. Semicolons start comments. \\{lisp-interaction-mode-map}" - :abbrev-table nil) + :abbrev-table nil + (setq-local lexical-binding t)) ;;; Emacs Lisp Byte-Code mode diff --git a/lisp/simple.el b/lisp/simple.el index f9f1efcc98c..f28198cd81f 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -8953,7 +8953,7 @@ and setting it to nil." (defun messages-buffer () "Return the \"*Messages*\" buffer. -If it does not exist, create and it switch it to `messages-buffer-mode'." +If it does not exist, create it and switch it to `messages-buffer-mode'." (or (get-buffer "*Messages*") (with-current-buffer (get-buffer-create "*Messages*") (messages-buffer-mode) diff --git a/lisp/startup.el b/lisp/startup.el index c27af726f9c..2a85c004da1 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1435,8 +1435,7 @@ please check its value") (if (get-buffer "*scratch*") (with-current-buffer "*scratch*" (if (eq major-mode 'fundamental-mode) - (funcall initial-major-mode)) - (setq-local lexical-binding t))) + (funcall initial-major-mode)))) ;; Load library for our terminal type. ;; User init file can set term-file-prefix to nil to prevent this. @@ -2317,7 +2316,6 @@ A fancy display is used on graphic displays, normal otherwise." (or (get-buffer "*scratch*") (with-current-buffer (get-buffer-create "*scratch*") (set-buffer-major-mode (current-buffer)) - (setq-local lexical-binding t) (current-buffer)))) (defun command-line-1 (args-left) diff --git a/lisp/tab-line.el b/lisp/tab-line.el index 8e561c71f5b..ef530d43dec 100644 --- a/lisp/tab-line.el +++ b/lisp/tab-line.el @@ -81,9 +81,7 @@ '((default :inherit tab-line-tab) (((class color) (min-colors 88)) - :background "grey85") - (t - :inverse-video t)) + :background "grey85")) "Tab line face for tab with current buffer in selected window." :version "27.1" :group 'tab-line-faces) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 37bc53b3850..2caa287bce2 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1785,13 +1785,12 @@ The difference to vc-do-command is that this function always invokes (process-environment (append `("GIT_DIR" - "PAGER=" ;; Avoid repository locking during background operations ;; (bug#21559). ,@(when revert-buffer-in-progress-p '("GIT_OPTIONAL_LOCKS=0"))) process-environment))) - (apply 'process-file vc-git-program nil buffer nil command args))) + (apply 'process-file vc-git-program nil buffer nil "--no-pager" command args))) (defun vc-git--out-ok (command &rest args) (zerop (apply 'vc-git--call '(t nil) command args))) |