diff options
| author | Dmitry Gutov | 2015-07-20 03:12:32 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2015-07-20 03:12:32 +0300 |
| commit | e29206e84af78ea58dc06155ad5ce9dbcf683cc9 (patch) | |
| tree | ee300cf1b20c0ee6820e10ab6a91e7940673b25e | |
| parent | a215fe8a8dc4529982885f3a2347a1984f1c4bc2 (diff) | |
| download | emacs-e29206e84af78ea58dc06155ad5ce9dbcf683cc9.tar.gz emacs-e29206e84af78ea58dc06155ad5ce9dbcf683cc9.zip | |
Rename xref description slot to summary
* lisp/progmodes/xref.el (xref--xref): Rename the `description'
slot to `summary'.
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/xref.el | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index a7e0bb47a1f..b7ae3c756de 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el | |||
| @@ -583,7 +583,7 @@ It can be quoted, or be inside a quoted form." | |||
| 583 | ;;; Xref backend | 583 | ;;; Xref backend |
| 584 | 584 | ||
| 585 | (declare-function xref-make-bogus-location "xref" (message)) | 585 | (declare-function xref-make-bogus-location "xref" (message)) |
| 586 | (declare-function xref-make "xref" (description location)) | 586 | (declare-function xref-make "xref" (summary location)) |
| 587 | (declare-function xref-collect-references "xref" (symbol dir)) | 587 | (declare-function xref-collect-references "xref" (symbol dir)) |
| 588 | 588 | ||
| 589 | (defun elisp-xref-find (action id) | 589 | (defun elisp-xref-find (action id) |
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 8d9a7823024..bf0710ea1cf 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el | |||
| @@ -148,18 +148,18 @@ actual location is not known.") | |||
| 148 | ;;; Cross-reference | 148 | ;;; Cross-reference |
| 149 | 149 | ||
| 150 | (defclass xref--xref () | 150 | (defclass xref--xref () |
| 151 | ((description :type string :initarg :description | 151 | ((summary :type string :initarg :summary |
| 152 | :reader xref--xref-description) | 152 | :reader xref--xref-summary) |
| 153 | (location :initarg :location | 153 | (location :initarg :location |
| 154 | :reader xref--xref-location)) | 154 | :reader xref--xref-location)) |
| 155 | :comment "An xref is used to display and locate constructs like | 155 | :comment "An xref is used to display and locate constructs like |
| 156 | variables or functions.") | 156 | variables or functions.") |
| 157 | 157 | ||
| 158 | (defun xref-make (description location) | 158 | (defun xref-make (summary location) |
| 159 | "Create and return a new xref. | 159 | "Create and return a new xref item. |
| 160 | DESCRIPTION is a short string to describe the xref. | 160 | SUMMARY is a short string to describe the xref. |
| 161 | LOCATION is an `xref-location'." | 161 | LOCATION is an `xref-location'." |
| 162 | (make-instance 'xref--xref :description description :location location)) | 162 | (make-instance 'xref--xref :summary summary :location location)) |
| 163 | 163 | ||
| 164 | 164 | ||
| 165 | ;;; API | 165 | ;;; API |
| @@ -534,7 +534,7 @@ GROUP is a string for decoration purposes and XREF is an | |||
| 534 | do | 534 | do |
| 535 | (xref--insert-propertized '(face compilation-info) group "\n") | 535 | (xref--insert-propertized '(face compilation-info) group "\n") |
| 536 | (cl-loop for (xref . more2) on xrefs do | 536 | (cl-loop for (xref . more2) on xrefs do |
| 537 | (with-slots (description location) xref | 537 | (with-slots (summary location) xref |
| 538 | (let* ((line (xref-location-line location)) | 538 | (let* ((line (xref-location-line location)) |
| 539 | (prefix | 539 | (prefix |
| 540 | (if line | 540 | (if line |
| @@ -549,7 +549,7 @@ GROUP is a string for decoration purposes and XREF is an | |||
| 549 | 'help-echo | 549 | 'help-echo |
| 550 | (concat "mouse-2: display in another window, " | 550 | (concat "mouse-2: display in another window, " |
| 551 | "RET or mouse-1: follow reference")) | 551 | "RET or mouse-1: follow reference")) |
| 552 | prefix description))) | 552 | prefix summary))) |
| 553 | (insert "\n")))) | 553 | (insert "\n")))) |
| 554 | 554 | ||
| 555 | (defun xref--analyze (xrefs) | 555 | (defun xref--analyze (xrefs) |