Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;;; elisp-mode.el --- Emacs Lisp mode -*- lexical-binding:t -*-
|
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
|
;; Copyright (C) 1985-1986, 1999-2019 Free Software Foundation, Inc.
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
2019-05-25 13:43:06 -07:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; Keywords: lisp, languages
|
|
|
|
|
;; Package: emacs
|
|
|
|
|
|
|
|
|
|
;; 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
|
2017-09-13 15:52:52 -07:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; The major mode for editing Emacs Lisp code.
|
|
|
|
|
;; This mode is documented in the Emacs manual.
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2015-08-10 21:53:19 -05:00
|
|
|
|
(require 'cl-generic)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(require 'lisp-mode)
|
2015-06-09 21:21:29 -04:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
|
|
|
|
(define-abbrev-table 'emacs-lisp-mode-abbrev-table ()
|
|
|
|
|
"Abbrev table for Emacs Lisp mode.
|
|
|
|
|
It has `lisp-mode-abbrev-table' as its parent."
|
|
|
|
|
:parents (list lisp-mode-abbrev-table))
|
|
|
|
|
|
|
|
|
|
(defvar emacs-lisp-mode-syntax-table
|
|
|
|
|
(let ((table (make-syntax-table lisp--mode-syntax-table)))
|
|
|
|
|
(modify-syntax-entry ?\[ "(] " table)
|
|
|
|
|
(modify-syntax-entry ?\] ")[ " table)
|
|
|
|
|
table)
|
|
|
|
|
"Syntax table used in `emacs-lisp-mode'.")
|
|
|
|
|
|
|
|
|
|
(defvar emacs-lisp-mode-map
|
2017-08-09 17:07:57 -06:00
|
|
|
|
(let ((map (make-sparse-keymap))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(menu-map (make-sparse-keymap "Emacs-Lisp"))
|
|
|
|
|
(lint-map (make-sparse-keymap))
|
|
|
|
|
(prof-map (make-sparse-keymap))
|
|
|
|
|
(tracing-map (make-sparse-keymap)))
|
|
|
|
|
(set-keymap-parent map lisp-mode-shared-map)
|
|
|
|
|
(define-key map "\e\t" 'completion-at-point)
|
|
|
|
|
(define-key map "\e\C-x" 'eval-defun)
|
|
|
|
|
(define-key map "\e\C-q" 'indent-pp-sexp)
|
|
|
|
|
(bindings--define-key map [menu-bar emacs-lisp]
|
|
|
|
|
(cons "Emacs-Lisp" menu-map))
|
|
|
|
|
(bindings--define-key menu-map [eldoc]
|
|
|
|
|
'(menu-item "Auto-Display Documentation Strings" eldoc-mode
|
|
|
|
|
:button (:toggle . (bound-and-true-p eldoc-mode))
|
|
|
|
|
:help "Display the documentation string for the item under cursor"))
|
|
|
|
|
(bindings--define-key menu-map [checkdoc]
|
|
|
|
|
'(menu-item "Check Documentation Strings" checkdoc
|
|
|
|
|
:help "Check documentation strings for style requirements"))
|
|
|
|
|
(bindings--define-key menu-map [re-builder]
|
|
|
|
|
'(menu-item "Construct Regexp" re-builder
|
|
|
|
|
:help "Construct a regexp interactively"))
|
|
|
|
|
(bindings--define-key menu-map [tracing] (cons "Tracing" tracing-map))
|
|
|
|
|
(bindings--define-key tracing-map [tr-a]
|
|
|
|
|
'(menu-item "Untrace All" untrace-all
|
|
|
|
|
:help "Untrace all currently traced functions"))
|
|
|
|
|
(bindings--define-key tracing-map [tr-uf]
|
|
|
|
|
'(menu-item "Untrace Function..." untrace-function
|
|
|
|
|
:help "Untrace function, and possibly activate all remaining advice"))
|
|
|
|
|
(bindings--define-key tracing-map [tr-sep] menu-bar-separator)
|
|
|
|
|
(bindings--define-key tracing-map [tr-q]
|
|
|
|
|
'(menu-item "Trace Function Quietly..." trace-function-background
|
|
|
|
|
:help "Trace the function with trace output going quietly to a buffer"))
|
|
|
|
|
(bindings--define-key tracing-map [tr-f]
|
|
|
|
|
'(menu-item "Trace Function..." trace-function
|
|
|
|
|
:help "Trace the function given as an argument"))
|
|
|
|
|
(bindings--define-key menu-map [profiling] (cons "Profiling" prof-map))
|
|
|
|
|
(bindings--define-key prof-map [prof-restall]
|
|
|
|
|
'(menu-item "Remove Instrumentation for All Functions" elp-restore-all
|
|
|
|
|
:help "Restore the original definitions of all functions being profiled"))
|
|
|
|
|
(bindings--define-key prof-map [prof-restfunc]
|
|
|
|
|
'(menu-item "Remove Instrumentation for Function..." elp-restore-function
|
|
|
|
|
:help "Restore an instrumented function to its original definition"))
|
|
|
|
|
|
|
|
|
|
(bindings--define-key prof-map [sep-rem] menu-bar-separator)
|
|
|
|
|
(bindings--define-key prof-map [prof-resall]
|
|
|
|
|
'(menu-item "Reset Counters for All Functions" elp-reset-all
|
|
|
|
|
:help "Reset the profiling information for all functions being profiled"))
|
|
|
|
|
(bindings--define-key prof-map [prof-resfunc]
|
|
|
|
|
'(menu-item "Reset Counters for Function..." elp-reset-function
|
|
|
|
|
:help "Reset the profiling information for a function"))
|
|
|
|
|
(bindings--define-key prof-map [prof-res]
|
|
|
|
|
'(menu-item "Show Profiling Results" elp-results
|
|
|
|
|
:help "Display current profiling results"))
|
|
|
|
|
(bindings--define-key prof-map [prof-pack]
|
|
|
|
|
'(menu-item "Instrument Package..." elp-instrument-package
|
|
|
|
|
:help "Instrument for profiling all function that start with a prefix"))
|
|
|
|
|
(bindings--define-key prof-map [prof-func]
|
|
|
|
|
'(menu-item "Instrument Function..." elp-instrument-function
|
|
|
|
|
:help "Instrument a function for profiling"))
|
|
|
|
|
;; Maybe this should be in a separate submenu from the ELP stuff?
|
|
|
|
|
(bindings--define-key prof-map [sep-natprof] menu-bar-separator)
|
|
|
|
|
(bindings--define-key prof-map [prof-natprof-stop]
|
|
|
|
|
'(menu-item "Stop Native Profiler" profiler-stop
|
|
|
|
|
:help "Stop recording profiling information"
|
|
|
|
|
:enable (and (featurep 'profiler)
|
|
|
|
|
(profiler-running-p))))
|
|
|
|
|
(bindings--define-key prof-map [prof-natprof-report]
|
|
|
|
|
'(menu-item "Show Profiler Report" profiler-report
|
|
|
|
|
:help "Show the current profiler report"
|
|
|
|
|
:enable (and (featurep 'profiler)
|
|
|
|
|
(profiler-running-p))))
|
|
|
|
|
(bindings--define-key prof-map [prof-natprof-start]
|
|
|
|
|
'(menu-item "Start Native Profiler..." profiler-start
|
|
|
|
|
:help "Start recording profiling information"))
|
|
|
|
|
|
|
|
|
|
(bindings--define-key menu-map [lint] (cons "Linting" lint-map))
|
|
|
|
|
(bindings--define-key lint-map [lint-di]
|
|
|
|
|
'(menu-item "Lint Directory..." elint-directory
|
|
|
|
|
:help "Lint a directory"))
|
|
|
|
|
(bindings--define-key lint-map [lint-f]
|
|
|
|
|
'(menu-item "Lint File..." elint-file
|
|
|
|
|
:help "Lint a file"))
|
|
|
|
|
(bindings--define-key lint-map [lint-b]
|
|
|
|
|
'(menu-item "Lint Buffer" elint-current-buffer
|
|
|
|
|
:help "Lint the current buffer"))
|
|
|
|
|
(bindings--define-key lint-map [lint-d]
|
|
|
|
|
'(menu-item "Lint Defun" elint-defun
|
|
|
|
|
:help "Lint the function at point"))
|
|
|
|
|
(bindings--define-key menu-map [edebug-defun]
|
|
|
|
|
'(menu-item "Instrument Function for Debugging" edebug-defun
|
|
|
|
|
:help "Evaluate the top level form point is in, stepping through with Edebug"
|
|
|
|
|
:keys "C-u C-M-x"))
|
|
|
|
|
(bindings--define-key menu-map [separator-byte] menu-bar-separator)
|
|
|
|
|
(bindings--define-key menu-map [disas]
|
|
|
|
|
'(menu-item "Disassemble Byte Compiled Object..." disassemble
|
|
|
|
|
:help "Print disassembled code for OBJECT in a buffer"))
|
|
|
|
|
(bindings--define-key menu-map [byte-recompile]
|
|
|
|
|
'(menu-item "Byte-recompile Directory..." byte-recompile-directory
|
|
|
|
|
:help "Recompile every `.el' file in DIRECTORY that needs recompilation"))
|
|
|
|
|
(bindings--define-key menu-map [emacs-byte-compile-and-load]
|
|
|
|
|
'(menu-item "Byte-compile and Load" emacs-lisp-byte-compile-and-load
|
|
|
|
|
:help "Byte-compile the current file (if it has changed), then load compiled code"))
|
|
|
|
|
(bindings--define-key menu-map [byte-compile]
|
|
|
|
|
'(menu-item "Byte-compile This File" emacs-lisp-byte-compile
|
|
|
|
|
:help "Byte compile the file containing the current buffer"))
|
|
|
|
|
(bindings--define-key menu-map [separator-eval] menu-bar-separator)
|
|
|
|
|
(bindings--define-key menu-map [ielm]
|
|
|
|
|
'(menu-item "Interactive Expression Evaluation" ielm
|
|
|
|
|
:help "Interactively evaluate Emacs Lisp expressions"))
|
|
|
|
|
(bindings--define-key menu-map [eval-buffer]
|
|
|
|
|
'(menu-item "Evaluate Buffer" eval-buffer
|
|
|
|
|
:help "Execute the current buffer as Lisp code"))
|
|
|
|
|
(bindings--define-key menu-map [eval-region]
|
|
|
|
|
'(menu-item "Evaluate Region" eval-region
|
|
|
|
|
:help "Execute the region as Lisp code"
|
|
|
|
|
:enable mark-active))
|
|
|
|
|
(bindings--define-key menu-map [eval-sexp]
|
|
|
|
|
'(menu-item "Evaluate Last S-expression" eval-last-sexp
|
|
|
|
|
:help "Evaluate sexp before point; print value in echo area"))
|
|
|
|
|
(bindings--define-key menu-map [separator-format] menu-bar-separator)
|
|
|
|
|
(bindings--define-key menu-map [comment-region]
|
|
|
|
|
'(menu-item "Comment Out Region" comment-region
|
|
|
|
|
:help "Comment or uncomment each line in the region"
|
|
|
|
|
:enable mark-active))
|
|
|
|
|
(bindings--define-key menu-map [indent-region]
|
|
|
|
|
'(menu-item "Indent Region" indent-region
|
|
|
|
|
:help "Indent each nonblank line in the region"
|
|
|
|
|
:enable mark-active))
|
|
|
|
|
(bindings--define-key menu-map [indent-line]
|
|
|
|
|
'(menu-item "Indent Line" lisp-indent-line))
|
|
|
|
|
map)
|
|
|
|
|
"Keymap for Emacs Lisp mode.
|
|
|
|
|
All commands in `lisp-mode-shared-map' are inherited by this map.")
|
|
|
|
|
|
|
|
|
|
(defun emacs-lisp-byte-compile ()
|
|
|
|
|
"Byte compile the file containing the current buffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if buffer-file-name
|
|
|
|
|
(byte-compile-file buffer-file-name)
|
|
|
|
|
(error "The buffer must be saved in a file first")))
|
|
|
|
|
|
|
|
|
|
(defun emacs-lisp-byte-compile-and-load ()
|
|
|
|
|
"Byte-compile the current file (if it has changed), then load compiled code."
|
|
|
|
|
(interactive)
|
|
|
|
|
(or buffer-file-name
|
|
|
|
|
(error "The buffer must be saved in a file first"))
|
|
|
|
|
(require 'bytecomp)
|
|
|
|
|
;; Recompile if file or buffer has changed since last compilation.
|
|
|
|
|
(if (and (buffer-modified-p)
|
|
|
|
|
(y-or-n-p (format "Save buffer %s first? " (buffer-name))))
|
|
|
|
|
(save-buffer))
|
|
|
|
|
(byte-recompile-file buffer-file-name nil 0 t))
|
|
|
|
|
|
|
|
|
|
(defun emacs-lisp-macroexpand ()
|
|
|
|
|
"Macroexpand the form after point.
|
|
|
|
|
Comments in the form will be lost."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let* ((start (point))
|
|
|
|
|
(exp (read (current-buffer)))
|
|
|
|
|
;; Compute it before, since it may signal errors.
|
2014-11-02 01:46:04 -04:00
|
|
|
|
(new (macroexpand-1 exp)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(if (equal exp new)
|
|
|
|
|
(message "Not a macro call, nothing to expand")
|
|
|
|
|
(delete-region start (point))
|
|
|
|
|
(pp new (current-buffer))
|
|
|
|
|
(if (bolp) (delete-char -1))
|
|
|
|
|
(indent-region start (point)))))
|
|
|
|
|
|
|
|
|
|
(defcustom emacs-lisp-mode-hook nil
|
|
|
|
|
"Hook run when entering Emacs Lisp mode."
|
|
|
|
|
:options '(eldoc-mode imenu-add-menubar-index checkdoc-minor-mode)
|
|
|
|
|
:type 'hook
|
|
|
|
|
:group 'lisp)
|
|
|
|
|
|
2019-07-07 12:22:37 -04:00
|
|
|
|
(defun emacs-lisp-set-electric-text-pairs ()
|
|
|
|
|
"Set `electric-pair-text-pairs' for all `emacs-lisp-mode' buffers."
|
|
|
|
|
(defvar electric-pair-text-pairs)
|
|
|
|
|
(let ((elisp-pairs (append '((?\` . ?\') (?‘ . ?’))
|
|
|
|
|
electric-pair-text-pairs)))
|
|
|
|
|
(save-current-buffer
|
|
|
|
|
(dolist (buf (buffer-list))
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(when (derived-mode-p 'emacs-lisp-mode)
|
|
|
|
|
(setq-local electric-pair-text-pairs elisp-pairs)))))
|
|
|
|
|
(remove-hook 'electric-pair-mode-hook #'emacs-lisp-set-electric-text-pairs))
|
|
|
|
|
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(define-derived-mode emacs-lisp-mode prog-mode "Emacs-Lisp"
|
|
|
|
|
"Major mode for editing Lisp code to run in Emacs.
|
|
|
|
|
Commands:
|
|
|
|
|
Delete converts tabs to spaces as it moves back.
|
|
|
|
|
Blank lines separate paragraphs. Semicolons start comments.
|
|
|
|
|
|
|
|
|
|
\\{emacs-lisp-mode-map}"
|
|
|
|
|
:group 'lisp
|
2015-12-28 06:17:19 +02:00
|
|
|
|
(defvar project-vc-external-roots-function)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(lisp-mode-variables nil nil 'elisp)
|
2015-04-15 16:50:17 -04:00
|
|
|
|
(add-hook 'after-load-functions #'elisp--font-lock-flush-elisp-buffers)
|
2019-07-07 12:22:37 -04:00
|
|
|
|
(if (boundp 'electric-pair-text-pairs)
|
|
|
|
|
(setq-local electric-pair-text-pairs
|
|
|
|
|
(append '((?\` . ?\') (?‘ . ?’))
|
|
|
|
|
electric-pair-text-pairs))
|
|
|
|
|
(add-hook 'electric-pair-mode-hook #'emacs-lisp-set-electric-text-pairs))
|
|
|
|
|
(setq-local electric-quote-string t)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(setq imenu-case-fold-search nil)
|
2014-12-05 19:34:42 +01:00
|
|
|
|
(add-function :before-until (local 'eldoc-documentation-function)
|
|
|
|
|
#'elisp-eldoc-documentation-function)
|
2015-11-14 02:37:01 +02:00
|
|
|
|
(add-hook 'xref-backend-functions #'elisp--xref-backend nil t)
|
2015-12-28 06:17:19 +02:00
|
|
|
|
(setq-local project-vc-external-roots-function #'elisp-load-path-roots)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(add-hook 'completion-at-point-functions
|
2017-10-01 01:24:31 +01:00
|
|
|
|
#'elisp-completion-at-point nil 'local)
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(add-hook 'flymake-diagnostic-functions #'elisp-flymake-checkdoc nil t)
|
|
|
|
|
(add-hook 'flymake-diagnostic-functions #'elisp-flymake-byte-compile nil t))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
2015-04-15 16:50:17 -04:00
|
|
|
|
;; Font-locking support.
|
|
|
|
|
|
|
|
|
|
(defun elisp--font-lock-flush-elisp-buffers (&optional file)
|
2016-01-16 14:11:11 -05:00
|
|
|
|
;; We're only ever called from after-load-functions, load-in-progress can
|
|
|
|
|
;; still be t in case of nested loads.
|
2015-04-15 16:50:17 -04:00
|
|
|
|
(when (or (not load-in-progress) file)
|
|
|
|
|
;; FIXME: If the loaded file did not define any macros, there shouldn't
|
|
|
|
|
;; be any need to font-lock-flush all the Elisp buffers.
|
|
|
|
|
(dolist (buf (buffer-list))
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
(when (derived-mode-p 'emacs-lisp-mode)
|
|
|
|
|
;; So as to take into account new macros that may have been defined
|
|
|
|
|
;; by the just-loaded file.
|
|
|
|
|
(font-lock-flush))))))
|
|
|
|
|
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;;; Completion at point for Elisp
|
|
|
|
|
|
|
|
|
|
(defun elisp--local-variables-1 (vars sexp)
|
|
|
|
|
"Return the vars locally bound around the witness, or nil if not found."
|
|
|
|
|
(let (res)
|
|
|
|
|
(while
|
|
|
|
|
(unless
|
|
|
|
|
(setq res
|
|
|
|
|
(pcase sexp
|
2018-11-05 01:22:15 +01:00
|
|
|
|
(`(,(or 'let 'let*) ,bindings)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(let ((vars vars))
|
|
|
|
|
(when (eq 'let* (car sexp))
|
|
|
|
|
(dolist (binding (cdr (reverse bindings)))
|
|
|
|
|
(push (or (car-safe binding) binding) vars)))
|
|
|
|
|
(elisp--local-variables-1
|
|
|
|
|
vars (car (cdr-safe (car (last bindings)))))))
|
2018-11-05 01:22:15 +01:00
|
|
|
|
(`(,(or 'let 'let*) ,bindings . ,body)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(let ((vars vars))
|
|
|
|
|
(dolist (binding bindings)
|
|
|
|
|
(push (or (car-safe binding) binding) vars))
|
|
|
|
|
(elisp--local-variables-1 vars (car (last body)))))
|
2014-10-14 21:56:56 -04:00
|
|
|
|
(`(lambda ,_args)
|
|
|
|
|
;; FIXME: Look for the witness inside `args'.
|
|
|
|
|
(setq sexp nil))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(`(lambda ,args . ,body)
|
|
|
|
|
(elisp--local-variables-1
|
2014-10-14 21:56:56 -04:00
|
|
|
|
(append (remq '&optional (remq '&rest args)) vars)
|
|
|
|
|
(car (last body))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(`(condition-case ,_ ,e) (elisp--local-variables-1 vars e))
|
|
|
|
|
(`(condition-case ,v ,_ . ,catches)
|
|
|
|
|
(elisp--local-variables-1
|
|
|
|
|
(cons v vars) (cdr (car (last catches)))))
|
2014-10-14 21:56:56 -04:00
|
|
|
|
(`(quote . ,_)
|
|
|
|
|
;; FIXME: Look for the witness inside sexp.
|
|
|
|
|
(setq sexp nil))
|
|
|
|
|
;; FIXME: Handle `cond'.
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(`(,_ . ,_)
|
|
|
|
|
(elisp--local-variables-1 vars (car (last sexp))))
|
2018-11-05 01:22:15 +01:00
|
|
|
|
('elisp--witness--lisp (or vars '(nil)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(_ nil)))
|
2014-10-14 21:56:56 -04:00
|
|
|
|
;; We didn't find the witness in the last element so we try to
|
|
|
|
|
;; backtrack to the last-but-one.
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(setq sexp (ignore-errors (butlast sexp)))))
|
|
|
|
|
res))
|
|
|
|
|
|
2017-12-04 20:01:40 -05:00
|
|
|
|
(defvar warning-minimum-log-level)
|
|
|
|
|
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(defun elisp--local-variables ()
|
|
|
|
|
"Return a list of locally let-bound variables at point."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-syntax-backward "w_")
|
|
|
|
|
(let* ((ppss (syntax-ppss))
|
|
|
|
|
(txt (buffer-substring-no-properties (or (car (nth 9 ppss)) (point))
|
|
|
|
|
(or (nth 8 ppss) (point))))
|
|
|
|
|
(closer ()))
|
|
|
|
|
(dolist (p (nth 9 ppss))
|
|
|
|
|
(push (cdr (syntax-after p)) closer))
|
|
|
|
|
(setq closer (apply #'string closer))
|
|
|
|
|
(let* ((sexp (condition-case nil
|
|
|
|
|
(car (read-from-string
|
|
|
|
|
(concat txt "elisp--witness--lisp" closer)))
|
2014-12-03 13:42:20 -05:00
|
|
|
|
((invalid-read-syntax end-of-file) nil)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(macroexpand-advice (lambda (expander form &rest args)
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(apply expander form args)
|
|
|
|
|
(error form))))
|
|
|
|
|
(sexp
|
|
|
|
|
(unwind-protect
|
2017-12-04 20:01:40 -05:00
|
|
|
|
(let ((warning-minimum-log-level :emergency))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(advice-add 'macroexpand :around macroexpand-advice)
|
|
|
|
|
(macroexpand-all sexp))
|
|
|
|
|
(advice-remove 'macroexpand macroexpand-advice)))
|
|
|
|
|
(vars (elisp--local-variables-1 nil sexp)))
|
|
|
|
|
(delq nil
|
|
|
|
|
(mapcar (lambda (var)
|
|
|
|
|
(and (symbolp var)
|
|
|
|
|
(not (string-match (symbol-name var) "\\`[&_]"))
|
|
|
|
|
;; Eliminate uninterned vars.
|
|
|
|
|
(intern-soft var)
|
|
|
|
|
var))
|
|
|
|
|
vars))))))
|
|
|
|
|
|
|
|
|
|
(defvar elisp--local-variables-completion-table
|
|
|
|
|
;; Use `defvar' rather than `defconst' since defconst would purecopy this
|
|
|
|
|
;; value, which would doubly fail: it would fail because purecopy can't
|
|
|
|
|
;; handle the recursive bytecode object, and it would fail because it would
|
|
|
|
|
;; move `lastpos' and `lastvars' to pure space where they'd be immutable!
|
|
|
|
|
(let ((lastpos nil) (lastvars nil))
|
|
|
|
|
(letrec ((hookfun (lambda ()
|
|
|
|
|
(setq lastpos nil)
|
|
|
|
|
(remove-hook 'post-command-hook hookfun))))
|
|
|
|
|
(completion-table-dynamic
|
|
|
|
|
(lambda (_string)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-syntax-backward "_w")
|
|
|
|
|
(let ((newpos (cons (point) (current-buffer))))
|
|
|
|
|
(unless (equal lastpos newpos)
|
|
|
|
|
(add-hook 'post-command-hook hookfun)
|
|
|
|
|
(setq lastpos newpos)
|
|
|
|
|
(setq lastvars
|
|
|
|
|
(mapcar #'symbol-name (elisp--local-variables))))))
|
|
|
|
|
lastvars)))))
|
|
|
|
|
|
|
|
|
|
(defun elisp--expect-function-p (pos)
|
|
|
|
|
"Return non-nil if the symbol at point is expected to be a function."
|
|
|
|
|
(or
|
|
|
|
|
(and (eq (char-before pos) ?')
|
|
|
|
|
(eq (char-before (1- pos)) ?#))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((parent (nth 1 (syntax-ppss pos))))
|
|
|
|
|
(when parent
|
|
|
|
|
(goto-char parent)
|
|
|
|
|
(and
|
|
|
|
|
(looking-at (concat "(\\(cl-\\)?"
|
|
|
|
|
(regexp-opt '("declare-function"
|
|
|
|
|
"function" "defadvice"
|
|
|
|
|
"callf" "callf2"
|
|
|
|
|
"defsetf"))
|
|
|
|
|
"[ \t\r\n]+"))
|
|
|
|
|
(eq (match-end 0) pos)))))))
|
|
|
|
|
|
|
|
|
|
(defun elisp--form-quoted-p (pos)
|
|
|
|
|
"Return non-nil if the form at POS is not evaluated.
|
|
|
|
|
It can be quoted, or be inside a quoted form."
|
|
|
|
|
;; FIXME: Do some macro expansion maybe.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((state (syntax-ppss pos)))
|
|
|
|
|
(or (nth 8 state) ; Code inside strings usually isn't evaluated.
|
|
|
|
|
;; FIXME: The 9th element is undocumented.
|
|
|
|
|
(let ((nesting (cons (point) (reverse (nth 9 state))))
|
|
|
|
|
res)
|
|
|
|
|
(while (and nesting (not res))
|
|
|
|
|
(goto-char (pop nesting))
|
|
|
|
|
(cond
|
|
|
|
|
((or (eq (char-after) ?\[)
|
|
|
|
|
(progn
|
|
|
|
|
(skip-chars-backward " ")
|
Support curved quotes in doc strings
Emacs's traditional doc string style has been to quote symbols
`like this'. This worked well on now-obsolete terminals where
` and ' were symmetric quotes, but nowadays curved quotes
‘like this’ look better. Support quoting the new way too.
(Bug#20385)
* doc/lispref/tips.texi (Documentation Tips): Symbols can be quoted
‘like-this’ as well as `like-this'.
* etc/NEWS: Mention this.
* lisp/cedet/mode-local.el (overload-docstring-extension)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class)
(eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode, help-fns--obsolete):
(help-fns--interactive-only, describe-function-1):
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (describe-input-method)
(describe-language-environment):
* lisp/international/mule-diag.el (describe-character-set)
(print-coding-system-briefly, list-input-methods)
(list-input-methods-1):
Insert curved quotes rather than grave accent and apostrophe.
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-proper-noun-region-engine):
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2):
* lisp/finder.el (finder-font-lock-keywords):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/help-fns.el (help-do-arg-highlight)
(describe-function-1, describe-variable):
* lisp/help-mode.el (help-xref-symbol-regexp)
(help-xref-info-regexp, help-xref-url-regexp):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (help-xref-mule-regexp-template):
* lisp/wid-edit.el (widget-documentation-link-regexp):
Parse symbols quoted ‘like-this’ as well as `like-this'.
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
Add "‘" and "’" to electric-pair-text-pairs.
(elisp--form-quoted-p): Also allow "‘" as a quoting char.
(elisp-completion-at-point, elisp--preceding-sexp):
Also treat "‘" and "’" as quoting chars.
2015-05-28 00:06:14 -07:00
|
|
|
|
(memq (char-before) '(?' ?` ?‘))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(setq res t))
|
|
|
|
|
((eq (char-before) ?,)
|
|
|
|
|
(setq nesting nil))))
|
|
|
|
|
res)))))
|
|
|
|
|
|
|
|
|
|
;; FIXME: Support for Company brings in features which straddle eldoc.
|
|
|
|
|
;; We should consolidate this, so that major modes can provide all that
|
|
|
|
|
;; data all at once:
|
|
|
|
|
;; - a function to extract "the reference at point" (may be more complex
|
|
|
|
|
;; than a mere string, to distinguish various namespaces).
|
|
|
|
|
;; - a function to jump to such a reference.
|
|
|
|
|
;; - a function to show the signature/interface of such a reference.
|
|
|
|
|
;; - a function to build a help-buffer about that reference.
|
|
|
|
|
;; FIXME: Those functions should also be used by the normal completion code in
|
|
|
|
|
;; the *Completions* buffer.
|
|
|
|
|
|
|
|
|
|
(defun elisp--company-doc-buffer (str)
|
|
|
|
|
(let ((symbol (intern-soft str)))
|
|
|
|
|
;; FIXME: we really don't want to "display-buffer and then undo it".
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
;; Make sure we don't display it in another frame, otherwise
|
|
|
|
|
;; save-window-excursion won't be able to undo it.
|
|
|
|
|
(let ((display-buffer-overriding-action
|
|
|
|
|
'(nil . ((inhibit-switch-frame . t)))))
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(cond
|
|
|
|
|
((fboundp symbol) (describe-function symbol))
|
|
|
|
|
((boundp symbol) (describe-variable symbol))
|
|
|
|
|
((featurep symbol) (describe-package symbol))
|
|
|
|
|
((facep symbol) (describe-face symbol))
|
|
|
|
|
(t (signal 'user-error nil)))
|
|
|
|
|
(help-buffer))))))
|
|
|
|
|
|
|
|
|
|
(defun elisp--company-doc-string (str)
|
|
|
|
|
(let* ((symbol (intern-soft str))
|
|
|
|
|
(doc (if (fboundp symbol)
|
|
|
|
|
(documentation symbol t)
|
|
|
|
|
(documentation-property symbol 'variable-documentation t))))
|
|
|
|
|
(and (stringp doc)
|
|
|
|
|
(string-match ".*$" doc)
|
|
|
|
|
(match-string 0 doc))))
|
|
|
|
|
|
2015-08-10 21:53:19 -05:00
|
|
|
|
;; can't (require 'find-func) in a preloaded file
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(declare-function find-library-name "find-func" (library))
|
2014-12-27 16:06:37 +02:00
|
|
|
|
(declare-function find-function-library "find-func" (function &optional l-o v))
|
2014-12-25 22:08:19 +02:00
|
|
|
|
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(defun elisp--company-location (str)
|
2014-12-27 16:06:37 +02:00
|
|
|
|
(let ((sym (intern-soft str)))
|
|
|
|
|
(cond
|
|
|
|
|
((fboundp sym) (find-definition-noselect sym nil))
|
|
|
|
|
((boundp sym) (find-definition-noselect sym 'defvar))
|
|
|
|
|
((featurep sym)
|
|
|
|
|
(require 'find-func)
|
|
|
|
|
(cons (find-file-noselect (find-library-name
|
|
|
|
|
(symbol-name sym)))
|
|
|
|
|
0))
|
|
|
|
|
((facep sym) (find-definition-noselect sym 'defface)))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
|
|
|
|
(defun elisp-completion-at-point ()
|
2016-06-25 16:23:04 -04:00
|
|
|
|
"Function used for `completion-at-point-functions' in `emacs-lisp-mode'.
|
|
|
|
|
If the context at point allows only a certain category of
|
|
|
|
|
symbols (e.g. functions, or variables) then the returned
|
|
|
|
|
completions are restricted to that category. In contexts where
|
|
|
|
|
any symbol is possible (following a quote, for example),
|
|
|
|
|
functions are annotated with \"<f>\" via the
|
|
|
|
|
`:annotation-function' property."
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(with-syntax-table emacs-lisp-mode-syntax-table
|
|
|
|
|
(let* ((pos (point))
|
|
|
|
|
(beg (condition-case nil
|
|
|
|
|
(save-excursion
|
|
|
|
|
(backward-sexp 1)
|
2015-06-09 01:08:01 +03:00
|
|
|
|
(skip-chars-forward "`',‘#")
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(point))
|
|
|
|
|
(scan-error pos)))
|
|
|
|
|
(end
|
|
|
|
|
(unless (or (eq beg (point-max))
|
|
|
|
|
(member (char-syntax (char-after beg))
|
|
|
|
|
'(?\s ?\" ?\( ?\))))
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(forward-sexp 1)
|
Support curved quotes in doc strings
Emacs's traditional doc string style has been to quote symbols
`like this'. This worked well on now-obsolete terminals where
` and ' were symmetric quotes, but nowadays curved quotes
‘like this’ look better. Support quoting the new way too.
(Bug#20385)
* doc/lispref/tips.texi (Documentation Tips): Symbols can be quoted
‘like-this’ as well as `like-this'.
* etc/NEWS: Mention this.
* lisp/cedet/mode-local.el (overload-docstring-extension)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class)
(eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode, help-fns--obsolete):
(help-fns--interactive-only, describe-function-1):
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (describe-input-method)
(describe-language-environment):
* lisp/international/mule-diag.el (describe-character-set)
(print-coding-system-briefly, list-input-methods)
(list-input-methods-1):
Insert curved quotes rather than grave accent and apostrophe.
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-proper-noun-region-engine):
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2):
* lisp/finder.el (finder-font-lock-keywords):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/help-fns.el (help-do-arg-highlight)
(describe-function-1, describe-variable):
* lisp/help-mode.el (help-xref-symbol-regexp)
(help-xref-info-regexp, help-xref-url-regexp):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (help-xref-mule-regexp-template):
* lisp/wid-edit.el (widget-documentation-link-regexp):
Parse symbols quoted ‘like-this’ as well as `like-this'.
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
Add "‘" and "’" to electric-pair-text-pairs.
(elisp--form-quoted-p): Also allow "‘" as a quoting char.
(elisp-completion-at-point, elisp--preceding-sexp):
Also treat "‘" and "’" as quoting chars.
2015-05-28 00:06:14 -07:00
|
|
|
|
(skip-chars-backward "'’")
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(when (>= (point) pos)
|
|
|
|
|
(point)))
|
|
|
|
|
(scan-error pos))))
|
|
|
|
|
;; t if in function position.
|
2015-05-03 23:57:38 +03:00
|
|
|
|
(funpos (eq (char-before beg) ?\())
|
|
|
|
|
(quoted (elisp--form-quoted-p beg)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(when (and end (or (not (nth 8 (syntax-ppss)))
|
Support curved quotes in doc strings
Emacs's traditional doc string style has been to quote symbols
`like this'. This worked well on now-obsolete terminals where
` and ' were symmetric quotes, but nowadays curved quotes
‘like this’ look better. Support quoting the new way too.
(Bug#20385)
* doc/lispref/tips.texi (Documentation Tips): Symbols can be quoted
‘like-this’ as well as `like-this'.
* etc/NEWS: Mention this.
* lisp/cedet/mode-local.el (overload-docstring-extension)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class)
(eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode, help-fns--obsolete):
(help-fns--interactive-only, describe-function-1):
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (describe-input-method)
(describe-language-environment):
* lisp/international/mule-diag.el (describe-character-set)
(print-coding-system-briefly, list-input-methods)
(list-input-methods-1):
Insert curved quotes rather than grave accent and apostrophe.
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-proper-noun-region-engine):
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2):
* lisp/finder.el (finder-font-lock-keywords):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/help-fns.el (help-do-arg-highlight)
(describe-function-1, describe-variable):
* lisp/help-mode.el (help-xref-symbol-regexp)
(help-xref-info-regexp, help-xref-url-regexp):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (help-xref-mule-regexp-template):
* lisp/wid-edit.el (widget-documentation-link-regexp):
Parse symbols quoted ‘like-this’ as well as `like-this'.
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
Add "‘" and "’" to electric-pair-text-pairs.
(elisp--form-quoted-p): Also allow "‘" as a quoting char.
(elisp-completion-at-point, elisp--preceding-sexp):
Also treat "‘" and "’" as quoting chars.
2015-05-28 00:06:14 -07:00
|
|
|
|
(memq (char-before beg) '(?` ?‘))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(let ((table-etc
|
2015-05-03 23:57:38 +03:00
|
|
|
|
(if (or (not funpos) quoted)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; FIXME: We could look at the first element of the list and
|
|
|
|
|
;; use it to provide a more specific completion table in some
|
|
|
|
|
;; cases. E.g. filter out keywords that are not understood by
|
|
|
|
|
;; the macro/function being called.
|
|
|
|
|
(cond
|
|
|
|
|
((elisp--expect-function-p beg)
|
|
|
|
|
(list nil obarray
|
|
|
|
|
:predicate #'fboundp
|
|
|
|
|
:company-doc-buffer #'elisp--company-doc-buffer
|
|
|
|
|
:company-docsig #'elisp--company-doc-string
|
|
|
|
|
:company-location #'elisp--company-location))
|
2015-05-03 23:57:38 +03:00
|
|
|
|
(quoted
|
2014-12-27 16:06:37 +02:00
|
|
|
|
(list nil obarray
|
|
|
|
|
;; Don't include all symbols (bug#16646).
|
|
|
|
|
:predicate (lambda (sym)
|
|
|
|
|
(or (boundp sym)
|
|
|
|
|
(fboundp sym)
|
|
|
|
|
(featurep sym)
|
|
|
|
|
(symbol-plist sym)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
:annotation-function
|
|
|
|
|
(lambda (str) (if (fboundp (intern-soft str)) " <f>"))
|
|
|
|
|
:company-doc-buffer #'elisp--company-doc-buffer
|
|
|
|
|
:company-docsig #'elisp--company-doc-string
|
|
|
|
|
:company-location #'elisp--company-location))
|
|
|
|
|
(t
|
|
|
|
|
(list nil (completion-table-merge
|
|
|
|
|
elisp--local-variables-completion-table
|
|
|
|
|
(apply-partially #'completion-table-with-predicate
|
|
|
|
|
obarray
|
|
|
|
|
#'boundp
|
|
|
|
|
'strict))
|
|
|
|
|
:company-doc-buffer #'elisp--company-doc-buffer
|
|
|
|
|
:company-docsig #'elisp--company-doc-string
|
|
|
|
|
:company-location #'elisp--company-location)))
|
|
|
|
|
;; Looks like a funcall position. Let's double check.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (1- beg))
|
|
|
|
|
(let ((parent
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(progn (up-list -1) (forward-char 1)
|
|
|
|
|
(let ((c (char-after)))
|
|
|
|
|
(if (eq c ?\() ?\(
|
|
|
|
|
(if (memq (char-syntax c) '(?w ?_))
|
|
|
|
|
(read (current-buffer))))))
|
|
|
|
|
(error nil))))
|
|
|
|
|
(pcase parent
|
|
|
|
|
;; FIXME: Rather than hardcode special cases here,
|
|
|
|
|
;; we should use something like a symbol-property.
|
2018-11-05 01:22:15 +01:00
|
|
|
|
('declare
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(list t (mapcar (lambda (x) (symbol-name (car x)))
|
|
|
|
|
(delete-dups
|
|
|
|
|
;; FIXME: We should include some
|
|
|
|
|
;; docstring with each entry.
|
2016-07-23 10:12:56 -04:00
|
|
|
|
(append macro-declarations-alist
|
|
|
|
|
defun-declarations-alist
|
|
|
|
|
nil))))) ; Copy both alists.
|
2018-11-05 01:22:15 +01:00
|
|
|
|
((and (or 'condition-case 'condition-case-unless-debug)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(guard (save-excursion
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(forward-sexp 2)
|
|
|
|
|
(< (point) beg)))))
|
|
|
|
|
(list t obarray
|
|
|
|
|
:predicate (lambda (sym) (get sym 'error-conditions))))
|
2018-11-05 01:22:15 +01:00
|
|
|
|
((and (or ?\( 'let 'let*)
|
2015-05-05 04:54:01 +03:00
|
|
|
|
(guard (save-excursion
|
|
|
|
|
(goto-char (1- beg))
|
|
|
|
|
(when (eq parent ?\()
|
|
|
|
|
(up-list -1))
|
|
|
|
|
(forward-symbol -1)
|
|
|
|
|
(looking-at "\\_<let\\*?\\_>"))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(list t obarray
|
|
|
|
|
:predicate #'boundp
|
|
|
|
|
:company-doc-buffer #'elisp--company-doc-buffer
|
|
|
|
|
:company-docsig #'elisp--company-doc-string
|
|
|
|
|
:company-location #'elisp--company-location))
|
|
|
|
|
(_ (list nil obarray
|
|
|
|
|
:predicate #'fboundp
|
|
|
|
|
:company-doc-buffer #'elisp--company-doc-buffer
|
|
|
|
|
:company-docsig #'elisp--company-doc-string
|
|
|
|
|
:company-location #'elisp--company-location
|
|
|
|
|
))))))))
|
|
|
|
|
(nconc (list beg end)
|
|
|
|
|
(if (null (car table-etc))
|
|
|
|
|
(cdr table-etc)
|
|
|
|
|
(cons
|
|
|
|
|
(if (memq (char-syntax (or (char-after end) ?\s))
|
|
|
|
|
'(?\s ?>))
|
|
|
|
|
(cadr table-etc)
|
|
|
|
|
(apply-partially 'completion-table-with-terminator
|
|
|
|
|
" " (cadr table-etc)))
|
|
|
|
|
(cddr table-etc)))))))))
|
|
|
|
|
|
2016-03-14 04:14:05 +02:00
|
|
|
|
(defun lisp-completion-at-point (&optional _predicate)
|
2015-11-30 05:27:34 +02:00
|
|
|
|
(declare (obsolete elisp-completion-at-point "25.1"))
|
|
|
|
|
(elisp-completion-at-point))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
2014-12-25 22:08:19 +02:00
|
|
|
|
;;; Xref backend
|
|
|
|
|
|
|
|
|
|
(declare-function xref-make-bogus-location "xref" (message))
|
2015-07-20 03:12:32 +03:00
|
|
|
|
(declare-function xref-make "xref" (summary location))
|
2015-06-06 12:12:06 -07:00
|
|
|
|
(declare-function xref-collect-references "xref" (symbol dir))
|
2014-12-25 22:08:19 +02:00
|
|
|
|
|
2015-11-14 02:37:01 +02:00
|
|
|
|
(defun elisp--xref-backend () 'elisp)
|
2014-12-25 22:08:19 +02:00
|
|
|
|
|
2015-08-16 23:52:30 -07:00
|
|
|
|
;; WORKAROUND: This is nominally a constant, but the text properties
|
2015-08-14 13:34:18 +03:00
|
|
|
|
;; are not preserved thru dump if use defconst. See bug#21237.
|
2015-08-13 12:54:39 -05:00
|
|
|
|
(defvar elisp--xref-format
|
2015-05-05 15:28:41 +03:00
|
|
|
|
(let ((str "(%s %s)"))
|
|
|
|
|
(put-text-property 1 3 'face 'font-lock-keyword-face str)
|
|
|
|
|
(put-text-property 4 6 'face 'font-lock-function-name-face str)
|
|
|
|
|
str))
|
|
|
|
|
|
2015-08-16 23:52:30 -07:00
|
|
|
|
;; WORKAROUND: This is nominally a constant, but the text properties
|
2015-08-14 13:34:18 +03:00
|
|
|
|
;; are not preserved thru dump if use defconst. See bug#21237.
|
2015-08-13 12:54:39 -05:00
|
|
|
|
(defvar elisp--xref-format-extra
|
2015-08-10 21:53:19 -05:00
|
|
|
|
(let ((str "(%s %s %s)"))
|
|
|
|
|
(put-text-property 1 3 'face 'font-lock-keyword-face str)
|
|
|
|
|
(put-text-property 4 6 'face 'font-lock-function-name-face str)
|
|
|
|
|
str))
|
|
|
|
|
|
2015-08-26 16:43:29 -05:00
|
|
|
|
(defvar find-feature-regexp);; in find-func.el
|
2015-08-10 21:53:19 -05:00
|
|
|
|
|
|
|
|
|
(defun elisp--xref-make-xref (type symbol file &optional summary)
|
|
|
|
|
"Return an xref for TYPE SYMBOL in FILE.
|
2015-08-20 17:33:48 -07:00
|
|
|
|
TYPE must be a type in `find-function-regexp-alist' (use nil for
|
2015-08-10 21:53:19 -05:00
|
|
|
|
'defun). If SUMMARY is non-nil, use it for the summary;
|
|
|
|
|
otherwise build the summary from TYPE and SYMBOL."
|
|
|
|
|
(xref-make (or summary
|
|
|
|
|
(format elisp--xref-format (or type 'defun) symbol))
|
|
|
|
|
(xref-make-elisp-location symbol type file)))
|
|
|
|
|
|
2015-08-26 16:43:29 -05:00
|
|
|
|
(defvar elisp-xref-find-def-functions nil
|
2015-09-10 10:10:54 -07:00
|
|
|
|
"List of functions to be run from `elisp--xref-find-definitions' to add additional xrefs.
|
2015-08-26 16:43:29 -05:00
|
|
|
|
Called with one arg; the symbol whose definition is desired.
|
|
|
|
|
Each function should return a list of xrefs, or nil; the first
|
|
|
|
|
non-nil result supercedes the xrefs produced by
|
2015-09-10 10:10:54 -07:00
|
|
|
|
`elisp--xref-find-definitions'.")
|
2015-08-26 16:43:29 -05:00
|
|
|
|
|
2015-11-14 02:37:01 +02:00
|
|
|
|
(cl-defmethod xref-backend-definitions ((_backend (eql elisp)) identifier)
|
|
|
|
|
(require 'find-func)
|
|
|
|
|
;; FIXME: use information in source near point to filter results:
|
|
|
|
|
;; (dvc-log-edit ...) - exclude 'feature
|
|
|
|
|
;; (require 'dvc-log-edit) - only 'feature
|
|
|
|
|
;; Semantic may provide additional information
|
|
|
|
|
;;
|
|
|
|
|
(let ((sym (intern-soft identifier)))
|
|
|
|
|
(when sym
|
|
|
|
|
(elisp--xref-find-definitions sym))))
|
|
|
|
|
|
2014-12-25 22:08:19 +02:00
|
|
|
|
(defun elisp--xref-find-definitions (symbol)
|
2015-08-10 21:53:19 -05:00
|
|
|
|
;; The file name is not known when `symbol' is defined via interactive eval.
|
2015-09-09 15:14:52 -04:00
|
|
|
|
(let (xrefs)
|
2015-08-26 16:43:29 -05:00
|
|
|
|
|
|
|
|
|
(let ((temp elisp-xref-find-def-functions))
|
|
|
|
|
(while (and (null xrefs)
|
|
|
|
|
temp)
|
|
|
|
|
(setq xrefs (append xrefs (funcall (pop temp) symbol)))))
|
|
|
|
|
|
|
|
|
|
(unless xrefs
|
|
|
|
|
;; alphabetical by result type symbol
|
|
|
|
|
|
|
|
|
|
;; FIXME: advised function; list of advice functions
|
2015-11-14 16:44:58 -06:00
|
|
|
|
;; FIXME: aliased variable
|
2015-08-26 16:43:29 -05:00
|
|
|
|
|
2015-09-01 05:12:24 -05:00
|
|
|
|
;; Coding system symbols do not appear in ‘load-history’,
|
|
|
|
|
;; so we can’t get a location for them.
|
2015-08-26 16:43:29 -05:00
|
|
|
|
|
|
|
|
|
(when (and (symbolp symbol)
|
|
|
|
|
(symbol-function symbol)
|
|
|
|
|
(symbolp (symbol-function symbol)))
|
|
|
|
|
;; aliased function
|
|
|
|
|
(let* ((alias-symbol symbol)
|
|
|
|
|
(alias-file (symbol-file alias-symbol))
|
|
|
|
|
(real-symbol (symbol-function symbol))
|
|
|
|
|
(real-file (find-lisp-object-file-name real-symbol 'defun)))
|
|
|
|
|
|
|
|
|
|
(when real-file
|
|
|
|
|
(push (elisp--xref-make-xref nil real-symbol real-file) xrefs))
|
|
|
|
|
|
|
|
|
|
(when alias-file
|
|
|
|
|
(push (elisp--xref-make-xref 'defalias alias-symbol alias-file) xrefs))))
|
|
|
|
|
|
|
|
|
|
(when (facep symbol)
|
|
|
|
|
(let ((file (find-lisp-object-file-name symbol 'defface)))
|
|
|
|
|
(when file
|
|
|
|
|
(push (elisp--xref-make-xref 'defface symbol file) xrefs))))
|
|
|
|
|
|
|
|
|
|
(when (fboundp symbol)
|
|
|
|
|
(let ((file (find-lisp-object-file-name symbol (symbol-function symbol)))
|
|
|
|
|
generic doc)
|
|
|
|
|
(when file
|
|
|
|
|
(cond
|
|
|
|
|
((eq file 'C-source)
|
|
|
|
|
;; First call to find-lisp-object-file-name for an object
|
|
|
|
|
;; defined in C; the doc strings from the C source have
|
|
|
|
|
;; not been loaded yet. Second call will return "src/*.c"
|
|
|
|
|
;; in file; handled by 't' case below.
|
|
|
|
|
(push (elisp--xref-make-xref nil symbol (help-C-file-name (symbol-function symbol) 'subr)) xrefs))
|
|
|
|
|
|
|
|
|
|
((and (setq doc (documentation symbol t))
|
|
|
|
|
;; This doc string is defined in cl-macs.el cl-defstruct
|
|
|
|
|
(string-match "Constructor for objects of type `\\(.*\\)'" doc))
|
|
|
|
|
;; `symbol' is a name for the default constructor created by
|
|
|
|
|
;; cl-defstruct, so return the location of the cl-defstruct.
|
|
|
|
|
(let* ((type-name (match-string 1 doc))
|
|
|
|
|
(type-symbol (intern type-name))
|
|
|
|
|
(file (find-lisp-object-file-name type-symbol 'define-type))
|
|
|
|
|
(summary (format elisp--xref-format-extra
|
|
|
|
|
'cl-defstruct
|
|
|
|
|
(concat "(" type-name)
|
|
|
|
|
(concat "(:constructor " (symbol-name symbol) "))"))))
|
|
|
|
|
(push (elisp--xref-make-xref 'define-type type-symbol file summary) xrefs)
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
((setq generic (cl--generic symbol))
|
|
|
|
|
;; FIXME: move this to elisp-xref-find-def-functions, in cl-generic.el
|
|
|
|
|
|
|
|
|
|
;; A generic function. If there is a default method, it
|
|
|
|
|
;; will appear in the method table, with no
|
|
|
|
|
;; specializers.
|
|
|
|
|
;;
|
|
|
|
|
;; If the default method is declared by the cl-defgeneric
|
|
|
|
|
;; declaration, it will have the same location as the
|
|
|
|
|
;; cl-defgeneric, so we want to exclude it from the
|
|
|
|
|
;; result. In this case, it will have a null doc
|
|
|
|
|
;; string. User declarations of default methods may also
|
|
|
|
|
;; have null doc strings, but we hope that is
|
|
|
|
|
;; rare. Perhaps this heuristic will discourage that.
|
|
|
|
|
(dolist (method (cl--generic-method-table generic))
|
|
|
|
|
(let* ((info (cl--generic-method-info method));; qual-string combined-args doconly
|
|
|
|
|
(specializers (cl--generic-method-specializers method))
|
2015-09-15 14:40:49 -05:00
|
|
|
|
(non-default nil)
|
2016-08-02 13:01:26 -04:00
|
|
|
|
(met-name (cl--generic-load-hist-format
|
|
|
|
|
symbol
|
|
|
|
|
(cl--generic-method-qualifiers method)
|
|
|
|
|
specializers))
|
2015-08-26 16:43:29 -05:00
|
|
|
|
(file (find-lisp-object-file-name met-name 'cl-defmethod)))
|
2015-09-15 14:40:49 -05:00
|
|
|
|
(dolist (item specializers)
|
|
|
|
|
;; default method has all 't' in specializers
|
|
|
|
|
(setq non-default (or non-default (not (equal t item)))))
|
|
|
|
|
|
2015-08-26 16:43:29 -05:00
|
|
|
|
(when (and file
|
2015-09-15 14:40:49 -05:00
|
|
|
|
(or non-default
|
2015-08-26 16:43:29 -05:00
|
|
|
|
(nth 2 info))) ;; assuming only co-located default has null doc string
|
|
|
|
|
(if specializers
|
|
|
|
|
(let ((summary (format elisp--xref-format-extra 'cl-defmethod symbol (nth 1 info))))
|
|
|
|
|
(push (elisp--xref-make-xref 'cl-defmethod met-name file summary) xrefs))
|
|
|
|
|
|
|
|
|
|
(let ((summary (format elisp--xref-format-extra 'cl-defmethod symbol "()")))
|
|
|
|
|
(push (elisp--xref-make-xref 'cl-defmethod met-name file summary) xrefs))))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(if (and (setq doc (documentation symbol t))
|
|
|
|
|
;; This doc string is created somewhere in
|
|
|
|
|
;; cl--generic-make-function for an implicit
|
|
|
|
|
;; defgeneric.
|
|
|
|
|
(string-match "\n\n(fn ARG &rest ARGS)" doc))
|
|
|
|
|
;; This symbol is an implicitly defined defgeneric, so
|
|
|
|
|
;; don't return it.
|
|
|
|
|
nil
|
|
|
|
|
(push (elisp--xref-make-xref 'cl-defgeneric symbol file) xrefs))
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
(t
|
|
|
|
|
(push (elisp--xref-make-xref nil symbol file) xrefs))
|
|
|
|
|
))))
|
|
|
|
|
|
|
|
|
|
(when (boundp symbol)
|
|
|
|
|
;; A variable
|
|
|
|
|
(let ((file (find-lisp-object-file-name symbol 'defvar)))
|
|
|
|
|
(when file
|
|
|
|
|
(cond
|
|
|
|
|
((eq file 'C-source)
|
|
|
|
|
;; The doc strings from the C source have not been loaded
|
|
|
|
|
;; yet; help-C-file-name does that. Second call will
|
|
|
|
|
;; return "src/*.c" in file; handled below.
|
|
|
|
|
(push (elisp--xref-make-xref 'defvar symbol (help-C-file-name symbol 'var)) xrefs))
|
|
|
|
|
|
|
|
|
|
((string= "src/" (substring file 0 4))
|
|
|
|
|
;; The variable is defined in a C source file; don't check
|
|
|
|
|
;; for define-minor-mode.
|
|
|
|
|
(push (elisp--xref-make-xref 'defvar symbol file) xrefs))
|
|
|
|
|
|
|
|
|
|
((memq symbol minor-mode-list)
|
|
|
|
|
;; The symbol is a minor mode. These should be defined by
|
|
|
|
|
;; "define-minor-mode", which means the variable and the
|
|
|
|
|
;; function are declared in the same place. So we return only
|
|
|
|
|
;; the function, arbitrarily.
|
|
|
|
|
;;
|
|
|
|
|
;; There is an exception, when the variable is defined in C
|
|
|
|
|
;; code, as for abbrev-mode.
|
|
|
|
|
;;
|
|
|
|
|
;; IMPROVEME: If the user is searching for the identifier at
|
|
|
|
|
;; point, we can determine whether it is a variable or
|
|
|
|
|
;; function by looking at the source code near point.
|
|
|
|
|
;;
|
|
|
|
|
;; IMPROVEME: The user may actually be asking "do any
|
|
|
|
|
;; variables by this name exist"; we need a way to specify
|
|
|
|
|
;; that.
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
(t
|
|
|
|
|
(push (elisp--xref-make-xref 'defvar symbol file) xrefs))
|
|
|
|
|
|
|
|
|
|
))))
|
|
|
|
|
|
|
|
|
|
(when (featurep symbol)
|
|
|
|
|
(let ((file (ignore-errors
|
|
|
|
|
(find-library-name (symbol-name symbol)))))
|
|
|
|
|
(when file
|
|
|
|
|
(push (elisp--xref-make-xref 'feature symbol file) xrefs))))
|
|
|
|
|
);; 'unless xrefs'
|
2015-08-10 21:53:19 -05:00
|
|
|
|
|
|
|
|
|
xrefs))
|
2014-12-26 18:34:47 +02:00
|
|
|
|
|
2015-12-28 06:17:19 +02:00
|
|
|
|
(declare-function project-external-roots "project")
|
2015-05-01 21:54:33 +03:00
|
|
|
|
|
2015-11-14 02:37:01 +02:00
|
|
|
|
(cl-defmethod xref-backend-apropos ((_backend (eql elisp)) regexp)
|
2014-12-26 18:34:47 +02:00
|
|
|
|
(apply #'nconc
|
|
|
|
|
(let (lst)
|
|
|
|
|
(dolist (sym (apropos-internal regexp))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(push (elisp--xref-find-definitions sym) lst))
|
2014-12-26 18:34:47 +02:00
|
|
|
|
(nreverse lst))))
|
2014-12-25 22:08:19 +02:00
|
|
|
|
|
2014-12-27 16:06:37 +02:00
|
|
|
|
(defvar elisp--xref-identifier-completion-table
|
|
|
|
|
(apply-partially #'completion-table-with-predicate
|
|
|
|
|
obarray
|
|
|
|
|
(lambda (sym)
|
|
|
|
|
(or (boundp sym)
|
|
|
|
|
(fboundp sym)
|
|
|
|
|
(featurep sym)
|
|
|
|
|
(facep sym)))
|
|
|
|
|
'strict))
|
|
|
|
|
|
2015-11-14 02:37:01 +02:00
|
|
|
|
(cl-defmethod xref-backend-identifier-completion-table ((_backend (eql elisp)))
|
2014-12-27 16:06:37 +02:00
|
|
|
|
elisp--xref-identifier-completion-table)
|
2014-12-25 22:08:19 +02:00
|
|
|
|
|
2015-06-01 22:45:15 +03:00
|
|
|
|
(cl-defstruct (xref-elisp-location
|
|
|
|
|
(:constructor xref-make-elisp-location (symbol type file)))
|
|
|
|
|
"Location of an Emacs Lisp symbol definition."
|
|
|
|
|
symbol type file)
|
|
|
|
|
|
|
|
|
|
(cl-defmethod xref-location-marker ((l xref-elisp-location))
|
|
|
|
|
(pcase-let (((cl-struct xref-elisp-location symbol type file) l))
|
2015-08-10 21:53:19 -05:00
|
|
|
|
(let ((buffer-point (find-function-search-for-symbol symbol type file)))
|
2015-06-01 22:45:15 +03:00
|
|
|
|
(with-current-buffer (car buffer-point)
|
2016-05-05 04:28:14 +03:00
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (or (cdr buffer-point) (point-min)))
|
|
|
|
|
(point-marker))))))
|
2015-06-01 22:45:15 +03:00
|
|
|
|
|
2015-06-16 16:22:50 -05:00
|
|
|
|
(cl-defmethod xref-location-group ((l xref-elisp-location))
|
|
|
|
|
(xref-elisp-location-file l))
|
|
|
|
|
|
2015-12-28 06:17:19 +02:00
|
|
|
|
(defun elisp-load-path-roots ()
|
2015-11-24 00:11:51 +02:00
|
|
|
|
(if (boundp 'package-user-dir)
|
|
|
|
|
(cons package-user-dir load-path)
|
|
|
|
|
load-path))
|
2015-07-10 04:34:41 +03:00
|
|
|
|
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;;; Elisp Interaction mode
|
|
|
|
|
|
|
|
|
|
(defvar lisp-interaction-mode-map
|
|
|
|
|
(let ((map (make-sparse-keymap))
|
|
|
|
|
(menu-map (make-sparse-keymap "Lisp-Interaction")))
|
|
|
|
|
(set-keymap-parent map lisp-mode-shared-map)
|
|
|
|
|
(define-key map "\e\C-x" 'eval-defun)
|
|
|
|
|
(define-key map "\e\C-q" 'indent-pp-sexp)
|
|
|
|
|
(define-key map "\e\t" 'completion-at-point)
|
|
|
|
|
(define-key map "\n" 'eval-print-last-sexp)
|
|
|
|
|
(bindings--define-key map [menu-bar lisp-interaction]
|
|
|
|
|
(cons "Lisp-Interaction" menu-map))
|
|
|
|
|
(bindings--define-key menu-map [eval-defun]
|
|
|
|
|
'(menu-item "Evaluate Defun" eval-defun
|
|
|
|
|
:help "Evaluate the top-level form containing point, or after point"))
|
|
|
|
|
(bindings--define-key menu-map [eval-print-last-sexp]
|
|
|
|
|
'(menu-item "Evaluate and Print" eval-print-last-sexp
|
|
|
|
|
:help "Evaluate sexp before point; print value into current buffer"))
|
|
|
|
|
(bindings--define-key menu-map [edebug-defun-lisp-interaction]
|
|
|
|
|
'(menu-item "Instrument Function for Debugging" edebug-defun
|
|
|
|
|
:help "Evaluate the top level form point is in, stepping through with Edebug"
|
|
|
|
|
:keys "C-u C-M-x"))
|
|
|
|
|
(bindings--define-key menu-map [indent-pp-sexp]
|
|
|
|
|
'(menu-item "Indent or Pretty-Print" indent-pp-sexp
|
|
|
|
|
:help "Indent each line of the list starting just after point, or prettyprint it"))
|
|
|
|
|
(bindings--define-key menu-map [complete-symbol]
|
|
|
|
|
'(menu-item "Complete Lisp Symbol" completion-at-point
|
|
|
|
|
:help "Perform completion on Lisp symbol preceding point"))
|
|
|
|
|
map)
|
|
|
|
|
"Keymap for Lisp Interaction mode.
|
|
|
|
|
All commands in `lisp-mode-shared-map' are inherited by this map.")
|
|
|
|
|
|
|
|
|
|
(define-derived-mode lisp-interaction-mode emacs-lisp-mode "Lisp Interaction"
|
|
|
|
|
"Major mode for typing and evaluating Lisp forms.
|
|
|
|
|
Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression
|
|
|
|
|
before point, and prints its value into the buffer, advancing point.
|
|
|
|
|
Note that printing is controlled by `eval-expression-print-length'
|
|
|
|
|
and `eval-expression-print-level'.
|
|
|
|
|
|
|
|
|
|
Commands:
|
|
|
|
|
Delete converts tabs to spaces as it moves back.
|
|
|
|
|
Paragraphs are separated only by blank lines.
|
|
|
|
|
Semicolons start comments.
|
|
|
|
|
|
|
|
|
|
\\{lisp-interaction-mode-map}"
|
|
|
|
|
:abbrev-table nil)
|
|
|
|
|
|
|
|
|
|
;;; Emacs Lisp Byte-Code mode
|
|
|
|
|
|
|
|
|
|
(eval-and-compile
|
2017-11-27 17:55:53 -05:00
|
|
|
|
(defconst emacs-lisp-byte-code-comment-re
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(concat "\\(#\\)@\\([0-9]+\\) "
|
|
|
|
|
;; Make sure it's a docstring and not a lazy-loaded byte-code.
|
2017-11-27 17:55:53 -05:00
|
|
|
|
"\\(?:[^(]\\|([^\"]\\)")
|
|
|
|
|
"Regular expression matching a dynamic doc string comment."))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
|
|
|
|
(defun elisp--byte-code-comment (end &optional _point)
|
|
|
|
|
"Try to syntactically mark the #@NNN ....^_ docstrings in byte-code files."
|
|
|
|
|
(let ((ppss (syntax-ppss)))
|
|
|
|
|
(when (and (nth 4 ppss)
|
|
|
|
|
(eq (char-after (nth 8 ppss)) ?#))
|
|
|
|
|
(let* ((n (save-excursion
|
|
|
|
|
(goto-char (nth 8 ppss))
|
2017-11-27 17:55:53 -05:00
|
|
|
|
(when (looking-at emacs-lisp-byte-code-comment-re)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(string-to-number (match-string 2)))))
|
|
|
|
|
;; `maxdiff' tries to make sure the loop below terminates.
|
|
|
|
|
(maxdiff n))
|
|
|
|
|
(when n
|
|
|
|
|
(let* ((bchar (match-end 2))
|
|
|
|
|
(b (position-bytes bchar)))
|
|
|
|
|
(goto-char (+ b n))
|
|
|
|
|
(while (let ((diff (- (position-bytes (point)) b n)))
|
|
|
|
|
(unless (zerop diff)
|
|
|
|
|
(when (> diff maxdiff) (setq diff maxdiff))
|
|
|
|
|
(forward-char (- diff))
|
|
|
|
|
(setq maxdiff (if (> diff 0) diff
|
|
|
|
|
(max (1- maxdiff) 1)))
|
|
|
|
|
t))))
|
|
|
|
|
(if (<= (point) end)
|
|
|
|
|
(put-text-property (1- (point)) (point)
|
|
|
|
|
'syntax-table
|
|
|
|
|
(string-to-syntax "> b"))
|
|
|
|
|
(goto-char end)))))))
|
|
|
|
|
|
|
|
|
|
(defun elisp-byte-code-syntax-propertize (start end)
|
2015-09-09 15:14:52 -04:00
|
|
|
|
(goto-char start)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(elisp--byte-code-comment end (point))
|
|
|
|
|
(funcall
|
|
|
|
|
(syntax-propertize-rules
|
2017-11-27 17:55:53 -05:00
|
|
|
|
(emacs-lisp-byte-code-comment-re
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(1 (prog1 "< b" (elisp--byte-code-comment end (point))))))
|
|
|
|
|
start end))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(add-to-list 'auto-mode-alist '("\\.elc\\'" . elisp-byte-code-mode))
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(define-derived-mode elisp-byte-code-mode emacs-lisp-mode
|
|
|
|
|
"Elisp-Byte-Code"
|
|
|
|
|
"Major mode for *.elc files."
|
|
|
|
|
;; TODO: Add way to disassemble byte-code under point.
|
|
|
|
|
(setq-local open-paren-in-column-0-is-defun-start nil)
|
|
|
|
|
(setq-local syntax-propertize-function
|
|
|
|
|
#'elisp-byte-code-syntax-propertize))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Globally accessible functionality
|
|
|
|
|
|
|
|
|
|
(defun eval-print-last-sexp (&optional eval-last-sexp-arg-internal)
|
|
|
|
|
"Evaluate sexp before point; print value into current buffer.
|
|
|
|
|
|
|
|
|
|
Normally, this function truncates long output according to the value
|
|
|
|
|
of the variables `eval-expression-print-length' and
|
|
|
|
|
`eval-expression-print-level'. With a prefix argument of zero,
|
|
|
|
|
however, there is no such truncation. Such a prefix argument
|
|
|
|
|
also causes integers to be printed in several additional formats
|
|
|
|
|
\(octal, hexadecimal, and character).
|
|
|
|
|
|
|
|
|
|
If `eval-expression-debug-on-error' is non-nil, which is the default,
|
|
|
|
|
this command arranges for all errors to enter the debugger."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(let ((standard-output (current-buffer)))
|
|
|
|
|
(terpri)
|
|
|
|
|
(eval-last-sexp (or eval-last-sexp-arg-internal t))
|
|
|
|
|
(terpri)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun last-sexp-setup-props (beg end value alt1 alt2)
|
|
|
|
|
"Set up text properties for the output of `elisp--eval-last-sexp'.
|
|
|
|
|
BEG and END are the start and end of the output in current-buffer.
|
|
|
|
|
VALUE is the Lisp value printed, ALT1 and ALT2 are strings for the
|
|
|
|
|
alternative printed representations that can be displayed."
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map "\C-m" 'elisp-last-sexp-toggle-display)
|
|
|
|
|
(define-key map [down-mouse-2] 'mouse-set-point)
|
|
|
|
|
(define-key map [mouse-2] 'elisp-last-sexp-toggle-display)
|
|
|
|
|
(add-text-properties
|
|
|
|
|
beg end
|
|
|
|
|
`(printed-value (,value ,alt1 ,alt2)
|
|
|
|
|
mouse-face highlight
|
|
|
|
|
keymap ,map
|
|
|
|
|
help-echo "RET, mouse-2: toggle abbreviated display"
|
|
|
|
|
rear-nonsticky (mouse-face keymap help-echo
|
|
|
|
|
printed-value)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun elisp-last-sexp-toggle-display (&optional _arg)
|
|
|
|
|
"Toggle between abbreviated and unabbreviated printed representations."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(let ((value (get-text-property (point) 'printed-value)))
|
|
|
|
|
(when value
|
|
|
|
|
(let ((beg (or (previous-single-property-change (min (point-max) (1+ (point)))
|
|
|
|
|
'printed-value)
|
|
|
|
|
(point)))
|
|
|
|
|
(end (or (next-single-char-property-change (point) 'printed-value) (point)))
|
|
|
|
|
(standard-output (current-buffer))
|
|
|
|
|
(point (point)))
|
|
|
|
|
(delete-region beg end)
|
|
|
|
|
(insert (nth 1 value))
|
|
|
|
|
(or (= beg point)
|
|
|
|
|
(setq point (1- (point))))
|
|
|
|
|
(last-sexp-setup-props beg (point)
|
|
|
|
|
(nth 0 value)
|
|
|
|
|
(nth 2 value)
|
|
|
|
|
(nth 1 value))
|
|
|
|
|
(goto-char (min (point-max) point)))))))
|
|
|
|
|
|
|
|
|
|
(defun prin1-char (char) ;FIXME: Move it, e.g. to simple.el.
|
|
|
|
|
"Return a string representing CHAR as a character rather than as an integer.
|
|
|
|
|
If CHAR is not a character, return nil."
|
|
|
|
|
(and (integerp char)
|
|
|
|
|
(eventp char)
|
|
|
|
|
(let ((c (event-basic-type char))
|
|
|
|
|
(mods (event-modifiers char))
|
|
|
|
|
string)
|
|
|
|
|
;; Prevent ?A from turning into ?\S-a.
|
|
|
|
|
(if (and (memq 'shift mods)
|
|
|
|
|
(zerop (logand char ?\S-\^@))
|
|
|
|
|
(not (let ((case-fold-search nil))
|
|
|
|
|
(char-equal c (upcase c)))))
|
|
|
|
|
(setq c (upcase c) mods nil))
|
|
|
|
|
;; What string are we considering using?
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(setq string
|
|
|
|
|
(concat
|
|
|
|
|
"?"
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (modif)
|
|
|
|
|
(cond ((eq modif 'super) "\\s-")
|
|
|
|
|
(t (string ?\\ (upcase (aref (symbol-name modif) 0)) ?-))))
|
|
|
|
|
mods "")
|
|
|
|
|
(cond
|
|
|
|
|
((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c))
|
|
|
|
|
((eq c 127) "\\C-?")
|
|
|
|
|
(t
|
|
|
|
|
(string c)))))
|
|
|
|
|
(error nil))
|
|
|
|
|
;; Verify the string reads a CHAR, not to some other character.
|
|
|
|
|
;; If it doesn't, return nil instead.
|
|
|
|
|
(and string
|
|
|
|
|
(= (car (read-from-string string)) char)
|
|
|
|
|
string))))
|
|
|
|
|
|
|
|
|
|
(defun elisp--preceding-sexp ()
|
|
|
|
|
"Return sexp before the point."
|
|
|
|
|
(let ((opoint (point))
|
Support curved quotes in doc strings
Emacs's traditional doc string style has been to quote symbols
`like this'. This worked well on now-obsolete terminals where
` and ' were symmetric quotes, but nowadays curved quotes
‘like this’ look better. Support quoting the new way too.
(Bug#20385)
* doc/lispref/tips.texi (Documentation Tips): Symbols can be quoted
‘like-this’ as well as `like-this'.
* etc/NEWS: Mention this.
* lisp/cedet/mode-local.el (overload-docstring-extension)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class)
(eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode, help-fns--obsolete):
(help-fns--interactive-only, describe-function-1):
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (describe-input-method)
(describe-language-environment):
* lisp/international/mule-diag.el (describe-character-set)
(print-coding-system-briefly, list-input-methods)
(list-input-methods-1):
Insert curved quotes rather than grave accent and apostrophe.
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-proper-noun-region-engine):
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2):
* lisp/finder.el (finder-font-lock-keywords):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/help-fns.el (help-do-arg-highlight)
(describe-function-1, describe-variable):
* lisp/help-mode.el (help-xref-symbol-regexp)
(help-xref-info-regexp, help-xref-url-regexp):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (help-xref-mule-regexp-template):
* lisp/wid-edit.el (widget-documentation-link-regexp):
Parse symbols quoted ‘like-this’ as well as `like-this'.
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
Add "‘" and "’" to electric-pair-text-pairs.
(elisp--form-quoted-p): Also allow "‘" as a quoting char.
(elisp-completion-at-point, elisp--preceding-sexp):
Also treat "‘" and "’" as quoting chars.
2015-05-28 00:06:14 -07:00
|
|
|
|
(left-quote ?‘)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
expr)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(with-syntax-table emacs-lisp-mode-syntax-table
|
Support curved quotes in doc strings
Emacs's traditional doc string style has been to quote symbols
`like this'. This worked well on now-obsolete terminals where
` and ' were symmetric quotes, but nowadays curved quotes
‘like this’ look better. Support quoting the new way too.
(Bug#20385)
* doc/lispref/tips.texi (Documentation Tips): Symbols can be quoted
‘like-this’ as well as `like-this'.
* etc/NEWS: Mention this.
* lisp/cedet/mode-local.el (overload-docstring-extension)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class)
(eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode, help-fns--obsolete):
(help-fns--interactive-only, describe-function-1):
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (describe-input-method)
(describe-language-environment):
* lisp/international/mule-diag.el (describe-character-set)
(print-coding-system-briefly, list-input-methods)
(list-input-methods-1):
Insert curved quotes rather than grave accent and apostrophe.
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-proper-noun-region-engine):
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2):
* lisp/finder.el (finder-font-lock-keywords):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/help-fns.el (help-do-arg-highlight)
(describe-function-1, describe-variable):
* lisp/help-mode.el (help-xref-symbol-regexp)
(help-xref-info-regexp, help-xref-url-regexp):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (help-xref-mule-regexp-template):
* lisp/wid-edit.el (widget-documentation-link-regexp):
Parse symbols quoted ‘like-this’ as well as `like-this'.
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
Add "‘" and "’" to electric-pair-text-pairs.
(elisp--form-quoted-p): Also allow "‘" as a quoting char.
(elisp-completion-at-point, elisp--preceding-sexp):
Also treat "‘" and "’" as quoting chars.
2015-05-28 00:06:14 -07:00
|
|
|
|
;; If this sexp appears to be enclosed in `...' or ‘...’
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; then ignore the surrounding quotes.
|
Support curved quotes in doc strings
Emacs's traditional doc string style has been to quote symbols
`like this'. This worked well on now-obsolete terminals where
` and ' were symmetric quotes, but nowadays curved quotes
‘like this’ look better. Support quoting the new way too.
(Bug#20385)
* doc/lispref/tips.texi (Documentation Tips): Symbols can be quoted
‘like-this’ as well as `like-this'.
* etc/NEWS: Mention this.
* lisp/cedet/mode-local.el (overload-docstring-extension)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class)
(eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode, help-fns--obsolete):
(help-fns--interactive-only, describe-function-1):
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (describe-input-method)
(describe-language-environment):
* lisp/international/mule-diag.el (describe-character-set)
(print-coding-system-briefly, list-input-methods)
(list-input-methods-1):
Insert curved quotes rather than grave accent and apostrophe.
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-proper-noun-region-engine):
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2):
* lisp/finder.el (finder-font-lock-keywords):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/help-fns.el (help-do-arg-highlight)
(describe-function-1, describe-variable):
* lisp/help-mode.el (help-xref-symbol-regexp)
(help-xref-info-regexp, help-xref-url-regexp):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (help-xref-mule-regexp-template):
* lisp/wid-edit.el (widget-documentation-link-regexp):
Parse symbols quoted ‘like-this’ as well as `like-this'.
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
Add "‘" and "’" to electric-pair-text-pairs.
(elisp--form-quoted-p): Also allow "‘" as a quoting char.
(elisp-completion-at-point, elisp--preceding-sexp):
Also treat "‘" and "’" as quoting chars.
2015-05-28 00:06:14 -07:00
|
|
|
|
(cond ((eq (preceding-char) ?’)
|
|
|
|
|
(progn (forward-char -1) (setq opoint (point))))
|
|
|
|
|
((or (eq (following-char) ?\')
|
|
|
|
|
(eq (preceding-char) ?\'))
|
|
|
|
|
(setq left-quote ?\`)))
|
2016-05-02 23:58:15 +02:00
|
|
|
|
|
|
|
|
|
;; When after a named character literal, skip over the entire
|
|
|
|
|
;; literal, not only its last word.
|
|
|
|
|
(when (= (preceding-char) ?})
|
|
|
|
|
(let ((begin (save-excursion
|
|
|
|
|
(backward-char)
|
|
|
|
|
(skip-syntax-backward "w-")
|
|
|
|
|
(backward-char 3)
|
|
|
|
|
(when (looking-at-p "\\\\N{") (point)))))
|
|
|
|
|
(when begin (goto-char begin))))
|
|
|
|
|
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(forward-sexp -1)
|
|
|
|
|
;; If we were after `?\e' (or similar case),
|
|
|
|
|
;; use the whole thing, not just the `e'.
|
|
|
|
|
(when (eq (preceding-char) ?\\)
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(when (eq (preceding-char) ??)
|
|
|
|
|
(forward-char -1)))
|
|
|
|
|
|
|
|
|
|
;; Skip over hash table read syntax.
|
|
|
|
|
(and (> (point) (1+ (point-min)))
|
|
|
|
|
(looking-back "#s" (- (point) 2))
|
|
|
|
|
(forward-char -2))
|
|
|
|
|
|
|
|
|
|
;; Skip over `#N='s.
|
|
|
|
|
(when (eq (preceding-char) ?=)
|
|
|
|
|
(let (labeled-p)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-chars-backward "0-9#=")
|
|
|
|
|
(setq labeled-p (looking-at "\\(#[0-9]+=\\)+")))
|
|
|
|
|
(when labeled-p
|
|
|
|
|
(forward-sexp -1))))
|
|
|
|
|
|
|
|
|
|
(save-restriction
|
Support curved quotes in doc strings
Emacs's traditional doc string style has been to quote symbols
`like this'. This worked well on now-obsolete terminals where
` and ' were symmetric quotes, but nowadays curved quotes
‘like this’ look better. Support quoting the new way too.
(Bug#20385)
* doc/lispref/tips.texi (Documentation Tips): Symbols can be quoted
‘like-this’ as well as `like-this'.
* etc/NEWS: Mention this.
* lisp/cedet/mode-local.el (overload-docstring-extension)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cus-theme.el (describe-theme-1):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/emacs-lisp/cl-generic.el (cl--generic-describe):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class)
(eieio-help-constructor):
* lisp/emacs-lisp/package.el (describe-package-1):
* lisp/faces.el (describe-face):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode, help-fns--obsolete):
(help-fns--interactive-only, describe-function-1):
(describe-variable):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (describe-input-method)
(describe-language-environment):
* lisp/international/mule-diag.el (describe-character-set)
(print-coding-system-briefly, list-input-methods)
(list-input-methods-1):
Insert curved quotes rather than grave accent and apostrophe.
* lisp/cedet/srecode/texi.el (srecode-texi-texify-docstring):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-proper-noun-region-engine):
* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
(lisp-cl-font-lock-keywords-2):
* lisp/finder.el (finder-font-lock-keywords):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/help-fns.el (help-do-arg-highlight)
(describe-function-1, describe-variable):
* lisp/help-mode.el (help-xref-symbol-regexp)
(help-xref-info-regexp, help-xref-url-regexp):
* lisp/help.el (describe-mode):
* lisp/international/mule-cmds.el (help-xref-mule-regexp-template):
* lisp/wid-edit.el (widget-documentation-link-regexp):
Parse symbols quoted ‘like-this’ as well as `like-this'.
* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
Add "‘" and "’" to electric-pair-text-pairs.
(elisp--form-quoted-p): Also allow "‘" as a quoting char.
(elisp-completion-at-point, elisp--preceding-sexp):
Also treat "‘" and "’" as quoting chars.
2015-05-28 00:06:14 -07:00
|
|
|
|
(if (eq (following-char) left-quote)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; vladimir@cs.ualberta.ca 30-Jul-1997: Skip ` in `variable' so
|
|
|
|
|
;; that the value is returned, not the name.
|
|
|
|
|
(forward-char))
|
|
|
|
|
(when (looking-at ",@?") (goto-char (match-end 0)))
|
|
|
|
|
(narrow-to-region (point-min) opoint)
|
|
|
|
|
(setq expr (read (current-buffer)))
|
|
|
|
|
;; If it's an (interactive ...) form, it's more useful to show how an
|
|
|
|
|
;; interactive call would use it.
|
|
|
|
|
;; FIXME: Is it really the right place for this?
|
|
|
|
|
(when (eq (car-safe expr) 'interactive)
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(setq expr
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
`(call-interactively
|
|
|
|
|
(lambda (&rest args) ,expr args))))
|
|
|
|
|
expr)))))
|
|
|
|
|
(define-obsolete-function-alias 'preceding-sexp 'elisp--preceding-sexp "25.1")
|
|
|
|
|
|
|
|
|
|
(defun elisp--eval-last-sexp (eval-last-sexp-arg-internal)
|
|
|
|
|
"Evaluate sexp before point; print value in the echo area.
|
2015-02-25 13:07:43 +01:00
|
|
|
|
If EVAL-LAST-SEXP-ARG-INTERNAL is non-nil, print output into
|
|
|
|
|
current buffer. If EVAL-LAST-SEXP-ARG-INTERNAL is `0', print
|
|
|
|
|
output with no limit on the length and level of lists, and
|
|
|
|
|
include additional formats for integers \(octal, hexadecimal, and
|
|
|
|
|
character)."
|
2017-04-23 22:21:42 -04:00
|
|
|
|
(pcase-let*
|
2017-04-23 22:30:20 -04:00
|
|
|
|
((`(,insert-value ,no-truncate ,char-print-limit)
|
2017-04-23 22:21:42 -04:00
|
|
|
|
(eval-expression-get-print-arguments eval-last-sexp-arg-internal)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; Setup the lexical environment if lexical-binding is enabled.
|
2015-11-06 21:21:52 +02:00
|
|
|
|
(elisp--eval-last-sexp-print-value
|
2018-02-18 13:02:29 -05:00
|
|
|
|
(eval (macroexpand-all
|
|
|
|
|
(eval-sexp-add-defvars (elisp--preceding-sexp)))
|
|
|
|
|
lexical-binding)
|
2017-04-23 22:30:20 -04:00
|
|
|
|
(if insert-value (current-buffer) t) no-truncate char-print-limit)))
|
2017-04-23 22:21:42 -04:00
|
|
|
|
|
|
|
|
|
(defun elisp--eval-last-sexp-print-value
|
2017-04-23 22:30:20 -04:00
|
|
|
|
(value output &optional no-truncate char-print-limit)
|
2017-04-23 22:21:42 -04:00
|
|
|
|
(let* ((unabbreviated (let ((print-length nil) (print-level nil))
|
|
|
|
|
(prin1-to-string value)))
|
2017-04-23 22:30:20 -04:00
|
|
|
|
(eval-expression-print-maximum-character char-print-limit)
|
2017-04-23 22:21:42 -04:00
|
|
|
|
(print-length (unless no-truncate eval-expression-print-length))
|
|
|
|
|
(print-level (unless no-truncate eval-expression-print-level))
|
|
|
|
|
(beg (point))
|
|
|
|
|
end)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(prog1
|
2017-04-23 22:21:42 -04:00
|
|
|
|
(prin1 value output)
|
2017-04-23 22:30:20 -04:00
|
|
|
|
(let ((str (and char-print-limit (eval-expression-print-format value))))
|
2017-04-23 22:21:42 -04:00
|
|
|
|
(if str (princ str output)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(setq end (point))
|
2017-04-23 22:21:42 -04:00
|
|
|
|
(when (and (bufferp output)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(or (not (null print-length))
|
|
|
|
|
(not (null print-level)))
|
|
|
|
|
(not (string= unabbreviated
|
|
|
|
|
(buffer-substring-no-properties beg end))))
|
|
|
|
|
(last-sexp-setup-props beg end value
|
|
|
|
|
unabbreviated
|
|
|
|
|
(buffer-substring-no-properties beg end))
|
|
|
|
|
))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defvar elisp--eval-last-sexp-fake-value (make-symbol "t"))
|
|
|
|
|
|
|
|
|
|
(defun eval-sexp-add-defvars (exp &optional pos)
|
|
|
|
|
"Prepend EXP with all the `defvar's that precede it in the buffer.
|
|
|
|
|
POS specifies the starting position where EXP was found and defaults to point."
|
|
|
|
|
(if (not lexical-binding)
|
|
|
|
|
exp
|
|
|
|
|
(save-excursion
|
|
|
|
|
(unless pos (setq pos (point)))
|
|
|
|
|
(let ((vars ()))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward
|
|
|
|
|
"(def\\(?:var\\|const\\|custom\\)[ \t\n]+\\([^; '()\n\t]+\\)"
|
|
|
|
|
pos t)
|
|
|
|
|
(let ((var (intern (match-string 1))))
|
2019-07-11 18:38:02 -04:00
|
|
|
|
(unless (or (special-variable-p var)
|
|
|
|
|
(syntax-ppss-toplevel-pos
|
|
|
|
|
(save-excursion
|
|
|
|
|
(syntax-ppss (match-beginning 0)))))
|
|
|
|
|
(push var vars))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
`(progn ,@(mapcar (lambda (v) `(defvar ,v)) vars) ,exp)))))
|
|
|
|
|
|
|
|
|
|
(defun eval-last-sexp (eval-last-sexp-arg-internal)
|
|
|
|
|
"Evaluate sexp before point; print value in the echo area.
|
2017-04-23 22:30:20 -04:00
|
|
|
|
Interactively, with a non `-' prefix argument, print output into
|
|
|
|
|
current buffer.
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
2017-04-23 22:30:20 -04:00
|
|
|
|
Normally, this function truncates long output according to the
|
|
|
|
|
value of the variables `eval-expression-print-length' and
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
`eval-expression-print-level'. With a prefix argument of zero,
|
2018-07-06 12:31:51 +03:00
|
|
|
|
however, there is no such truncation.
|
|
|
|
|
Integer values are printed in several formats (decimal, octal,
|
|
|
|
|
and hexadecimal). When the prefix argument is -1 or the value
|
|
|
|
|
doesn't exceed `eval-expression-print-maximum-character', an
|
|
|
|
|
integer value is also printed as a character of that codepoint.
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
|
|
|
|
If `eval-expression-debug-on-error' is non-nil, which is the default,
|
|
|
|
|
this command arranges for all errors to enter the debugger."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(if (null eval-expression-debug-on-error)
|
|
|
|
|
(elisp--eval-last-sexp eval-last-sexp-arg-internal)
|
|
|
|
|
(let ((value
|
|
|
|
|
(let ((debug-on-error elisp--eval-last-sexp-fake-value))
|
|
|
|
|
(cons (elisp--eval-last-sexp eval-last-sexp-arg-internal)
|
|
|
|
|
debug-on-error))))
|
|
|
|
|
(unless (eq (cdr value) elisp--eval-last-sexp-fake-value)
|
|
|
|
|
(setq debug-on-error (cdr value)))
|
|
|
|
|
(car value))))
|
|
|
|
|
|
|
|
|
|
(defun elisp--eval-defun-1 (form)
|
|
|
|
|
"Treat some expressions specially.
|
|
|
|
|
Reset the `defvar' and `defcustom' variables to the initial value.
|
|
|
|
|
\(For `defcustom', use the :set function if there is one.)
|
|
|
|
|
Reinitialize the face according to the `defface' specification."
|
|
|
|
|
;; The code in edebug-defun should be consistent with this, but not
|
|
|
|
|
;; the same, since this gets a macroexpanded form.
|
|
|
|
|
(cond ((not (listp form))
|
|
|
|
|
form)
|
|
|
|
|
((and (eq (car form) 'defvar)
|
|
|
|
|
(cdr-safe (cdr-safe form))
|
|
|
|
|
(boundp (cadr form)))
|
|
|
|
|
;; Force variable to be re-set.
|
|
|
|
|
`(progn (defvar ,(nth 1 form) nil ,@(nthcdr 3 form))
|
|
|
|
|
(setq-default ,(nth 1 form) ,(nth 2 form))))
|
|
|
|
|
;; `defcustom' is now macroexpanded to
|
|
|
|
|
;; `custom-declare-variable' with a quoted value arg.
|
|
|
|
|
((and (eq (car form) 'custom-declare-variable)
|
|
|
|
|
(default-boundp (eval (nth 1 form) lexical-binding)))
|
|
|
|
|
;; Force variable to be bound, using :set function if specified.
|
|
|
|
|
(let ((setfunc (memq :set form)))
|
|
|
|
|
(when setfunc
|
|
|
|
|
(setq setfunc (car-safe (cdr-safe setfunc)))
|
|
|
|
|
(or (functionp setfunc) (setq setfunc nil)))
|
|
|
|
|
(funcall (or setfunc 'set-default)
|
|
|
|
|
(eval (nth 1 form) lexical-binding)
|
|
|
|
|
;; The second arg is an expression that evaluates to
|
|
|
|
|
;; an expression. The second evaluation is the one
|
|
|
|
|
;; normally performed not by normal execution but by
|
|
|
|
|
;; custom-initialize-set (for example), which does not
|
|
|
|
|
;; use lexical-binding.
|
|
|
|
|
(eval (eval (nth 2 form) lexical-binding))))
|
|
|
|
|
form)
|
|
|
|
|
;; `defface' is macroexpanded to `custom-declare-face'.
|
|
|
|
|
((eq (car form) 'custom-declare-face)
|
|
|
|
|
;; Reset the face.
|
|
|
|
|
(let ((face-symbol (eval (nth 1 form) lexical-binding)))
|
|
|
|
|
(setq face-new-frame-defaults
|
|
|
|
|
(assq-delete-all face-symbol face-new-frame-defaults))
|
|
|
|
|
(put face-symbol 'face-defface-spec nil)
|
|
|
|
|
(put face-symbol 'face-override-spec nil))
|
|
|
|
|
form)
|
|
|
|
|
((eq (car form) 'progn)
|
|
|
|
|
(cons 'progn (mapcar #'elisp--eval-defun-1 (cdr form))))
|
|
|
|
|
(t form)))
|
|
|
|
|
|
|
|
|
|
(defun elisp--eval-defun ()
|
|
|
|
|
"Evaluate defun that point is in or before.
|
|
|
|
|
The value is displayed in the echo area.
|
|
|
|
|
If the current defun is actually a call to `defvar',
|
|
|
|
|
then reset the variable using the initial value expression
|
|
|
|
|
even if the variable already has some other value.
|
|
|
|
|
\(Normally `defvar' does not change the variable's value
|
2015-09-17 16:08:20 -07:00
|
|
|
|
if it already has a value.)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
|
|
|
|
Return the result of evaluation."
|
|
|
|
|
;; FIXME: the print-length/level bindings should only be applied while
|
|
|
|
|
;; printing, not while evaluating.
|
|
|
|
|
(let ((debug-on-error eval-expression-debug-on-error)
|
|
|
|
|
(print-length eval-expression-print-length)
|
|
|
|
|
(print-level eval-expression-print-level))
|
|
|
|
|
(save-excursion
|
|
|
|
|
;; Arrange for eval-region to "read" the (possibly) altered form.
|
|
|
|
|
;; eval-region handles recording which file defines a function or
|
|
|
|
|
;; variable.
|
|
|
|
|
(let ((standard-output t)
|
|
|
|
|
beg end form)
|
|
|
|
|
;; Read the form from the buffer, and record where it ends.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(end-of-defun)
|
|
|
|
|
(beginning-of-defun)
|
|
|
|
|
(setq beg (point))
|
|
|
|
|
(setq form (read (current-buffer)))
|
|
|
|
|
(setq end (point)))
|
|
|
|
|
;; Alter the form if necessary.
|
|
|
|
|
(let ((form (eval-sexp-add-defvars
|
|
|
|
|
(elisp--eval-defun-1 (macroexpand form)))))
|
|
|
|
|
(eval-region beg end standard-output
|
|
|
|
|
(lambda (_ignore)
|
|
|
|
|
;; Skipping to the end of the specified region
|
|
|
|
|
;; will make eval-region return.
|
|
|
|
|
(goto-char end)
|
|
|
|
|
form))))))
|
|
|
|
|
(let ((str (eval-expression-print-format (car values))))
|
|
|
|
|
(if str (princ str)))
|
|
|
|
|
;; The result of evaluation has been put onto VALUES. So return it.
|
|
|
|
|
(car values))
|
|
|
|
|
|
|
|
|
|
(defun eval-defun (edebug-it)
|
|
|
|
|
"Evaluate the top-level form containing point, or after point.
|
|
|
|
|
|
|
|
|
|
If the current defun is actually a call to `defvar' or `defcustom',
|
|
|
|
|
evaluating it this way resets the variable using its initial value
|
|
|
|
|
expression (using the defcustom's :set function if there is one), even
|
|
|
|
|
if the variable already has some other value. \(Normally `defvar' and
|
|
|
|
|
`defcustom' do not alter the value if there already is one.) In an
|
|
|
|
|
analogous way, evaluating a `defface' overrides any customizations of
|
|
|
|
|
the face, so that it becomes defined exactly as the `defface' expression
|
|
|
|
|
says.
|
|
|
|
|
|
|
|
|
|
If `eval-expression-debug-on-error' is non-nil, which is the default,
|
|
|
|
|
this command arranges for all errors to enter the debugger.
|
|
|
|
|
|
|
|
|
|
With a prefix argument, instrument the code for Edebug.
|
|
|
|
|
|
|
|
|
|
If acting on a `defun' for FUNCTION, and the function was
|
|
|
|
|
instrumented, `Edebug: FUNCTION' is printed in the echo area. If not
|
|
|
|
|
instrumented, just FUNCTION is printed.
|
|
|
|
|
|
|
|
|
|
If not acting on a `defun', the result of evaluation is displayed in
|
|
|
|
|
the echo area. This display is controlled by the variables
|
|
|
|
|
`eval-expression-print-length' and `eval-expression-print-level',
|
|
|
|
|
which see."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(cond (edebug-it
|
|
|
|
|
(require 'edebug)
|
|
|
|
|
(eval-defun (not edebug-all-defs)))
|
|
|
|
|
(t
|
|
|
|
|
(if (null eval-expression-debug-on-error)
|
|
|
|
|
(elisp--eval-defun)
|
|
|
|
|
(let (new-value value)
|
|
|
|
|
(let ((debug-on-error elisp--eval-last-sexp-fake-value))
|
|
|
|
|
(setq value (elisp--eval-defun))
|
|
|
|
|
(setq new-value debug-on-error))
|
|
|
|
|
(unless (eq elisp--eval-last-sexp-fake-value new-value)
|
|
|
|
|
(setq debug-on-error new-value))
|
|
|
|
|
value)))))
|
|
|
|
|
|
|
|
|
|
;;; ElDoc Support
|
|
|
|
|
|
2014-09-27 18:08:59 +08:00
|
|
|
|
(defvar elisp--eldoc-last-data (make-vector 3 nil)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
"Bookkeeping; elements are as follows:
|
|
|
|
|
0 - contains the last symbol read from the buffer.
|
|
|
|
|
1 - contains the string last displayed in the echo area for variables,
|
|
|
|
|
or argument string for functions.
|
2015-09-03 15:31:12 -07:00
|
|
|
|
2 - `function' if function args, `variable' if variable documentation.")
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
|
|
|
|
(defun elisp-eldoc-documentation-function ()
|
|
|
|
|
"`eldoc-documentation-function' (which see) for Emacs Lisp."
|
|
|
|
|
(let ((current-symbol (elisp--current-symbol))
|
|
|
|
|
(current-fnsym (elisp--fnsym-in-current-sexp)))
|
|
|
|
|
(cond ((null current-fnsym)
|
|
|
|
|
nil)
|
|
|
|
|
((eq current-symbol (car current-fnsym))
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(or (apply #'elisp-get-fnsym-args-string current-fnsym)
|
|
|
|
|
(elisp-get-var-docstring current-symbol)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(t
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(or (elisp-get-var-docstring current-symbol)
|
|
|
|
|
(apply #'elisp-get-fnsym-args-string current-fnsym))))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(defun elisp-get-fnsym-args-string (sym &optional index prefix)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
"Return a string containing the parameter list of the function SYM.
|
|
|
|
|
If SYM is a subr and no arglist is obtainable from the docstring
|
|
|
|
|
or elsewhere, return a 1-line docstring."
|
|
|
|
|
(let ((argstring
|
|
|
|
|
(cond
|
|
|
|
|
((not (and sym (symbolp sym) (fboundp sym))) nil)
|
|
|
|
|
((and (eq sym (aref elisp--eldoc-last-data 0))
|
|
|
|
|
(eq 'function (aref elisp--eldoc-last-data 2)))
|
|
|
|
|
(aref elisp--eldoc-last-data 1))
|
|
|
|
|
(t
|
|
|
|
|
(let* ((advertised (gethash (indirect-function sym)
|
|
|
|
|
advertised-signature-table t))
|
|
|
|
|
doc
|
|
|
|
|
(args
|
|
|
|
|
(cond
|
|
|
|
|
((listp advertised) advertised)
|
2015-04-27 00:01:36 -04:00
|
|
|
|
((setq doc (help-split-fundoc
|
|
|
|
|
(condition-case nil (documentation sym t)
|
|
|
|
|
(invalid-function nil))
|
|
|
|
|
sym))
|
2017-06-04 09:13:15 -07:00
|
|
|
|
(substitute-command-keys (car doc)))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(t (help-function-arglist sym)))))
|
|
|
|
|
;; Stringify, and store before highlighting, downcasing, etc.
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(elisp--last-data-store sym (elisp-function-argstring args)
|
2017-10-01 15:24:15 +01:00
|
|
|
|
'function))))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; Highlight, truncate.
|
|
|
|
|
(if argstring
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(elisp--highlight-function-argument
|
|
|
|
|
sym argstring index
|
|
|
|
|
(or prefix
|
|
|
|
|
(concat (propertize (symbol-name sym) 'face
|
|
|
|
|
(if (functionp sym)
|
|
|
|
|
'font-lock-function-name-face
|
|
|
|
|
'font-lock-keyword-face))
|
|
|
|
|
": "))))))
|
|
|
|
|
|
|
|
|
|
(defun elisp--highlight-function-argument (sym args index prefix)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
"Highlight argument INDEX in ARGS list for function SYM.
|
2015-05-05 22:18:19 -04:00
|
|
|
|
In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'."
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; FIXME: This should probably work on the list representation of `args'
|
|
|
|
|
;; rather than its string representation.
|
|
|
|
|
;; FIXME: This function is much too long, we need to split it up!
|
2017-06-15 05:26:05 +02:00
|
|
|
|
(let* ((start nil)
|
|
|
|
|
(end 0)
|
|
|
|
|
(argument-face 'eldoc-highlight-function-argument)
|
|
|
|
|
(args-lst (mapcar (lambda (x)
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"\\`[(]\\|[)]\\'" "" x))
|
|
|
|
|
(split-string args)))
|
|
|
|
|
(args-lst-ak (cdr (member "&key" args-lst))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; Find the current argument in the argument string. We need to
|
|
|
|
|
;; handle `&rest' and informal `...' properly.
|
|
|
|
|
;;
|
|
|
|
|
;; FIXME: What to do with optional arguments, like in
|
|
|
|
|
;; (defun NAME ARGLIST [DOCSTRING] BODY...) case?
|
|
|
|
|
;; The problem is there is no robust way to determine if
|
|
|
|
|
;; the current argument is indeed a docstring.
|
|
|
|
|
|
|
|
|
|
;; When `&key' is used finding position based on `index'
|
|
|
|
|
;; would be wrong, so find the arg at point and determine
|
|
|
|
|
;; position in ARGS based on this current arg.
|
2017-06-15 05:26:05 +02:00
|
|
|
|
(when (and args-lst-ak
|
|
|
|
|
(>= index (- (length args-lst) (length args-lst-ak))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(let* (case-fold-search
|
|
|
|
|
key-have-value
|
|
|
|
|
(sym-name (symbol-name sym))
|
2017-06-15 05:26:05 +02:00
|
|
|
|
(cur-w (current-word t))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(limit (save-excursion
|
|
|
|
|
(when (re-search-backward sym-name nil t)
|
|
|
|
|
(match-end 0))))
|
|
|
|
|
(cur-a (if (and cur-w (string-match ":\\([^ ()]*\\)" cur-w))
|
|
|
|
|
(substring cur-w 1)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let (split)
|
2017-06-15 05:26:05 +02:00
|
|
|
|
(when (re-search-backward ":\\([^ ()\n]*\\)" limit t)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(setq split (split-string (match-string 1) " " t))
|
|
|
|
|
(prog1 (car split)
|
|
|
|
|
(when (cdr split)
|
|
|
|
|
(setq key-have-value t))))))))
|
|
|
|
|
;; If `cur-a' is not one of `args-lst-ak'
|
|
|
|
|
;; assume user is entering an unknown key
|
|
|
|
|
;; referenced in last position in signature.
|
|
|
|
|
(other-key-arg (and (stringp cur-a)
|
|
|
|
|
args-lst-ak
|
|
|
|
|
(not (member (upcase cur-a) args-lst-ak))
|
|
|
|
|
(upcase (car (last args-lst-ak))))))
|
2017-06-15 05:26:05 +02:00
|
|
|
|
(unless (or (null cur-w) (string= cur-w sym-name))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
;; The last keyword have already a value
|
|
|
|
|
;; i.e :foo a b and cursor is at b.
|
|
|
|
|
;; If signature have also `&rest'
|
|
|
|
|
;; (assume it is after the `&key' section)
|
|
|
|
|
;; go to the arg after `&rest'.
|
|
|
|
|
(if (and key-have-value
|
|
|
|
|
(save-excursion
|
|
|
|
|
(not (re-search-forward ":.*" (point-at-eol) t)))
|
|
|
|
|
(string-match "&rest \\([^ ()]*\\)" args))
|
|
|
|
|
(setq index nil ; Skip next block based on positional args.
|
|
|
|
|
start (match-beginning 1)
|
|
|
|
|
end (match-end 1))
|
|
|
|
|
;; If `cur-a' is nil probably cursor is on a positional arg
|
|
|
|
|
;; before `&key', in this case, exit this block and determine
|
|
|
|
|
;; position with `index'.
|
|
|
|
|
(when (and cur-a ; A keyword arg (dot removed) or nil.
|
|
|
|
|
(or (string-match
|
|
|
|
|
(concat "\\_<" (upcase cur-a) "\\_>") args)
|
|
|
|
|
(string-match
|
|
|
|
|
(concat "\\_<" other-key-arg "\\_>") args)))
|
|
|
|
|
(setq index nil ; Skip next block based on positional args.
|
|
|
|
|
start (match-beginning 0)
|
|
|
|
|
end (match-end 0)))))))
|
|
|
|
|
;; Handle now positional arguments.
|
|
|
|
|
(while (and index (>= index 1))
|
|
|
|
|
(if (string-match "[^ ()]+" args end)
|
|
|
|
|
(progn
|
|
|
|
|
(setq start (match-beginning 0)
|
|
|
|
|
end (match-end 0))
|
|
|
|
|
(let ((argument (match-string 0 args)))
|
|
|
|
|
(cond ((string= argument "&rest")
|
|
|
|
|
;; All the rest arguments are the same.
|
|
|
|
|
(setq index 1))
|
|
|
|
|
((string= argument "&optional")) ; Skip.
|
|
|
|
|
((string= argument "&allow-other-keys")) ; Skip.
|
|
|
|
|
;; Back to index 0 in ARG1 ARG2 ARG2 ARG3 etc...
|
|
|
|
|
;; like in `setq'.
|
2015-05-05 22:18:19 -04:00
|
|
|
|
((or (and (string-match-p "\\.\\.\\.\\'" argument)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(string= argument (car (last args-lst))))
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(and (string-match-p "\\.\\.\\.\\'"
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(substring args 1 (1- (length args))))
|
|
|
|
|
(= (length (remove "..." args-lst)) 2)
|
|
|
|
|
(> index 1) (eq (logand index 1) 1)))
|
|
|
|
|
(setq index 0))
|
|
|
|
|
(t
|
|
|
|
|
(setq index (1- index))))))
|
|
|
|
|
(setq end (length args)
|
|
|
|
|
start (1- end)
|
|
|
|
|
argument-face 'font-lock-warning-face
|
|
|
|
|
index 0)))
|
|
|
|
|
(let ((doc args))
|
|
|
|
|
(when start
|
|
|
|
|
(setq doc (copy-sequence args))
|
|
|
|
|
(add-text-properties start end (list 'face argument-face) doc))
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(setq doc (eldoc-docstring-format-sym-doc prefix doc))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
doc)))
|
|
|
|
|
|
|
|
|
|
;; Return a string containing a brief (one-line) documentation string for
|
|
|
|
|
;; the variable.
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(defun elisp-get-var-docstring (sym)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(cond ((not sym) nil)
|
|
|
|
|
((and (eq sym (aref elisp--eldoc-last-data 0))
|
|
|
|
|
(eq 'variable (aref elisp--eldoc-last-data 2)))
|
|
|
|
|
(aref elisp--eldoc-last-data 1))
|
|
|
|
|
(t
|
|
|
|
|
(let ((doc (documentation-property sym 'variable-documentation t)))
|
|
|
|
|
(when doc
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(let ((doc (eldoc-docstring-format-sym-doc
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
sym (elisp--docstring-first-line doc)
|
|
|
|
|
'font-lock-variable-name-face)))
|
|
|
|
|
(elisp--last-data-store sym doc 'variable)))))))
|
|
|
|
|
|
|
|
|
|
(defun elisp--last-data-store (symbol doc type)
|
|
|
|
|
(aset elisp--eldoc-last-data 0 symbol)
|
|
|
|
|
(aset elisp--eldoc-last-data 1 doc)
|
|
|
|
|
(aset elisp--eldoc-last-data 2 type)
|
|
|
|
|
doc)
|
|
|
|
|
|
|
|
|
|
;; Note that any leading `*' in the docstring (which indicates the variable
|
|
|
|
|
;; is a user option) is removed.
|
|
|
|
|
(defun elisp--docstring-first-line (doc)
|
|
|
|
|
(and (stringp doc)
|
|
|
|
|
(substitute-command-keys
|
|
|
|
|
(save-match-data
|
|
|
|
|
;; Don't use "^" in the regexp below since it may match
|
|
|
|
|
;; anywhere in the doc-string.
|
|
|
|
|
(let ((start (if (string-match "\\`\\*" doc) (match-end 0) 0)))
|
|
|
|
|
(cond ((string-match "\n" doc)
|
|
|
|
|
(substring doc start (match-beginning 0)))
|
|
|
|
|
((zerop start) doc)
|
|
|
|
|
(t (substring doc start))))))))
|
|
|
|
|
|
|
|
|
|
;; Return a list of current function name and argument index.
|
|
|
|
|
(defun elisp--fnsym-in-current-sexp ()
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((argument-index (1- (elisp--beginning-of-sexp))))
|
|
|
|
|
;; If we are at the beginning of function name, this will be -1.
|
|
|
|
|
(when (< argument-index 0)
|
|
|
|
|
(setq argument-index 0))
|
|
|
|
|
;; Don't do anything if current word is inside a string.
|
|
|
|
|
(if (= (or (char-after (1- (point))) 0) ?\")
|
|
|
|
|
nil
|
|
|
|
|
(list (elisp--current-symbol) argument-index)))))
|
|
|
|
|
|
|
|
|
|
;; Move to the beginning of current sexp. Return the number of nested
|
|
|
|
|
;; sexp the point was over or after.
|
|
|
|
|
(defun elisp--beginning-of-sexp ()
|
|
|
|
|
(let ((parse-sexp-ignore-comments t)
|
|
|
|
|
(num-skipped-sexps 0))
|
|
|
|
|
(condition-case _
|
|
|
|
|
(progn
|
|
|
|
|
;; First account for the case the point is directly over a
|
|
|
|
|
;; beginning of a nested sexp.
|
|
|
|
|
(condition-case _
|
|
|
|
|
(let ((p (point)))
|
|
|
|
|
(forward-sexp -1)
|
|
|
|
|
(forward-sexp 1)
|
|
|
|
|
(when (< (point) p)
|
|
|
|
|
(setq num-skipped-sexps 1)))
|
|
|
|
|
(error))
|
|
|
|
|
(while
|
|
|
|
|
(let ((p (point)))
|
|
|
|
|
(forward-sexp -1)
|
|
|
|
|
(when (< (point) p)
|
|
|
|
|
(setq num-skipped-sexps (1+ num-skipped-sexps))))))
|
|
|
|
|
(error))
|
|
|
|
|
num-skipped-sexps))
|
|
|
|
|
|
|
|
|
|
;; returns nil unless current word is an interned symbol.
|
|
|
|
|
(defun elisp--current-symbol ()
|
|
|
|
|
(let ((c (char-after (point))))
|
|
|
|
|
(and c
|
|
|
|
|
(memq (char-syntax c) '(?w ?_))
|
|
|
|
|
(intern-soft (current-word)))))
|
|
|
|
|
|
2015-05-05 22:18:19 -04:00
|
|
|
|
(defun elisp-function-argstring (arglist)
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
"Return ARGLIST as a string enclosed by ().
|
|
|
|
|
ARGLIST is either a string, or a list of strings or symbols."
|
|
|
|
|
(let ((str (cond ((stringp arglist) arglist)
|
|
|
|
|
((not (listp arglist)) nil)
|
2016-05-28 10:45:07 +02:00
|
|
|
|
(t (substitute-command-keys
|
|
|
|
|
(help--make-usage-docstring 'toto arglist))))))
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(if (and str (string-match "\\`([^ )]+ ?" str))
|
|
|
|
|
(replace-match "(" t t str)
|
|
|
|
|
str)))
|
|
|
|
|
|
2017-10-01 15:24:15 +01:00
|
|
|
|
;;; Flymake support
|
|
|
|
|
|
|
|
|
|
;; Don't require checkdoc, but forward declare these checkdoc special
|
|
|
|
|
;; variables. Autoloading them on `checkdoc-current-buffer' is too
|
|
|
|
|
;; late, they won't be bound dynamically.
|
|
|
|
|
(defvar checkdoc-create-error-function)
|
|
|
|
|
(defvar checkdoc-autofix-flag)
|
|
|
|
|
(defvar checkdoc-generate-compile-warnings-flag)
|
|
|
|
|
(defvar checkdoc-diagnostic-buffer)
|
2017-10-06 17:51:40 +01:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun elisp-flymake-checkdoc (report-fn &rest _args)
|
|
|
|
|
"A Flymake backend for `checkdoc'.
|
|
|
|
|
Calls REPORT-FN directly."
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(let (collected)
|
|
|
|
|
(let* ((checkdoc-create-error-function
|
|
|
|
|
(lambda (text start end &optional unfixable)
|
|
|
|
|
(push (list text start end unfixable) collected)
|
|
|
|
|
nil))
|
|
|
|
|
(checkdoc-autofix-flag nil)
|
|
|
|
|
(checkdoc-generate-compile-warnings-flag nil)
|
2017-10-06 17:51:40 +01:00
|
|
|
|
(checkdoc-diagnostic-buffer
|
|
|
|
|
(generate-new-buffer " *checkdoc-temp*")))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(save-excursion
|
2017-11-09 20:44:11 +00:00
|
|
|
|
;; checkdoc-current-buffer can error if there are
|
|
|
|
|
;; unbalanced parens, for example, but this shouldn't
|
|
|
|
|
;; disable the backend (bug#29176).
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(checkdoc-current-buffer t)))
|
2017-10-06 17:51:40 +01:00
|
|
|
|
(kill-buffer checkdoc-diagnostic-buffer)))
|
|
|
|
|
(funcall report-fn
|
|
|
|
|
(cl-loop for (text start end _unfixable) in
|
|
|
|
|
collected
|
|
|
|
|
collect
|
|
|
|
|
(flymake-make-diagnostic
|
|
|
|
|
(current-buffer)
|
|
|
|
|
start end :note text)))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
collected))
|
|
|
|
|
|
|
|
|
|
(defun elisp-flymake--byte-compile-done (report-fn
|
2017-10-06 17:51:40 +01:00
|
|
|
|
source-buffer
|
|
|
|
|
output-buffer)
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
source-buffer
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(funcall
|
|
|
|
|
report-fn
|
|
|
|
|
(cl-loop with data =
|
|
|
|
|
(with-current-buffer output-buffer
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(search-forward ":elisp-flymake-output-start")
|
|
|
|
|
(read (point-marker)))
|
|
|
|
|
for (string pos _fill level) in data
|
|
|
|
|
do (goto-char pos)
|
|
|
|
|
for beg = (if (< (point) (point-max))
|
|
|
|
|
(point)
|
|
|
|
|
(line-beginning-position))
|
|
|
|
|
for end = (min
|
|
|
|
|
(line-end-position)
|
|
|
|
|
(or (cdr
|
|
|
|
|
(bounds-of-thing-at-point 'sexp))
|
|
|
|
|
(point-max)))
|
|
|
|
|
collect (flymake-make-diagnostic
|
|
|
|
|
(current-buffer)
|
|
|
|
|
(if (= beg end) (1- beg) beg)
|
|
|
|
|
end
|
|
|
|
|
level
|
|
|
|
|
string)))))))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
|
|
|
|
|
(defvar-local elisp-flymake--byte-compile-process nil
|
|
|
|
|
"Buffer-local process started for byte-compiling the buffer.")
|
|
|
|
|
|
2018-11-10 12:58:08 +00:00
|
|
|
|
(defvar elisp-flymake-byte-compile-load-path (list "./")
|
|
|
|
|
"Like `load-path' but used by `elisp-flymake-byte-compile'.
|
|
|
|
|
The default value contains just \"./\" which includes the default
|
|
|
|
|
directory of the buffer being compiled, and nothing else.")
|
|
|
|
|
|
|
|
|
|
(put 'elisp-flymake-byte-compile-load-path 'safe-local-variable
|
|
|
|
|
(lambda (x) (and (listp x) (catch 'tag
|
|
|
|
|
(dolist (path x t) (unless (stringp path)
|
|
|
|
|
(throw 'tag nil)))))))
|
|
|
|
|
|
2017-10-01 15:24:15 +01:00
|
|
|
|
;;;###autoload
|
2017-10-02 13:28:18 +01:00
|
|
|
|
(defun elisp-flymake-byte-compile (report-fn &rest _args)
|
2017-10-01 15:24:15 +01:00
|
|
|
|
"A Flymake backend for elisp byte compilation.
|
|
|
|
|
Spawn an Emacs process that byte-compiles a file representing the
|
|
|
|
|
current buffer state and calls REPORT-FN when done."
|
|
|
|
|
(when elisp-flymake--byte-compile-process
|
|
|
|
|
(when (process-live-p elisp-flymake--byte-compile-process)
|
|
|
|
|
(kill-process elisp-flymake--byte-compile-process)))
|
|
|
|
|
(let ((temp-file (make-temp-file "elisp-flymake-byte-compile"))
|
2017-10-06 17:51:40 +01:00
|
|
|
|
(source-buffer (current-buffer)))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(save-restriction
|
|
|
|
|
(widen)
|
|
|
|
|
(write-region (point-min) (point-max) temp-file nil 'nomessage))
|
|
|
|
|
(let* ((output-buffer (generate-new-buffer " *elisp-flymake-byte-compile*")))
|
|
|
|
|
(setq
|
|
|
|
|
elisp-flymake--byte-compile-process
|
|
|
|
|
(make-process
|
|
|
|
|
:name "elisp-flymake-byte-compile"
|
|
|
|
|
:buffer output-buffer
|
2018-11-10 12:58:08 +00:00
|
|
|
|
:command `(,(expand-file-name invocation-name invocation-directory)
|
|
|
|
|
"-Q"
|
|
|
|
|
"--batch"
|
|
|
|
|
;; "--eval" "(setq load-prefer-newer t)" ; for testing
|
|
|
|
|
,@(mapcan (lambda (path) (list "-L" path))
|
|
|
|
|
elisp-flymake-byte-compile-load-path)
|
|
|
|
|
"-f" "elisp-flymake--batch-compile-for-flymake"
|
|
|
|
|
,temp-file)
|
2017-10-01 15:24:15 +01:00
|
|
|
|
:connection-type 'pipe
|
|
|
|
|
:sentinel
|
|
|
|
|
(lambda (proc _event)
|
2017-10-06 17:51:40 +01:00
|
|
|
|
(when (eq (process-status proc) 'exit)
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(cond
|
2017-12-22 16:00:07 -05:00
|
|
|
|
((not (and (buffer-live-p source-buffer)
|
|
|
|
|
(eq proc (with-current-buffer source-buffer
|
|
|
|
|
elisp-flymake--byte-compile-process))))
|
|
|
|
|
(flymake-log :warning
|
|
|
|
|
"byte-compile process %s obsolete" proc))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
((zerop (process-exit-status proc))
|
|
|
|
|
(elisp-flymake--byte-compile-done report-fn
|
2017-10-06 17:51:40 +01:00
|
|
|
|
source-buffer
|
|
|
|
|
output-buffer))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
(t
|
|
|
|
|
(funcall report-fn
|
|
|
|
|
:panic
|
|
|
|
|
:explanation
|
2017-10-06 17:51:40 +01:00
|
|
|
|
(format "byte-compile process %s died" proc))))
|
|
|
|
|
(ignore-errors (delete-file temp-file))
|
2018-06-16 18:08:09 +01:00
|
|
|
|
(kill-buffer output-buffer))))
|
2018-06-19 20:59:27 +01:00
|
|
|
|
:stderr " *stderr of elisp-flymake-byte-compile*"
|
2018-06-16 18:08:09 +01:00
|
|
|
|
:noquery t)))))
|
2017-10-01 15:24:15 +01:00
|
|
|
|
|
|
|
|
|
(defun elisp-flymake--batch-compile-for-flymake (&optional file)
|
|
|
|
|
"Helper for `elisp-flymake-byte-compile'.
|
|
|
|
|
Runs in a batch-mode Emacs. Interactively use variable
|
|
|
|
|
`buffer-file-name' for FILE."
|
|
|
|
|
(interactive (list buffer-file-name))
|
|
|
|
|
(let* ((file (or file
|
|
|
|
|
(car command-line-args-left)))
|
|
|
|
|
(dummy-elc-file)
|
|
|
|
|
(byte-compile-log-buffer
|
|
|
|
|
(generate-new-buffer " *dummy-byte-compile-log-buffer*"))
|
|
|
|
|
(byte-compile-dest-file-function
|
|
|
|
|
(lambda (source)
|
|
|
|
|
(setq dummy-elc-file (make-temp-file (file-name-nondirectory source)))))
|
|
|
|
|
(collected)
|
|
|
|
|
(byte-compile-log-warning-function
|
|
|
|
|
(lambda (string &optional position fill level)
|
|
|
|
|
(push (list string position fill level)
|
|
|
|
|
collected)
|
|
|
|
|
t)))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(byte-compile-file file)
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(delete-file dummy-elc-file)
|
|
|
|
|
(kill-buffer byte-compile-log-buffer)))
|
|
|
|
|
(prin1 :elisp-flymake-output-start)
|
|
|
|
|
(terpri)
|
|
|
|
|
(pp collected)))
|
|
|
|
|
|
Introduce global-eldoc-mode. Move Elisp-specific code to elisp-mode.el.
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): New minor mode.
(eldoc-schedule-timer): Obey it.
(eldoc-documentation-function): Default to nil.
(eldoc-mode): Don't enable if eldoc-documentation-function is not set.
(eldoc-documentation-function-default, eldoc-get-fnsym-args-string)
(eldoc-highlight-function-argument, eldoc-get-var-docstring)
(eldoc-last-data-store, eldoc-docstring-first-line)
(eldoc-docstring-format-sym-doc, eldoc-fnsym-in-current-sexp)
(eldoc-beginning-of-sexp, eldoc-current-symbol)
(eldoc-function-argstring): Move to elisp-mode.el.
(eldoc-symbol-function): Remove, unused.
* lisp/progmodes/elisp-mode.el: New file. Rename all "eldoc-*" to "elisp--*".
(elisp-completion-at-point): Rename from lisp-completion-at-point.
(elisp--preceding-sexp): Rename from preceding-sexp.
* lisp/loadup.el: Load new file progmodes/elisp-mode.
* lisp/ielm.el (inferior-emacs-lisp-mode): Set eldoc-documentation-function.
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1, lisp--local-variables)
(lisp--local-variables-completion-table, lisp--expect-function-p)
(lisp--form-quoted-p, lisp--company-doc-buffer)
(lisp--company-doc-string, lisp--company-location)
(lisp-completion-at-point): Move to elisp-mode.el.
* lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): New syntax-table,
extracted from emacs-lisp-mode-syntax-table.
(emacs-lisp-mode-abbrev-table, emacs-lisp-mode-syntax-table): Move to
elisp-mode.el.
(lisp-imenu-generic-expression): Add comments to document what comes
from which Lisp dialect.
(emacs-lisp-mode-map, emacs-lisp-byte-compile)
(emacs-lisp-byte-compile-and-load, emacs-lisp-mode-hook)
(emacs-lisp-mode, emacs-list-byte-code-comment-re)
(emacs-lisp-byte-code-comment)
(emacs-lisp-byte-code-syntax-propertize, emacs-lisp-byte-code-mode)
(lisp-interaction-mode-map, lisp-interaction-mode)
(eval-print-last-sexp, last-sexp-setup-props)
(last-sexp-toggle-display, prin1-char, preceding-sexp)
(eval-last-sexp-1, eval-last-sexp-print-value)
(eval-last-sexp-fake-value, eval-sexp-add-defvars, eval-last-sexp)
(eval-defun-1, eval-defun-2, eval-defun): Move to elisp-mode.el.
* src/lisp.mk (lisp): Add elisp-mode.elc.
2014-09-26 23:57:41 -04:00
|
|
|
|
(provide 'elisp-mode)
|
|
|
|
|
;;; elisp-mode.el ends here
|