From 4fba36ce11978892dcd4f566b528e57ae12e5bf3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 24 Jun 2015 16:32:09 -0400 Subject: [PATCH] * 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. --- lisp/progmodes/xref.el | 8 ++++---- 1 file 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.") (point-marker)))))) (cl-defmethod xref-location-group ((l xref-file-location)) - (oref l :file)) + (oref l file)) (defclass xref-buffer-location (xref-location) ((buffer :type buffer :initarg :buffer) @@ -139,7 +139,7 @@ actual location is not known.") (make-instance 'xref-bogus-location :message message)) (cl-defmethod xref-location-marker ((l xref-bogus-location)) - (user-error "%s" (oref l :message))) + (user-error "%s" (oref l message))) (cl-defmethod xref-location-group ((_ xref-bogus-location)) "(No location)") @@ -529,7 +529,7 @@ GROUP is a string for decoration purposes and XREF is an for max-line-width = (cl-loop for xref in xrefs maximize (let ((line (xref-location-line - (oref xref :location)))) + (oref xref location)))) (length (and line (format "%d" line))))) for line-format = (and max-line-width (format "%%%dd: " max-line-width)) @@ -733,7 +733,7 @@ tools are used, and when." (let* ((default-directory dir) (semantic-symref-tool 'detect) (res (semantic-symref-find-references-by-name symbol 'subdirs)) - (hits (and res (oref res :hit-lines))) + (hits (and res (oref res hit-lines))) (orig-buffers (buffer-list))) (unwind-protect (delq nil -- 2.39.2