aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2015-06-24 16:32:09 -0400
committerStefan Monnier2015-06-24 16:32:09 -0400
commit4fba36ce11978892dcd4f566b528e57ae12e5bf3 (patch)
treedac670ab2e565bb55520e1e5014c6a8135a5f6fc
parent94c4e0dcdf2b81dcdafb77ffb9ad520aec725376 (diff)
downloademacs-4fba36ce11978892dcd4f566b528e57ae12e5bf3.tar.gz
emacs-4fba36ce11978892dcd4f566b528e57ae12e5bf3.zip
* lisp/progmodes/xref.el: Avoid init-args in oref.
* lisp/progmodes/xref.el (xref-location-group, xref-location-marker) (xref--insert-xrefs, xref-collect-references): Avoid init-args in oref.
-rw-r--r--lisp/progmodes/xref.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 89a9cf5d5ea..469f65d4fa6 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -107,7 +107,7 @@ Line numbers start from 1 and columns from 0.")
107 (point-marker)))))) 107 (point-marker))))))
108 108
109(cl-defmethod xref-location-group ((l xref-file-location)) 109(cl-defmethod xref-location-group ((l xref-file-location))
110 (oref l :file)) 110 (oref l file))
111 111
112(defclass xref-buffer-location (xref-location) 112(defclass xref-buffer-location (xref-location)
113 ((buffer :type buffer :initarg :buffer) 113 ((buffer :type buffer :initarg :buffer)
@@ -139,7 +139,7 @@ actual location is not known.")
139 (make-instance 'xref-bogus-location :message message)) 139 (make-instance 'xref-bogus-location :message message))
140 140
141(cl-defmethod xref-location-marker ((l xref-bogus-location)) 141(cl-defmethod xref-location-marker ((l xref-bogus-location))
142 (user-error "%s" (oref l :message))) 142 (user-error "%s" (oref l message)))
143 143
144(cl-defmethod xref-location-group ((_ xref-bogus-location)) "(No location)") 144(cl-defmethod xref-location-group ((_ xref-bogus-location)) "(No location)")
145 145
@@ -529,7 +529,7 @@ GROUP is a string for decoration purposes and XREF is an
529 for max-line-width = 529 for max-line-width =
530 (cl-loop for xref in xrefs 530 (cl-loop for xref in xrefs
531 maximize (let ((line (xref-location-line 531 maximize (let ((line (xref-location-line
532 (oref xref :location)))) 532 (oref xref location))))
533 (length (and line (format "%d" line))))) 533 (length (and line (format "%d" line)))))
534 for line-format = (and max-line-width 534 for line-format = (and max-line-width
535 (format "%%%dd: " max-line-width)) 535 (format "%%%dd: " max-line-width))
@@ -733,7 +733,7 @@ tools are used, and when."
733 (let* ((default-directory dir) 733 (let* ((default-directory dir)
734 (semantic-symref-tool 'detect) 734 (semantic-symref-tool 'detect)
735 (res (semantic-symref-find-references-by-name symbol 'subdirs)) 735 (res (semantic-symref-find-references-by-name symbol 'subdirs))
736 (hits (and res (oref res :hit-lines))) 736 (hits (and res (oref res hit-lines)))
737 (orig-buffers (buffer-list))) 737 (orig-buffers (buffer-list)))
738 (unwind-protect 738 (unwind-protect
739 (delq nil 739 (delq nil