Attachment 229720 Details for Bug 260041 – diff between ports erlang and erlang/otp git repo

[patch] diff between ports erlang and erlang/otp git repo

erlang.el.diff (text/plain), 2.82 KB, created by courtney.hicks1 on 2021-11-25 08:47:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: courtney.hicks1

Created: 2021-11-25 08:47:42 UTC

Size: 2.82 KB

patch

obsolete

>5123,5124c5123,5124
>< ;; etags information structures (class xref-etags-location) will be
>< ;; translated to our own structures which include arity (class
>---
>> ;; etags information structures (struct xref-etags-location) will be
>> ;; translated to our own structures which include arity (struct
>5131a5132,5136
>> ;; NOTE: Around Sept 2021, the xrefs package changed all of its defined types
>> ;; (i.e.  xref-location, xref-file-location) from EIEIO classes to CL-Lib
>> ;; structures. These are both supported. Older Emacsen with earlier versions of
>> ;; xref will continue to use defclass. Newer Emacsen will use cl-defstruct.
>> 
>5139a5145
>>            (erlang-soft-require 'cl-lib)
>5168,5171c5174,5187
><       (defclass erlang-xref-location (xref-file-location)
><         ((arity :type fixnum :initarg :arity
><                 :reader erlang-xref-location-arity))
><         :documentation "An erlang location is a file location plus arity.")
>---
>>       ;; Xref 1.3.1 bundled with Emacs 28+ switched from using EIEIO classes to
>>       ;; using CL-Lib structs.
>>       (if (find-class 'xref-file-location)
>>           (progn
>>             (defclass erlang-xref-location (xref-file-location)
>>               ((arity :type fixnum :initarg :arity
>>                       :reader erlang-xref-location-arity))
>>               :documentation "An erlang location is a file location plus arity.")
>>             ;; Make a constructor with the same name that a CL structure would have.
>>             (defalias 'make-erlang-xref-location 'erlang-xref-location))
>>         (cl-defstruct (erlang-xref-location
>>                        (:include xref-file-location))
>>           "An erlang location is a file location plus arity."
>>           (arity 0 :type fixnum)))
>5334,5335c5350
><                (fboundp 'xref-location-group)
><                (fboundp 'slot-value))
>---
>>                (fboundp 'xref-location-group))
>5360c5375,5376
><   (when (fboundp 'make-instance)
>---
>>   (when (and (fboundp 'make-erlang-xref-location)
>>              (fboundp 'xref-make))
>5372,5376c5388,5392
><                    for loc = (make-instance 'erlang-xref-location
><                                             :file file
><                                             :line (line-number-at-pos)
><                                             :column 0
><                                             :arity arity)
>---
>>                    for loc = (make-erlang-xref-location
>>                               :file file
>>                               :line (line-number-at-pos)
>>                               :column 0
>>                               :arity arity)
>5380,5382c5396
><                    collect (make-instance 'xref-item
><                                           :summary sum
><                                           :location loc)
>---
>>                    collect (xref-make sum loc)
>6303a6318
>>

Actions: View | Diff

Attachments on bug 260041: 229720