From 3dda11032f9f49c285b0433b47802ceed2ade406 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Thu, 4 Feb 2016 12:21:03 +0300 Subject: [PATCH 1/7] Remove 'def X' from the example * test/etags/ruby-src/test1.ru (A::B): Remove 'def X' (http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00167.html). * test/etags/CTAGS.good: * test/etags/ETAGS.good_1: * test/etags/ETAGS.good_2: * test/etags/ETAGS.good_3: * test/etags/ETAGS.good_4: * test/etags/ETAGS.good_5: * test/etags/ETAGS.good_6: Adjust accordingly. --- test/etags/CTAGS.good | 29 ++++++++++++++--------------- test/etags/ETAGS.good_1 | 31 +++++++++++++++---------------- test/etags/ETAGS.good_2 | 31 +++++++++++++++---------------- test/etags/ETAGS.good_3 | 31 +++++++++++++++---------------- test/etags/ETAGS.good_4 | 31 +++++++++++++++---------------- test/etags/ETAGS.good_5 | 31 +++++++++++++++---------------- test/etags/ETAGS.good_6 | 31 +++++++++++++++---------------- test/etags/ruby-src/test1.ru | 21 ++++++++++----------- 8 files changed, 114 insertions(+), 122 deletions(-) diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good index b78c194ac44..58b1db6b0a3 100644 --- a/test/etags/CTAGS.good +++ b/test/etags/CTAGS.good @@ -454,7 +454,7 @@ Condition_Variable/t ada-src/2ataspri.ads /^ type Condition_Variable is privat Condition_Variable/t ada-src/2ataspri.ads /^ type Condition_Variable is$/ Configure pyt-src/server.py /^class Configure(Frame, ControlEdit):$/ ConfirmQuit pyt-src/server.py /^def ConfirmQuit(frame, context):$/ -Constant ruby-src/test1.ru 39 +Constant ruby-src/test1.ru 38 ControlEdit pyt-src/server.py /^class ControlEdit(Frame):$/ Controls pyt-src/server.py /^class Controls:$/ CopyTextString pas-src/common.pas /^function CopyTextString;(*($/ @@ -1491,7 +1491,6 @@ WorkingDays cp-src/functions.cpp /^int WorkingDays(Date a, Date b){$/ Write_Lock/p ada-src/2ataspri.adb /^ procedure Write_Lock (L : in out Lock; Ceiling_/ Write_Lock/p ada-src/2ataspri.ads /^ procedure Write_Lock (L : in out Lock; Ceiling_/ X c-src/h.h 100 -X ruby-src/test1.ru /^ def X$/ XBOOL_VECTOR c-src/emacs/src/lisp.h /^XBOOL_VECTOR (Lisp_Object a)$/ XBUFFER c-src/emacs/src/lisp.h /^XBUFFER (Lisp_Object a)$/ XBUFFER_OBJFWD c-src/emacs/src/lisp.h /^XBUFFER_OBJFWD (union Lisp_Fwd *a)$/ @@ -2556,12 +2555,12 @@ bar c-src/c.c /^void bar() {while(0) {}}$/ bar c.c 143 bar c-src/h.h 19 bar cp-src/x.cc /^XX::bar()$/ -bar= ruby-src/test1.ru /^ attr_writer :bar,$/ +bar= ruby-src/test1.ru /^ attr_writer :bar,$/ bas_syn prol-src/natded.prolog /^bas_syn(n(_)).$/ base c-src/emacs/src/lisp.h 2188 base cp-src/c.C /^double base (void) const { return rng_base; }$/ base cp-src/Range.h /^ double base (void) const { return rng_base; }$/ -baz= ruby-src/test1.ru /^ :baz,$/ +baz= ruby-src/test1.ru /^ :baz,$/ bb c.c 275 bbb c.c 251 bbbbbb c-src/h.h 113 @@ -3007,7 +3006,7 @@ foo f-src/entry.for /^ character*(*) function foo()$/ foo f-src/entry.strange_suffix /^ character*(*) function foo()$/ foo f-src/entry.strange /^ character*(*) function foo()$/ foo php-src/ptest.php /^foo()$/ -foo ruby-src/test1.ru /^ attr_reader :foo$/ +foo ruby-src/test1.ru /^ attr_reader :foo$/ foo! ruby-src/test1.ru /^ def foo!$/ foobar c-src/c.c /^int foobar() {;}$/ foobar c.c /^extern void foobar (void) __attribute__ ((section / @@ -3515,7 +3514,7 @@ modifier_symbols c-src/emacs/src/keyboard.c 6327 modify_event_symbol c-src/emacs/src/keyboard.c /^modify_event_symbol (ptrdiff_t symbol_num, int mod/ module_class_method ruby-src/test.rb /^ def ModuleExample.module_class_method$/ module_instance_method ruby-src/test.rb /^ def module_instance_method$/ -more= ruby-src/test1.ru /^ :more$/ +more= ruby-src/test1.ru /^ :more$/ more_aligned_int c.c 165 morecore_nolock c-src/emacs/src/gmalloc.c /^morecore_nolock (size_t size)$/ morecore_recursing c-src/emacs/src/gmalloc.c 604 @@ -3881,7 +3880,7 @@ questo ../c/c.web 34 quiettest make-src/Makefile /^quiettest:$/ quit_char c-src/emacs/src/keyboard.c 192 quit_throw_to_read_char c-src/emacs/src/keyboard.c /^quit_throw_to_read_char (bool from_signal)$/ -qux ruby-src/test1.ru /^ alias_method :qux, :tee, attr_accessor :bogu/ +qux ruby-src/test1.ru /^ alias_method :qux, :tee, attr_accessor :bogus$/ qux= ruby-src/test1.ru /^ def qux=(tee)$/ r0 c-src/sysdep.h 54 r1 c-src/sysdep.h 55 @@ -3906,8 +3905,8 @@ read cp-src/conway.hpp /^ char read() { return alive; }$/ read php-src/lce_functions.php /^ function read()$/ read-key-sequence c-src/emacs/src/keyboard.c /^DEFUN ("read-key-sequence", Fread_key_sequence, Sr/ read-key-sequence-vector c-src/emacs/src/keyboard.c /^DEFUN ("read-key-sequence-vector", Fread_key_seque/ -read1 ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :wr/ -read2 ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :wr/ +read1 ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :writ/ +read2 ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :writ/ read_char c-src/emacs/src/keyboard.c /^read_char (int commandflag, Lisp_Object map,$/ read_char_help_form_unwind c-src/emacs/src/keyboard.c /^read_char_help_form_unwind (void)$/ read_char_minibuf_menu_prompt c-src/emacs/src/keyboard.c /^read_char_minibuf_menu_prompt (int commandflag,$/ @@ -4166,7 +4165,7 @@ substitute c-src/etags.c /^substitute (char *in, char *out, struct re_registe/ subsubsec=\relax tex-src/texinfo.tex /^\\let\\appendixsubsubsec=\\relax$/ subsubsection perl-src/htlmify-cystic 27 subsubsection=\relax tex-src/texinfo.tex /^\\let\\appendixsubsubsection=\\relax$/ -subtle ruby-src/test1.ru /^ :tee ; attr_reader :subtle$/ +subtle ruby-src/test1.ru /^ :tee ; attr_reader :subtle$/ subtree prol-src/natded.prolog /^subtree(T,T).$/ suffix c-src/etags.c 186 suffixes c-src/etags.c 195 @@ -4283,8 +4282,8 @@ tags-with-face el-src/emacs/lisp/progmodes/etags.el /^(defmacro tags-with-face ( target_multibyte c-src/emacs/src/regex.h 407 tcpdump html-src/software.html /^tcpdump$/ teats cp-src/c.C 127 -tee ruby-src/test1.ru /^ attr_accessor :tee$/ -tee= ruby-src/test1.ru /^ attr_accessor :tee$/ +tee ruby-src/test1.ru /^ attr_accessor :tee$/ +tee= ruby-src/test1.ru /^ attr_accessor :tee$/ temporarily_switch_to_single_kboard c-src/emacs/src/keyboard.c /^temporarily_switch_to_single_kboard (struct frame / tend c-src/etags.c 2432 terminate objc-src/Subprocess.m /^- terminate:sender$/ @@ -4453,8 +4452,8 @@ womboid c-src/h.h 75 word_size c-src/emacs/src/lisp.h 1473 write php-src/lce_functions.php /^ function write()$/ write php-src/lce_functions.php /^ function write($save="yes")$/ -write1= ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :wr/ -write2= ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :wr/ +write1= ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :writ/ +write2= ruby-src/test1.ru /^ attr_reader :read1 , :read2; attr_writer :writ/ write_abbrev c-src/abbrev.c /^write_abbrev (sym, stream)$/ write_classname c-src/etags.c /^write_classname (linebuffer *cn, const char *quali/ write_lex prol-src/natded.prolog /^write_lex(File):-$/ @@ -4495,7 +4494,7 @@ xref-location-marker el-src/emacs/lisp/progmodes/etags.el /^(cl-defmethod xref-l xref-make-etags-location el-src/emacs/lisp/progmodes/etags.el /^(defun xref-make-etags-location (tag-info file)$/ xrnew c-src/etags.c /^#define xrnew(op, n, Type) ((op) = (Type *) xreall/ xx make-src/Makefile /^xx="this line is here because of a fontlock bug$/ -xyz ruby-src/test1.ru /^ alias_method :xyz,$/ +xyz ruby-src/test1.ru /^ alias_method :xyz,$/ y cp-src/conway.hpp 7 y cp-src/clheir.hpp 49 y cp-src/clheir.hpp 58 diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1 index 1390187863f..90bbe774f05 100644 --- a/test/etags/ETAGS.good_1 +++ b/test/etags/ETAGS.good_1 @@ -3061,7 +3061,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,828 +ruby-src/test1.ru,785 class A1,0 def a(2,8 def b(5,38 @@ -3073,21 +3073,20 @@ module A9,57 def foo!15,121 def self._bar?(_bar?18,143 def qux=(qux=22,194 - def X25,232 - attr_reader :foofoo26,242 - attr_reader :read1 read127,265 - attr_reader :read1 , :read2;read227,265 - attr_reader :read1 , :read2; attr_writer :write1,write1=27,265 - attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265 - attr_writer :bar,bar=28,329 - :baz,baz=29,353 - :moremore=30,377 - attr_accessor :teetee31,401 - attr_accessor :teetee=31,401 - alias_method :qux,qux32,426 - alias_method :xyz,xyz33,478 - :tee ; attr_reader :subtlesubtle34,503 -A::Constant Constant39,568 + attr_reader :foofoo26,233 + attr_reader :read1 read127,254 + attr_reader :read1 , :read2;read227,254 + attr_reader :read1 , :read2; attr_writer :write1,write1=27,254 + attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254 + attr_writer :bar,bar=28,316 + :baz,baz=29,338 + :moremore=30,360 + attr_accessor :teetee31,382 + attr_accessor :teetee=31,382 + alias_method :qux,qux32,405 + alias_method :xyz,xyz33,455 + :tee ; attr_reader :subtlesubtle34,478 +A::Constant Constant38,533 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2 index f8b1546ef48..d774bb1b190 100644 --- a/test/etags/ETAGS.good_2 +++ b/test/etags/ETAGS.good_2 @@ -3631,7 +3631,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,828 +ruby-src/test1.ru,785 class A1,0 def a(2,8 def b(5,38 @@ -3643,21 +3643,20 @@ module A9,57 def foo!15,121 def self._bar?(_bar?18,143 def qux=(qux=22,194 - def X25,232 - attr_reader :foofoo26,242 - attr_reader :read1 read127,265 - attr_reader :read1 , :read2;read227,265 - attr_reader :read1 , :read2; attr_writer :write1,write1=27,265 - attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265 - attr_writer :bar,bar=28,329 - :baz,baz=29,353 - :moremore=30,377 - attr_accessor :teetee31,401 - attr_accessor :teetee=31,401 - alias_method :qux,qux32,426 - alias_method :xyz,xyz33,478 - :tee ; attr_reader :subtlesubtle34,503 -A::Constant Constant39,568 + attr_reader :foofoo26,233 + attr_reader :read1 read127,254 + attr_reader :read1 , :read2;read227,254 + attr_reader :read1 , :read2; attr_writer :write1,write1=27,254 + attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254 + attr_writer :bar,bar=28,316 + :baz,baz=29,338 + :moremore=30,360 + attr_accessor :teetee31,382 + attr_accessor :teetee=31,382 + alias_method :qux,qux32,405 + alias_method :xyz,xyz33,455 + :tee ; attr_reader :subtlesubtle34,478 +A::Constant Constant38,533 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3 index a1e895af7f6..e3855a59309 100644 --- a/test/etags/ETAGS.good_3 +++ b/test/etags/ETAGS.good_3 @@ -3408,7 +3408,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,828 +ruby-src/test1.ru,785 class A1,0 def a(2,8 def b(5,38 @@ -3420,21 +3420,20 @@ module A9,57 def foo!15,121 def self._bar?(_bar?18,143 def qux=(qux=22,194 - def X25,232 - attr_reader :foofoo26,242 - attr_reader :read1 read127,265 - attr_reader :read1 , :read2;read227,265 - attr_reader :read1 , :read2; attr_writer :write1,write1=27,265 - attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265 - attr_writer :bar,bar=28,329 - :baz,baz=29,353 - :moremore=30,377 - attr_accessor :teetee31,401 - attr_accessor :teetee=31,401 - alias_method :qux,qux32,426 - alias_method :xyz,xyz33,478 - :tee ; attr_reader :subtlesubtle34,503 -A::Constant Constant39,568 + attr_reader :foofoo26,233 + attr_reader :read1 read127,254 + attr_reader :read1 , :read2;read227,254 + attr_reader :read1 , :read2; attr_writer :write1,write1=27,254 + attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254 + attr_writer :bar,bar=28,316 + :baz,baz=29,338 + :moremore=30,360 + attr_accessor :teetee31,382 + attr_accessor :teetee=31,382 + alias_method :qux,qux32,405 + alias_method :xyz,xyz33,455 + :tee ; attr_reader :subtlesubtle34,478 +A::Constant Constant38,533 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4 index 32390fab324..dbae59bd59e 100644 --- a/test/etags/ETAGS.good_4 +++ b/test/etags/ETAGS.good_4 @@ -3225,7 +3225,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,828 +ruby-src/test1.ru,785 class A1,0 def a(2,8 def b(5,38 @@ -3237,21 +3237,20 @@ module A9,57 def foo!15,121 def self._bar?(_bar?18,143 def qux=(qux=22,194 - def X25,232 - attr_reader :foofoo26,242 - attr_reader :read1 read127,265 - attr_reader :read1 , :read2;read227,265 - attr_reader :read1 , :read2; attr_writer :write1,write1=27,265 - attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265 - attr_writer :bar,bar=28,329 - :baz,baz=29,353 - :moremore=30,377 - attr_accessor :teetee31,401 - attr_accessor :teetee=31,401 - alias_method :qux,qux32,426 - alias_method :xyz,xyz33,478 - :tee ; attr_reader :subtlesubtle34,503 -A::Constant Constant39,568 + attr_reader :foofoo26,233 + attr_reader :read1 read127,254 + attr_reader :read1 , :read2;read227,254 + attr_reader :read1 , :read2; attr_writer :write1,write1=27,254 + attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254 + attr_writer :bar,bar=28,316 + :baz,baz=29,338 + :moremore=30,360 + attr_accessor :teetee31,382 + attr_accessor :teetee=31,382 + alias_method :qux,qux32,405 + alias_method :xyz,xyz33,455 + :tee ; attr_reader :subtlesubtle34,478 +A::Constant Constant38,533 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5 index ee19bcfc9d2..9ea77977ab6 100644 --- a/test/etags/ETAGS.good_5 +++ b/test/etags/ETAGS.good_5 @@ -4142,7 +4142,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,828 +ruby-src/test1.ru,785 class A1,0 def a(2,8 def b(5,38 @@ -4154,21 +4154,20 @@ module A9,57 def foo!15,121 def self._bar?(_bar?18,143 def qux=(qux=22,194 - def X25,232 - attr_reader :foofoo26,242 - attr_reader :read1 read127,265 - attr_reader :read1 , :read2;read227,265 - attr_reader :read1 , :read2; attr_writer :write1,write1=27,265 - attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265 - attr_writer :bar,bar=28,329 - :baz,baz=29,353 - :moremore=30,377 - attr_accessor :teetee31,401 - attr_accessor :teetee=31,401 - alias_method :qux,qux32,426 - alias_method :xyz,xyz33,478 - :tee ; attr_reader :subtlesubtle34,503 -A::Constant Constant39,568 + attr_reader :foofoo26,233 + attr_reader :read1 read127,254 + attr_reader :read1 , :read2;read227,254 + attr_reader :read1 , :read2; attr_writer :write1,write1=27,254 + attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254 + attr_writer :bar,bar=28,316 + :baz,baz=29,338 + :moremore=30,360 + attr_accessor :teetee31,382 + attr_accessor :teetee=31,382 + alias_method :qux,qux32,405 + alias_method :xyz,xyz33,455 + :tee ; attr_reader :subtlesubtle34,478 +A::Constant Constant38,533 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 diff --git a/test/etags/ETAGS.good_6 b/test/etags/ETAGS.good_6 index f4d9ab8c1a1..7420a41b108 100644 --- a/test/etags/ETAGS.good_6 +++ b/test/etags/ETAGS.good_6 @@ -4142,7 +4142,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,828 +ruby-src/test1.ru,785 class A1,0 def a(2,8 def b(5,38 @@ -4154,21 +4154,20 @@ module A9,57 def foo!15,121 def self._bar?(_bar?18,143 def qux=(qux=22,194 - def X25,232 - attr_reader :foofoo26,242 - attr_reader :read1 read127,265 - attr_reader :read1 , :read2;read227,265 - attr_reader :read1 , :read2; attr_writer :write1,write1=27,265 - attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265 - attr_writer :bar,bar=28,329 - :baz,baz=29,353 - :moremore=30,377 - attr_accessor :teetee31,401 - attr_accessor :teetee=31,401 - alias_method :qux,qux32,426 - alias_method :xyz,xyz33,478 - :tee ; attr_reader :subtlesubtle34,503 -A::Constant Constant39,568 + attr_reader :foofoo26,233 + attr_reader :read1 read127,254 + attr_reader :read1 , :read2;read227,254 + attr_reader :read1 , :read2; attr_writer :write1,write1=27,254 + attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254 + attr_writer :bar,bar=28,316 + :baz,baz=29,338 + :moremore=30,360 + attr_accessor :teetee31,382 + attr_accessor :teetee=31,382 + alias_method :qux,qux32,405 + alias_method :xyz,xyz33,455 + :tee ; attr_reader :subtlesubtle34,478 +A::Constant Constant38,533 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 diff --git a/test/etags/ruby-src/test1.ru b/test/etags/ruby-src/test1.ru index bc9dbec36a2..93888c1040b 100644 --- a/test/etags/ruby-src/test1.ru +++ b/test/etags/ruby-src/test1.ru @@ -22,17 +22,16 @@ module A def qux=(tee) end end - def X - attr_reader :foo - attr_reader :read1 , :read2; attr_writer :write1, :write2 - attr_writer :bar, - :baz, - :more - attr_accessor :tee - alias_method :qux, :tee, attr_accessor :bogus - alias_method :xyz, - :tee ; attr_reader :subtle - end + + attr_reader :foo + attr_reader :read1 , :read2; attr_writer :write1, :write2 + attr_writer :bar, + :baz, + :more + attr_accessor :tee + alias_method :qux, :tee, attr_accessor :bogus + alias_method :xyz, + :tee ; attr_reader :subtle end end From 35fc77dcebc7b097365fe05a33b9a627203a5f83 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 4 Feb 2016 07:29:35 -0800 Subject: [PATCH 2/7] Spelling fixes --- etc/NEWS | 2 +- lisp/erc/erc.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index d4691b908e8..0fc4b4dd982 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -429,7 +429,7 @@ specified message types for the respective specified targets. *** Reconnection is now asynchronous. --- -*** Nick completion is now case-insentive again after inadvertently +*** Nick completion is now case-insensitive again after inadvertently being made case-sensitive in Emacs 24.2. ** Midnight-mode diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index ef3a6b3b3ca..295c2c055e2 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -3992,7 +3992,7 @@ Prompt for one if called interactively." (format "MODE %s -k" tgt))))) (defun erc-completion-at-point () - "Perform complection on the text around point case-insentitively. + "Perform completion on the text around point case-insensitively. See `completion-at-point'." (interactive) (let ((completion-ignore-case t)) From 4236944f19cb4df69dd3ae95fdcace83b76d4554 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 4 Feb 2016 19:23:12 +0200 Subject: [PATCH 3/7] Minor fix in tagging Ruby accessors by etags * lib-src/etags.c (Ruby_functions): Don't tag accessors whose names are not literal symbols. (Bug#22241) --- lib-src/etags.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib-src/etags.c b/lib-src/etags.c index bb2758941a4..0f5bfa3a951 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -4732,9 +4732,10 @@ Ruby_functions (FILE *inf) do { char *np = cp; - if (*np == ':') - np++; cp = skip_name (cp); + if (*np != ':') + continue; + np++; if (reader) { make_tag (np, cp - np, true, From 448522201a12413b6fd4f059202b4d9a79ad3699 Mon Sep 17 00:00:00 2001 From: Ulf Jasper Date: Thu, 4 Feb 2016 18:31:04 +0100 Subject: [PATCH 4/7] Improve newsticker-treeview-selection-face * newst-treeview.el (newsticker-treeview-selection-face): Improve readability for dark background. --- lisp/net/newst-treeview.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 4de3d1d1125..c995af58c27 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -77,7 +77,7 @@ :group 'newsticker-treeview) (defface newsticker-treeview-selection-face - '((((class color) (background dark)) :background "#bbbbff") + '((((class color) (background dark)) :background "#4444aa") (((class color) (background light)) :background "#bbbbff")) "Face for newsticker selection." :group 'newsticker-treeview) From 9dfece1413846e4df438cd20956c58e12c84dea3 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Thu, 4 Feb 2016 19:01:50 +0000 Subject: [PATCH 5/7] Correctly fontify C++ initializations which "look like" functions. Fixes bug#7579. lisp/progmodes/cc-engine.el (c-forward-declarator): Add extra optional parameter to enable handling of "anonymous" declarators in declarations. lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Check more rigorously whether a "(" opens a parameter list of a function, or an initialization of a variable. --- lisp/progmodes/cc-engine.el | 23 ++++++++++++++++------- lisp/progmodes/cc-fonts.el | 25 +++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index b75d667d318..d30447fe554 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -6808,7 +6808,7 @@ comment at the start of cc-engine.el for more info." ;; This identifier is bound only in the inner let. '(setq start id-start)))) -(defun c-forward-declarator (&optional limit) +(defun c-forward-declarator (&optional limit accept-anon) ;; Assuming point is at the start of a declarator, move forward over it, ;; leaving point at the next token after it (e.g. a ) or a ; or a ,). ;; @@ -6817,6 +6817,11 @@ comment at the start of cc-engine.el for more info." ;; BRACKETS-AFTER-ID is non-nil if a [...] pair is present after the id. ;; GOT-INIT is non-nil when the declarator is followed by "=" or "(". ;; + ;; If ACCEPT-ANON is non-nil, move forward over any "anonymous declarator", + ;; i.e. something like the (*) in int (*), such as might be found in a + ;; declaration. In such a case ID-START and ID-END in the return value are + ;; both set to nil. A "null" "anonymous declarator" gives a non-nil result. + ;; ;; If no declarator is found, leave point unmoved and return nil. LIMIT is ;; an optional limit for forward searching. ;; @@ -6871,13 +6876,17 @@ comment at the start of cc-engine.el for more info." ;; If we haven't passed the identifier already, do it now. (unless got-identifier - (setq id-start (point)) - (c-forward-name)) - (prog1 - (/= (point) here) + (setq id-start (point))) + (cond + ((or got-identifier + (c-forward-name)) (save-excursion (c-backward-syntactic-ws) - (setq id-end (point))))) + (setq id-end (point)))) + (accept-anon + (setq id-start nil id-end nil) + t) + (t (/= (point) here)))) ;; Skip out of the parens surrounding the identifier. If closing ;; parens are missing, this form returns nil. @@ -7266,7 +7275,7 @@ comment at the start of cc-engine.el for more info." (goto-char id-start) ;; Skip over type decl prefix operators. (Note similar code in - ;; `c-font-lock-declarators'.) + ;; `c-forward-declarator'.) (if (and c-recognize-typeless-decls (equal c-type-decl-prefix-key "\\<\\>")) (when (eq (char-after) ?\() diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 1e101d12aac..3cc537bba3d 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1008,7 +1008,7 @@ casts and declarations are fontified. Used on level 2 and higher." ((pos (point)) next-pos id-start id-end decl-res paren-depth - id-face got-init + id-face got-type got-init c-last-identifier-range (separator-prop (if types 'c-decl-type-start 'c-decl-id-start)) brackets-after-id) @@ -1020,7 +1020,28 @@ casts and declarations are fontified. Used on level 2 and higher." (setq next-pos (point) id-start (car decl-res) id-face (if (and (eq (char-after) ?\() - (not (car (cddr decl-res)))) ; brackets-after-id + (not (car (cddr decl-res))) ; brackets-after-id + (or (not (c-major-mode-is 'c++-mode)) + (save-excursion + (let (c-last-identifier-range) + (forward-char) + (c-forward-syntactic-ws) + (catch 'is-function + (while + (progn + (if (eq (char-after) ?\)) + (throw 'is-function t)) + (setq got-type (c-forward-type)) + (cond + ((null got-type) + (throw 'is-function nil)) + ((not (eq got-type 'maybe)) + (throw 'is-function t))) + (c-forward-declarator limit t) + (eq (char-after) ?,)) + (forward-char) + (c-forward-syntactic-ws)) + t))))) 'font-lock-function-name-face 'font-lock-variable-name-face) got-init (and (cadr (cddr decl-res)) ; got-init From 71a04969c4dc6c1963359b663ccf76abf0862988 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Fri, 5 Feb 2016 09:48:17 +0800 Subject: [PATCH 6/7] * lisp/custom.el (defface): Revert indentation change. (Bug#22524) --- lisp/custom.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/custom.el b/lisp/custom.el index 550ba440c0f..f4045008ebf 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -411,8 +411,7 @@ In the ATTS property list, possible attributes are `:family', See Info node `(elisp) Faces' in the Emacs Lisp manual for more information." - (declare (doc-string 3) - (indent 1)) + (declare (doc-string 3)) ;; It is better not to use backquote in this file, ;; because that makes a bootstrapping problem ;; if you need to recompile all the Lisp files using interpreted code. From 2c117fc7e283ad20f404c392be433c74f5cf8a4e Mon Sep 17 00:00:00 2001 From: Mark Oteiza Date: Fri, 5 Feb 2016 01:26:13 -0500 Subject: [PATCH 7/7] * etc/NEWS: Document new mpc.el features --- etc/NEWS | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 0fc4b4dd982..975c26cf70d 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -432,6 +432,33 @@ specified message types for the respective specified targets. *** Nick completion is now case-insensitive again after inadvertently being made case-sensitive in Emacs 24.2. +** MPC + +--- +*** New commands, key binds, and menu items. + +**** `<' and `>' for navigating previous and next tracks in playlist + +**** New play/pause command `mpc-toggle-play' bound to `s' + +**** `g' bound to new command `mpc-seek-current' will navigate current + track. + +**** New commands `mpc-toggle-{consume,repeat,single,shuffle}' for + toggling playback modes. + +--- +*** Now supports connecting to a UNIX domain socket. + +--- +*** Looks at more image file names to use as album art. +Case-insensitively tries for .folder.png (freedesktop) and folder.jpg +(XP) in addition to cover.jpg. + +--- +*** Searches in more locations for MPD configuration files. +MPD supports the XDG base directory specification since version 0.17.6. + ** Midnight-mode ---