diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bindings.el | 2 | ||||
| -rw-r--r-- | lisp/bookmark.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 9 | ||||
| -rw-r--r-- | lisp/filenotify.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-undo.el | 2 | ||||
| -rw-r--r-- | lisp/help-fns.el | 2 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 2 | ||||
| -rw-r--r-- | lisp/mwheel.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 3 | ||||
| -rw-r--r-- | lisp/window.el | 8 |
10 files changed, 23 insertions, 13 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el index 2c45710a580..121e484a0ee 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -981,7 +981,7 @@ if `inhibit-field-text-motion' is non-nil." (define-key ctl-x-map "\M-:" 'repeat-complex-command) (define-key ctl-x-map "u" 'undo) (put 'undo :advertised-binding [?\C-x ?u]) -;; Many people are used to typing C-/ on X terminals and getting C-_. +;; Many people are used to typing C-/ on GUI frames and getting C-_. (define-key global-map [?\C-/] 'undo) (define-key global-map "\C-_" 'undo) ;; Richard said that we should not use C-x <uppercase letter> and I have diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 5c4a9803b39..22520ebb7af 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -479,7 +479,7 @@ See user option `bookmark-set-fringe'." (dolist (buf (buffer-list)) (with-current-buffer buf (when (equal filename buffer-file-name) - (setq overlays (overlays-in pos pos)) + (setq overlays (overlays-in pos (1+ pos))) (while (and (not found) (setq temp (pop overlays))) (when (eq 'bookmark (overlay-get temp 'category)) (delete-overlay (setq found temp)))))))))) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 0052fd0f8db..0a105052570 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -3781,15 +3781,18 @@ Return the trampoline if found or nil otherwise." for arg in lambda-list unless (memq arg '(&optional &rest)) collect arg))))) - ;; Use speed 0 to maximize compilation speed and not to - ;; optimize away funcall calls! + ;; Use speed 1 for compilation speed and not to optimize away + ;; funcall calls! (byte-optimize nil) (native-comp-speed 1) (lexical-binding t)) (comp--native-compile form nil (cl-loop - for dir in (comp-eln-load-path-eff) + for dir in (if native-compile-target-directory + (list (expand-file-name comp-native-version-dir + native-compile-target-directory)) + (comp-eln-load-path-eff)) for f = (expand-file-name (comp-trampoline-filename subr-name) dir) diff --git a/lisp/filenotify.el b/lisp/filenotify.el index a2a27625e4e..26954cc73f2 100644 --- a/lisp/filenotify.el +++ b/lisp/filenotify.el @@ -390,7 +390,9 @@ include the following symbols: permissions or modification time If FILE is a directory, `change' watches for file creation or -deletion in that directory. This does not work recursively. +deletion in that directory. Some of the file notification +backends report also file changes. This does not work +recursively. When any event happens, Emacs will call the CALLBACK function passing it a single argument EVENT, which is of the form diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el index 182c8743e09..0717a7ccfba 100644 --- a/lisp/gnus/gnus-undo.el +++ b/lisp/gnus/gnus-undo.el @@ -79,7 +79,7 @@ "\M-\C-_" #'gnus-undo "\C-_" #'gnus-undo "\C-xu" #'gnus-undo - ;; many people are used to type `C-/' on X terminals and get `C-_'. + ;; many people are used to type `C-/' on GUI frames and get `C-_'. [(control /)] #'gnus-undo) (defun gnus-undo-make-menu-bar () diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 03bbc979a9c..2b759a5a5c5 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -823,7 +823,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)." ;; Advised & aliased function. (and advised (symbolp real-function) (not (eq 'autoload (car-safe def)))) - (and (subrp def) + (and (subrp def) (symbolp function) (not (string= (subr-name def) (symbol-name function))))))) (real-def (cond diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 6dd1896a29e..980ba2fcd19 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -2169,7 +2169,7 @@ otherwise it could decide to silently do nothing." (> count 1))) (defcustom yank-menu-length 20 - "Items in `yank-menu' longer than this will be truncated." + "Text of items in `yank-menu' longer than this will be truncated." :type 'integer :group 'menu) diff --git a/lisp/mwheel.el b/lisp/mwheel.el index def77587747..51410e3ef4c 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -103,7 +103,7 @@ less than a full screen. If AMOUNT is the symbol 'hscroll', this means that with MODIFIER, the mouse wheel will scroll horizontally instead of vertically. -If AMOUNT is the symbol text-scale, this means that with +If AMOUNT is the symbol 'text-scale', this means that with MODIFIER, the mouse wheel will change the face height instead of scrolling." :group 'mouse diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 2b480e89507..14da5880203 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -662,7 +662,8 @@ has just been matched, and should correspondingly preserve this match data. TYPE is 2 or nil for a real error or 1 for warning or 0 for info. TYPE can also be of the form (WARNING . INFO). In that case this will be equivalent to 1 if the WARNING'th subexpression matched -or else equivalent to 0 if the INFO'th subexpression matched. +or else equivalent to 0 if the INFO'th subexpression matched, +or else equivalent to 2 if neither of them matched. See `compilation-error-face', `compilation-warning-face', `compilation-info-face' and `compilation-skip-threshold'. diff --git a/lisp/window.el b/lisp/window.el index bc0ccd72a0b..132f0930ceb 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1410,9 +1410,12 @@ before writing to it." (cadr fringes) (window-scroll-bar-width window) (window-right-divider-width window)) - (format "height header-line: %s mode-line: %s divider: %s\n" + (format "height tab-line: %s header-line: %s mode-line: %s\n" + (window-tab-line-height window) (window-header-line-height window) - (window-mode-line-height window) + (window-mode-line-height window)) + (format "height scroll-bar: %s divider: %s" + (window-scroll-bar-height window) (window-bottom-divider-width window))))) (insert "\n"))) @@ -1675,6 +1678,7 @@ return the minimum pixel-size of WINDOW." ((let ((char-size (frame-char-size window)) (pixel-height (+ (window-safe-min-size window nil t) + (window-tab-line-height window) (window-header-line-height window) (window-scroll-bar-height window) (window-mode-line-height window) |