mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-04 08:47:11 +00:00
3b7b181bde
`string-search` is easier to understand, less error-prone, much faster, does not pollute the regexp cache, and does not mutate global state. Use it where applicable and obviously safe (erring on the conservative side). * admin/authors.el (authors-canonical-file-name) (authors-scan-change-log): * lisp/apropos.el (apropos-command) (apropos-documentation-property, apropos-symbols-internal): * lisp/arc-mode.el (archive-arc-summarize) (archive-zoo-summarize): * lisp/calc/calc-aent.el (math-read-factor): * lisp/calc/calc-ext.el (math-read-big-expr) (math-format-nice-expr, math-format-number-fancy): * lisp/calc/calc-forms.el (math-read-angle-brackets): * lisp/calc/calc-graph.el (calc-graph-set-range): * lisp/calc/calc-keypd.el (calc-keypad-press): * lisp/calc/calc-lang.el (tex, latex, math-read-big-rec): * lisp/calc/calc-prog.el (calc-fix-token-name) (calc-user-define-permanent, math-define-exp): * lisp/calc/calc.el (calc-record, calcDigit-key) (calc-count-lines): * lisp/calc/calcalg2.el (calc-solve-for, calc-poly-roots) (math-do-integral): * lisp/calc/calcalg3.el (calc-find-root, calc-find-minimum) (calc-get-fit-variables): * lisp/cedet/ede/speedbar.el (ede-tag-expand): * lisp/cedet/semantic/java.el (semantic-java-expand-tag): * lisp/cedet/semantic/sb.el (semantic-sb-show-extra) (semantic-sb-expand-group): * lisp/cedet/semantic/wisent/python.el (semantic-python-instance-variable-p): * lisp/cus-edit.el (get): * lisp/descr-text.el (describe-text-sexp): * lisp/dired-aux.el (dired-compress-file): * lisp/dired-x.el (dired-make-relative-symlink): * lisp/dired.el (dired-glob-regexp): * lisp/dos-fns.el (dos-convert-standard-filename, dos-8+3-filename): * lisp/edmacro.el (edmacro-format-keys): * lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand): * lisp/emacs-lisp/lisp-mnt.el (lm-keywords-list): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/emulation/viper-ex.el (viper-ex-read-file-name) (ex-print-display-lines): * lisp/env.el (read-envvar-name, setenv): * lisp/epa-mail.el (epa-mail-encrypt): * lisp/epg.el (epg--start): * lisp/erc/erc-backend.el (erc-parse-server-response): * lisp/erc/erc-dcc.el (erc-dcc-member): * lisp/erc/erc-speedbar.el (erc-speedbar-expand-server) (erc-speedbar-expand-channel, erc-speedbar-expand-user): * lisp/erc/erc.el (erc-send-input): * lisp/eshell/em-glob.el (eshell-glob-entries): * lisp/eshell/esh-proc.el (eshell-needs-pipe-p): * lisp/eshell/esh-util.el (eshell-convert): * lisp/eshell/esh-var.el (eshell-envvar-names): * lisp/faces.el (x-resolve-font-name): * lisp/ffap.el (ffap-file-at-point): * lisp/files.el (wildcard-to-regexp, shell-quote-wildcard-pattern): * lisp/forms.el (forms--update): * lisp/frameset.el (frameset-filter-unshelve-param): * lisp/gnus/gnus-art.el (article-decode-charset): * lisp/gnus/gnus-kill.el (gnus-kill-parse-rn-kill-file): * lisp/gnus/gnus-mlspl.el (gnus-group-split-fancy): * lisp/gnus/gnus-msg.el (gnus-summary-resend-message-insert-gcc) (gnus-inews-insert-gcc): * lisp/gnus/gnus-rfc1843.el (rfc1843-decode-article-body): * lisp/gnus/gnus-search.el (gnus-search-indexed-parse-output) (gnus-search--complete-key-data): * lisp/gnus/gnus-spec.el (gnus-parse-simple-format): * lisp/gnus/gnus-sum.el (gnus-summary-refer-article): * lisp/gnus/gnus-util.el (gnus-extract-address-components) (gnus-newsgroup-directory-form): * lisp/gnus/gnus-uu.el (gnus-uu-grab-view): * lisp/gnus/gnus.el (gnus-group-native-p, gnus-short-group-name): * lisp/gnus/message.el (message-check-news-header-syntax) (message-make-message-id, message-user-mail-address) (message-make-fqdn, message-get-reply-headers, message-followup): * lisp/gnus/mm-decode.el (mm-dissect-buffer): * lisp/gnus/nnheader.el (nnheader-insert): * lisp/gnus/nnimap.el (nnimap-process-quirk) (nnimap-imap-ranges-to-gnus-ranges): * lisp/gnus/nnmaildir.el (nnmaildir--ensure-suffix): * lisp/gnus/nnmairix.el (nnmairix-determine-original-group-from-path): * lisp/gnus/nnrss.el (nnrss-match-macro): * lisp/gnus/nntp.el (nntp-find-group-and-number): * lisp/help-fns.el (help--symbol-completion-table-affixation): * lisp/help.el (help-function-arglist): * lisp/hippie-exp.el (he-concat-directory-file-name): * lisp/htmlfontify.el (hfy-relstub): * lisp/ido.el (ido-make-prompt, ido-complete, ido-copy-current-word) (ido-exhibit): * lisp/image/image-converter.el (image-convert-p): * lisp/info-xref.el (info-xref-docstrings): * lisp/info.el (Info-toc-build, Info-follow-reference) (Info-backward-node, Info-finder-find-node) (Info-speedbar-expand-node): * lisp/international/mule-diag.el (print-fontset-element): * lisp/language/korea-util.el (default-korean-keyboard): * lisp/linum.el (linum-after-change): * lisp/mail/ietf-drums.el (ietf-drums-parse-address): * lisp/mail/mail-utils.el (mail-dont-reply-to): * lisp/mail/rfc2047.el (rfc2047-encode-1, rfc2047-decode-string): * lisp/mail/rfc2231.el (rfc2231-parse-string): * lisp/mail/rmailkwd.el (rmail-set-label): * lisp/mail/rmailsum.el (rmail-header-summary): * lisp/mail/smtpmail.el (smtpmail-maybe-append-domain) (smtpmail-user-mail-address): * lisp/mail/uce.el (uce-reply-to-uce): * lisp/man.el (Man-default-man-entry): * lisp/mh-e/mh-alias.el (mh-alias-gecos-name) (mh-alias-minibuffer-confirm-address): * lisp/mh-e/mh-comp.el (mh-forwarded-letter-subject): * lisp/mh-e/mh-speed.el (mh-speed-parse-flists-output): * lisp/mh-e/mh-utils.el (mh-collect-folder-names-filter) (mh-folder-completion-function): * lisp/minibuffer.el (completion--make-envvar-table) (completion-file-name-table, completion-flex-try-completion) (completion-flex-all-completions): * lisp/mpc.el (mpc--proc-quote-string, mpc-cmd-special-tag-p) (mpc-constraints-tag-lookup): * lisp/net/ange-ftp.el (ange-ftp-send-cmd) (ange-ftp-allow-child-lookup): * lisp/net/mailcap.el (mailcap-mime-types): * lisp/net/mairix.el (mairix-search-thread-this-article): * lisp/net/pop3.el (pop3-open-server): * lisp/net/soap-client.el (soap-decode-xs-complex-type): * lisp/net/socks.el (socks-filter): * lisp/nxml/nxml-outln.el (nxml-highlighted-qname): * lisp/nxml/rng-cmpct.el (rng-c-expand-name, rng-c-expand-datatype): * lisp/nxml/rng-uri.el (rng-uri-file-name-1): * lisp/obsolete/complete.el (partial-completion-mode) (PC-do-completion): * lisp/obsolete/longlines.el (longlines-encode-string): * lisp/obsolete/nnir.el (nnir-compose-result): * lisp/obsolete/terminal.el (te-quote-arg-for-sh): * lisp/obsolete/tpu-edt.el (tpu-check-search-case): * lisp/obsolete/url-ns.el (isPlainHostName): * lisp/pcmpl-unix.el (pcomplete/scp): * lisp/play/dunnet.el (dun-listify-string2, dun-get-path) (dun-unix-parse, dun-doassign, dun-cat, dun-batch-unix-interface): * lisp/progmodes/ebnf2ps.el: (ebnf-eps-header-footer-comment): * lisp/progmodes/gdb-mi.el (gdb-var-delete) (gdb-speedbar-expand-node, gdbmi-bnf-incomplete-record-result): * lisp/progmodes/gud.el (gud-find-expr): * lisp/progmodes/idlw-help.el (idlwave-do-context-help1): * lisp/progmodes/idlw-shell.el (idlwave-shell-mode) (idlwave-shell-filter-hidden-output, idlwave-shell-filter): * lisp/progmodes/idlwave.el (idlwave-skip-label-or-case) (idlwave-routine-info): * lisp/progmodes/octave.el (inferior-octave-completion-at-point): * lisp/progmodes/sh-script.el (sh-add-completer): * lisp/progmodes/sql.el (defun): * lisp/progmodes/xscheme.el (xscheme-process-filter): * lisp/replace.el (query-replace-compile-replacement) (map-query-replace-regexp): * lisp/shell.el (shell--command-completion-data) (shell-environment-variable-completion): * lisp/simple.el (display-message-or-buffer): * lisp/speedbar.el (speedbar-dired, speedbar-tag-file) (speedbar-tag-expand): * lisp/subr.el (split-string-and-unquote): * lisp/tar-mode.el (tar-extract): * lisp/term.el (term-command-hook, serial-read-name): * lisp/textmodes/bibtex.el (bibtex-print-help-message): * lisp/textmodes/ispell.el (ispell-lookup-words, ispell-filter) (ispell-parse-output, ispell-buffer-local-parsing): * lisp/textmodes/reftex-cite.el (reftex-do-citation): * lisp/textmodes/reftex-parse.el (reftex-notice-new): * lisp/textmodes/reftex-ref.el (reftex-show-entry): * lisp/textmodes/reftex.el (reftex-compile-variables): * lisp/textmodes/tex-mode.el (tex-send-command) (tex-start-tex, tex-append): * lisp/thingatpt.el (thing-at-point-url-at-point): * lisp/tmm.el (tmm-add-one-shortcut): * lisp/transient.el (transient-format-key): * lisp/url/url-auth.el (url-basic-auth) (url-digest-auth-directory-id-assoc): * lisp/url/url-news.el (url-news): * lisp/url/url-util.el (url-parse-query-string): * lisp/vc/vc-cvs.el (vc-cvs-parse-entry): * lisp/wid-browse.el (widget-browse-sexp): * lisp/woman.el (woman-parse-colon-path, woman-mini-help) (WoMan-getpage-in-background, woman-negative-vertical-space): * lisp/xml.el: * test/lisp/emacs-lisp/check-declare-tests.el (check-declare-tests-warn): * test/lisp/files-tests.el (files-tests-file-name-non-special-dired-compress-handler): * test/lisp/net/network-stream-tests.el (server-process-filter): * test/src/coding-tests.el (ert-test-unibyte-buffer-dos-eol-decode): Use `string-search` instead of `string-match` and `string-match-p`.
250 lines
10 KiB
EmacsLisp
250 lines
10 KiB
EmacsLisp
;;; linum.el --- display line numbers in the left margin -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2008-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Markus Triska <markus.triska@gmx.at>
|
|
;; Maintainer: emacs-devel@gnu.org
|
|
;; Keywords: convenience
|
|
;; Old-Version: 0.9x
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Display line numbers for the current buffer.
|
|
;;
|
|
;; Toggle display of line numbers with M-x linum-mode. To enable
|
|
;; line numbering in all buffers, use M-x global-linum-mode.
|
|
|
|
;;; Code:
|
|
|
|
(defvar-local linum-overlays nil "Overlays used in this buffer.")
|
|
(defvar-local linum-available nil "Overlays available for reuse.")
|
|
(defvar linum-before-numbering-hook nil
|
|
"Functions run in each buffer before line numbering starts.")
|
|
|
|
(defgroup linum nil
|
|
"Show line numbers in the left margin."
|
|
:group 'convenience)
|
|
|
|
(defcustom linum-format 'dynamic
|
|
"Format used to display line numbers.
|
|
Either a format string like \"%7d\", `dynamic' to adapt the width
|
|
as needed, or a function that is called with a line number as its
|
|
argument and should evaluate to a string to be shown on that line.
|
|
See also `linum-before-numbering-hook'."
|
|
:group 'linum
|
|
:type '(choice (string :tag "Format string")
|
|
(const :tag "Dynamic width" dynamic)
|
|
(function :tag "Function")))
|
|
|
|
(defface linum
|
|
'((t :inherit (shadow default)))
|
|
"Face for displaying line numbers in the display margin."
|
|
:group 'linum)
|
|
|
|
(defcustom linum-eager t
|
|
"Whether line numbers should be updated after each command.
|
|
The conservative setting nil might miss some buffer changes,
|
|
and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
|
|
:group 'linum
|
|
:type 'boolean)
|
|
|
|
(defcustom linum-delay nil
|
|
"Delay updates to give Emacs a chance for other changes."
|
|
:group 'linum
|
|
:type 'boolean)
|
|
|
|
;;;###autoload
|
|
(define-minor-mode linum-mode
|
|
"Toggle display of line numbers in the left margin (Linum mode).
|
|
|
|
Linum mode is a buffer-local minor mode."
|
|
:lighter "" ; for desktop.el
|
|
:append-arg-docstring t
|
|
(if linum-mode
|
|
(progn
|
|
(if linum-eager
|
|
(add-hook 'post-command-hook (if linum-delay
|
|
'linum-schedule
|
|
'linum-update-current) nil t)
|
|
(add-hook 'after-change-functions 'linum-after-change nil t))
|
|
(add-hook 'window-scroll-functions 'linum-after-scroll nil t)
|
|
;; Using both window-size-change-functions and
|
|
;; window-configuration-change-hook seems redundant. --Stef
|
|
;; (add-hook 'window-size-change-functions 'linum-after-size nil t)
|
|
(add-hook 'change-major-mode-hook 'linum-delete-overlays nil t)
|
|
(add-hook 'window-configuration-change-hook
|
|
;; FIXME: If the buffer is shown in N windows, this
|
|
;; will be called N times rather than once. We should use
|
|
;; something like linum-update-window instead.
|
|
'linum-update-current nil t)
|
|
(linum-update-current))
|
|
(remove-hook 'post-command-hook 'linum-update-current t)
|
|
(remove-hook 'post-command-hook 'linum-schedule t)
|
|
;; (remove-hook 'window-size-change-functions 'linum-after-size t)
|
|
(remove-hook 'window-scroll-functions 'linum-after-scroll t)
|
|
(remove-hook 'after-change-functions 'linum-after-change t)
|
|
(remove-hook 'window-configuration-change-hook 'linum-update-current t)
|
|
(remove-hook 'change-major-mode-hook 'linum-delete-overlays t)
|
|
(linum-delete-overlays)))
|
|
|
|
;;;###autoload
|
|
(define-globalized-minor-mode global-linum-mode linum-mode linum-on)
|
|
|
|
(defun linum-on ()
|
|
(unless (or (minibufferp)
|
|
;; Turning linum-mode in the daemon's initial frame
|
|
;; could significantly slow down startup, if the buffer
|
|
;; in which this is done is large, because Emacs thinks
|
|
;; the "window" spans the entire buffer then. This
|
|
;; could happen when restoring session via desktop.el,
|
|
;; if some large buffer was under linum-mode when
|
|
;; desktop was saved. So we disable linum-mode for
|
|
;; non-client frames in a daemon session.
|
|
|
|
;; Note that nowadays, this actually doesn't show line
|
|
;; numbers in client frames at all, because we visit the
|
|
;; file before creating the client frame. See bug#35726.
|
|
(and (daemonp) (null (frame-parameter nil 'client))))
|
|
(linum-mode 1)))
|
|
|
|
(defun linum-delete-overlays ()
|
|
"Delete all overlays displaying line numbers for this buffer."
|
|
(mapc #'delete-overlay linum-overlays)
|
|
(setq linum-overlays nil)
|
|
(dolist (w (get-buffer-window-list (current-buffer) nil t))
|
|
;; restore margins if needed FIXME: This still fails if the
|
|
;; "other" mode has incidentally set margins to exactly what linum
|
|
;; had: see bug#20674 for a similar workaround in nlinum.el
|
|
(let ((set-margins (window-parameter w 'linum--set-margins))
|
|
(current-margins (window-margins w)))
|
|
(when (and set-margins
|
|
(equal set-margins current-margins))
|
|
(set-window-margins w 0 (cdr current-margins))
|
|
(set-window-parameter w 'linum--set-margins nil)))))
|
|
|
|
(defun linum-update-current ()
|
|
"Update line numbers for the current buffer."
|
|
(linum-update (current-buffer)))
|
|
|
|
(defun linum-update (buffer)
|
|
"Update line numbers for all windows displaying BUFFER."
|
|
(with-current-buffer buffer
|
|
(when linum-mode
|
|
(setq linum-available linum-overlays)
|
|
(setq linum-overlays nil)
|
|
(save-excursion
|
|
(mapc #'linum-update-window
|
|
(get-buffer-window-list buffer nil 'visible)))
|
|
(mapc #'delete-overlay linum-available)
|
|
(setq linum-available nil))))
|
|
|
|
;; Behind display-graphic-p test.
|
|
(declare-function font-info "font.c" (name &optional frame))
|
|
|
|
(defun linum--face-width (face)
|
|
(let ((info (font-info (face-font face)))
|
|
width)
|
|
(setq width (aref info 11))
|
|
(if (<= width 0)
|
|
(setq width (aref info 10)))
|
|
width))
|
|
|
|
(defun linum-update-window (win)
|
|
"Update line numbers for the portion visible in window WIN."
|
|
(goto-char (window-start win))
|
|
(let ((line (line-number-at-pos))
|
|
(limit (window-end win t))
|
|
(fmt (cond ((stringp linum-format) linum-format)
|
|
((eq linum-format 'dynamic)
|
|
(let ((w (length (number-to-string
|
|
(count-lines (point-min) (point-max))))))
|
|
(concat "%" (number-to-string w) "d")))))
|
|
(width 0))
|
|
(run-hooks 'linum-before-numbering-hook)
|
|
;; Create an overlay (or reuse an existing one) for each
|
|
;; line visible in this window, if necessary.
|
|
(while (and (not (eobp)) (< (point) limit))
|
|
(let* ((str (if fmt
|
|
(propertize (format fmt line) 'face 'linum)
|
|
(funcall linum-format line)))
|
|
(visited (catch 'visited
|
|
(dolist (o (overlays-in (point) (point)))
|
|
(when (equal-including-properties
|
|
(overlay-get o 'linum-str) str)
|
|
(unless (memq o linum-overlays)
|
|
(push o linum-overlays))
|
|
(setq linum-available (delq o linum-available))
|
|
(throw 'visited t))))))
|
|
(setq width (max width (length str)))
|
|
(unless visited
|
|
(let ((ov (if (null linum-available)
|
|
(make-overlay (point) (point))
|
|
(move-overlay (pop linum-available) (point) (point)))))
|
|
(push ov linum-overlays)
|
|
(overlay-put ov 'before-string
|
|
(propertize " " 'display `((margin left-margin) ,str)))
|
|
(overlay-put ov 'linum-str str))))
|
|
;; Text may contain those nasty intangible properties, but that
|
|
;; shouldn't prevent us from counting those lines.
|
|
(let ((inhibit-point-motion-hooks t))
|
|
(forward-line))
|
|
(setq line (1+ line)))
|
|
(when (display-graphic-p)
|
|
(setq width (ceiling
|
|
(/ (* width 1.0 (linum--face-width 'linum))
|
|
(frame-char-width)))))
|
|
;; open up space in the left margin, if needed, and record that
|
|
;; fact as the window-parameter `linum--set-margins'
|
|
(let ((existing-margins (window-margins win)))
|
|
(when (> width (or (car existing-margins) 0))
|
|
(set-window-margins win width (cdr existing-margins))
|
|
(set-window-parameter win 'linum--set-margins (window-margins win))))))
|
|
|
|
(defun linum-after-change (beg end _len)
|
|
;; update overlays on deletions, and after newlines are inserted
|
|
(when (or (= beg end)
|
|
(= end (point-max))
|
|
(string-search "\n" (buffer-substring-no-properties beg end)))
|
|
(linum-update-current)))
|
|
|
|
(defun linum-after-scroll (win _start)
|
|
(linum-update (window-buffer win)))
|
|
|
|
;; (defun linum-after-size (frame)
|
|
;; (linum-after-config))
|
|
|
|
(defun linum-schedule ()
|
|
;; schedule an update; the delay gives Emacs a chance for display changes
|
|
(run-with-idle-timer 0 nil #'linum-update-current))
|
|
|
|
;; (defun linum-after-config ()
|
|
;; (walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
|
|
|
|
(defun linum-unload-function ()
|
|
"Unload the Linum library."
|
|
(global-linum-mode -1)
|
|
;; continue standard unloading
|
|
nil)
|
|
|
|
(defconst linum-version "0.9x")
|
|
(make-obsolete-variable 'linum-version 'emacs-version "28.1")
|
|
|
|
(provide 'linum)
|
|
|
|
;;; linum.el ends here
|