commit d3d50a9c99ef42a270127fe0f5a9e435eb760079 (HEAD, refs/remotes/origin/master) Author: Oleh Krehel Date: Mon May 18 10:07:03 2015 +0200 Allow checkdoc to be called in batch * lisp/emacs-lisp/checkdoc.el (checkdoc-error): When `noninteractive' is non-nil, echo the error with `warn'. How it can be used in -batch: (with-current-buffer (find-file "checkdoc.el") (checkdoc-current-buffer t)) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 777fed0..b3ef44a 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -2613,9 +2613,12 @@ function called to create the messages." (count-lines (point-min) (or point (point-min)))) ": " msg))) (with-current-buffer (get-buffer checkdoc-diagnostic-buffer) - (goto-char (point-max)) - (let ((inhibit-read-only t)) - (apply #'insert text))))) + (let ((inhibit-read-only t) + (pt (point-max))) + (goto-char pt) + (apply #'insert text) + (when noninteractive + (warn (buffer-substring pt (point-max)))))))) (defun checkdoc-show-diagnostics () "Display the checkdoc diagnostic buffer in a temporary window." commit 8ae43eec7d49f468411bd1aea285be1d3ed0aa4a Author: Glenn Morris Date: Sun May 17 23:02:10 2015 -0700 * lisp/calendar/solar.el (solar-ecliptic-coordinates): Use float-pi. diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 25a24ee..a2f9d58 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -346,7 +346,7 @@ If SUNRISE-FLAG is non-nil, only calculate longitude and inclination." (solar-cosine-degrees (* 2 l))) (* -0.5 y y (solar-sin-degrees (* 4 l))) (* -1.25 ecc ecc (solar-sin-degrees (* 2 m))))) - 3.1415926535)))) + float-pi)))) (list app i time-eq nut))) (defun solar-ephemeris-correction (year) commit e260a059d0dd4e3dccbe8e8307e6f22cb1934579 Author: Paul Eggert Date: Sun May 17 17:28:54 2015 -0700 * admin/notes/unicode: New section "binary files". diff --git a/admin/notes/unicode b/admin/notes/unicode index 028bcc1..ebec417 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -245,6 +245,25 @@ nontrivial changes to the build process. lisp/leim/quail/ethiopic.el lisp/leim/quail/tibetan.el + * binary files + + These files contain binary data, and are not text files. + Some of the entries in this list are patterns, and stand for any + files with the listed extension. + + *.gz + *.icns + *.ico + *.pbm + *.pdf + *.png + *.sig + etc/e/eterm-color + etc/package-keyring.gpg + msdos/emacs.pif + nextstep/GNUstep/Emacs.base/Resources/emacs.tiff + nt/icons/hand.cur + This file is part of GNU Emacs. commit e0117b17c474b9f27b3797a286ffd1d7f52cd0d3 Author: Paul Eggert Date: Sun May 17 17:21:54 2015 -0700 Change new etags test to use UTF-8 encoding * 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/html-src/index.shtml, test/etags/html-src/software.html: * test/etags/html-src/softwarelibero.html: Switch to UTF-8 encoding. * test/etags/Makefile (SRCS): Adjust to switch to UTF-8. Remove Makefile, as it's too incestuous to have the test input include the build procedure. (UTF8_LOCALE, UTF_ENCODING): New macros. (LC_ALL): If possible, set to a UTF-8 encoding if not already UTF-8. (check): Skip if not UTF-8. (.PHONY): New rule. (FRC): Remove, as superseded by .PHONY. All uses removed. (regexfile): Prefer printf to echo when outputting oddball chars. (.PRECIOUS): Remove, as these files are not built. diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good index 1a885cc..5a518f1 100644 --- a/test/etags/CTAGS.good +++ b/test/etags/CTAGS.good @@ -47,7 +47,6 @@ $user_comment_lc php-src/lce_functions.php 115 (a-forth-constant forth-src/test-forth.fth /^constant (a-forth-constant$/ (another-forth-word forth-src/test-forth.fth /^: (another-forth-word) ( -- )$/ + tex-src/texinfo.tex /^\\def+{{\\tt \\char 43}}$/ -.PRECIOUS Makefile /^.PRECIOUS: ETAGS.good CTAGS.good$/ /.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ /.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ /.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ @@ -244,7 +243,6 @@ A::operator+ cp-src/c.C /^ A operator+(A& a) {};$/ A::rosso cp-src/c.C 40 A::verde cp-src/c.C 40 A::~A cp-src/c.C /^A::~A() {}$/ -ADASRC Makefile /^ADASRC=$(addprefix .\/ada-src\/,etags-test-for.ada 2/ ADDRESS c-src/emacs/src/gmalloc.c /^#define ADDRESS(B) ((void *) (((B) - 1) * BLOCKSIZ/ ALIGNOF_STRUCT_LISP_VECTOR c-src/emacs/src/lisp.h 1378 ALLOCATED_BEFORE_DUMPING c-src/emacs/src/gmalloc.c /^#define ALLOCATED_BEFORE_DUMPING(P) \\$/ @@ -254,7 +252,6 @@ AND y-src/cccp.c 11 ANSIC c-src/h.h 84 ANSIC c-src/h.h 85 AREF c-src/emacs/src/lisp.h /^AREF (Lisp_Object array, ptrdiff_t idx)$/ -ARGS Makefile /^ARGS=- < srclist$/ ARITH_EQUAL c-src/emacs/src/lisp.h 3498 ARITH_GRTR c-src/emacs/src/lisp.h 3501 ARITH_GRTR_OR_EQUAL c-src/emacs/src/lisp.h 3503 @@ -267,7 +264,6 @@ ARRAY_MARK_FLAG c-src/emacs/src/lisp.h 768 ASCII_CHAR_P c-src/emacs/src/lisp.h /^#define ASCII_CHAR_P(c) UNSIGNED_CMP (c, <, 0x80)$/ ASET c-src/emacs/src/lisp.h /^ASET (Lisp_Object array, ptrdiff_t idx, Lisp_Objec/ ASIZE c-src/emacs/src/lisp.h /^ASIZE (Lisp_Object array)$/ -ASRC Makefile /^ASRC=$(addprefix .\/a-src\/,empty.zz empty.zz.gz)$/ AST_Array::AST_Array cp-src/c.C /^AST_Array::AST_Array(UTL_ScopedName *n, unsigned l/ AST_ConcreteType::AST_ConcreteType cp-src/c.C /^AST_ConcreteType::AST_ConcreteType(AST_Decl::NodeT/ AST_Root cp-src/c.C 92 @@ -465,13 +461,9 @@ CONSTYPE_PURE c-src/emacs/src/lisp.h 3739 CONS_TO_INTEGER c-src/emacs/src/lisp.h /^#define CONS_TO_INTEGER(cons, type, var) \\$/ CONVERT_CHARSTRING_TO_VALUE pas-src/common.pas /^procedure CONVERT_CHARSTRING_TO_VALUE;(*($/ CPPFLAGS make-src/Makefile 49 -CPSRC Makefile /^CPSRC=$(addprefix .\/cp-src\/,c.C burton.cpp burton./ -CSRC Makefile /^CSRC=$(addprefix .\/c-src\/,abbrev.c .\/\/c.c torture./ -CTAGS Makefile /^CTAGS: FRC ${infiles}$/ CTAGS c-src/etags.c 146 CTAGS c-src/etags.c 147 CTAGS c-src/etags.c 149 -CTAGS_PROG Makefile /^CTAGS_PROG=..\/..\/lib-src\/ctags$/ C_AUTO c-src/etags.c 2198 C_EXT c-src/etags.c 2193 C_JAVA c-src/etags.c 2197 @@ -580,7 +572,6 @@ Debug cp-src/functions.cpp /^void Debug ( int lineno, int level, char* func , c/ DisposeANameList pas-src/common.pas /^procedure DisposeANameList( $/ DisposeNameList pas-src/common.pas /^procedure DisposeNameList;$/ ELEM_I c-src/h.h 3 -ELSRC Makefile /^ELSRC=$(addprefix .\/el-src\/,TAGTEST.EL emacs\/lisp\// EMACS_INT c-src/emacs/src/lisp.h 91 EMACS_INT c-src/emacs/src/lisp.h 96 EMACS_INT c-src/emacs/src/lisp.h 103 @@ -610,12 +601,9 @@ ENUM_BF c-src/emacs/src/lisp.h /^ ENUM_BF (specbind_tag) kind : CHAR_BIT;$/ ENUM_BF c-src/emacs/src/lisp.h /^ ENUM_BF (specbind_tag) kind : CHAR_BIT;$/ EQ c-src/emacs/src/lisp.h /^# define EQ(x, y) lisp_h_EQ (x, y)$/ EQUAL y-src/cccp.c 12 -ERLSRC Makefile /^ERLSRC=$(addprefix .\/erl-src\/,gs_dialog.erl)$/ ERROR y-src/parse.y 303 ERROR parse.y 303 ERROR y-src/cccp.c 9 -ETAGS Makefile /^ETAGS: FRC ${infiles}$/ -ETAGS_PROG Makefile /^ETAGS_PROG=..\/..\/lib-src\/etags$/ EXFUN c-src/emacs/src/lisp.h /^#define EXFUN(fnname, maxargs) \\$/ EXTERNALLY_VISIBLE c-src/emacs/src/keyboard.c 3497 EXTERNALLY_VISIBLE c-src/emacs/src/keyboard.c 4372 @@ -638,13 +626,10 @@ FIXNUM_OVERFLOW_P c-src/emacs/src/lisp.h /^#define FIXNUM_OVERFLOW_P(i) \\$/ FIXNUM_OVERFLOW_P c-src/emacs/src/lisp.h /^LISP_MACRO_DEFUN (EQ, bool, (Lisp_Object x, Lisp_O/ FLOATP c-src/emacs/src/lisp.h /^# define FLOATP(x) lisp_h_FLOATP (x)$/ FLOAT_TO_STRING_BUFSIZE c-src/emacs/src/lisp.h 3927 -FORTHSRC Makefile /^FORTHSRC=$(addprefix .\/forth-src\/,test-forth.fth)$/ FOR_EACH_ALIST_VALUE c-src/emacs/src/lisp.h /^#define FOR_EACH_ALIST_VALUE(head_var, list_var, v/ FOR_EACH_TAIL c-src/emacs/src/lisp.h /^#define FOR_EACH_TAIL(hare, list, tortoise, n) \\$/ FRAMEP c-src/emacs/src/lisp.h /^FRAMEP (Lisp_Object a)$/ -FRC Makefile /^FRC:;$/ FREEFLOOD c-src/emacs/src/gmalloc.c 1858 -FSRC Makefile /^FSRC=$(addprefix .\/f-src\/,entry.for entry.strange_/ FUN0 y-src/parse.y /^yylex FUN0()$/ FUN0 parse.y /^yylex FUN0()$/ FUN1 y-src/parse.y /^yyerror FUN1(char *, s)$/ @@ -735,7 +720,6 @@ HASH_TABLE_SIZE c-src/emacs/src/lisp.h /^HASH_TABLE_SIZE (struct Lisp_Hash_Table HASH_VALUE c-src/emacs/src/lisp.h /^HASH_VALUE (struct Lisp_Hash_Table *h, ptrdiff_t i/ HAVE_NTGUI c-src/etags.c 116 HEAP c-src/emacs/src/gmalloc.c 131 -HTMLSRC Makefile /^HTMLSRC=$(addprefix .\/html-src\/,softwarelibero.htm/ HTML_help c-src/etags.c 584 HTML_labels c-src/etags.c /^HTML_labels (FILE *inf)$/ HTML_suffixes c-src/etags.c 582 @@ -851,7 +835,6 @@ LTGT cp-src/MDiagArray2.h 35 LTGT cp-src/MDiagArray2.h 39 LTGT cp-src/MDiagArray2.h 42 LTGT cp-src/MDiagArray2.h 144 -LUASRC Makefile /^LUASRC=$(addprefix .\/lua-src\/,allegro.lua)$/ L_CELL y-src/parse.c 10 L_CONST y-src/parse.c 13 L_FN0 y-src/parse.c 14 @@ -938,7 +921,6 @@ Lua_suffixes c-src/etags.c 598 MAGICBYTE c-src/emacs/src/gmalloc.c 1856 MAGICFREE c-src/emacs/src/gmalloc.c 1855 MAGICWORD c-src/emacs/src/gmalloc.c 1854 -MAKESRC Makefile /^MAKESRC=$(addprefix .\/make-src\/,Makefile)$/ MALLOCFLOOD c-src/emacs/src/gmalloc.c 1857 MANY c-src/emacs/src/lisp.h 2833 MARKERP c-src/emacs/src/lisp.h /^# define MARKERP(x) lisp_h_MARKERP (x)$/ @@ -1016,7 +998,6 @@ NILP c-src/emacs/src/lisp.h /^# define NILP(x) lisp_h_NILP (x)$/ NIL_IS_ZERO c-src/emacs/src/lisp.h 1515 NONPOINTER_BITS c-src/emacs/src/lisp.h 78 NONPOINTER_BITS c-src/emacs/src/lisp.h 80 -NONSRCS Makefile /^NONSRCS=.\/f-src\/entry.strange .\/erl-src\/lists.erl / NONSRCS make-src/Makefile 35 NOTEQUAL y-src/cccp.c 13 NULL cccp.y 51 @@ -1033,20 +1014,14 @@ NewLayerSet lua-src/allegro.lua /^function NewLayerSet (name)$/ NewNameString pas-src/common.pas /^procedure NewNameString; (* (var NSP: NameStringPo/ NmStrToErrStr pas-src/common.pas /^function NmStrToErrStr;(*($/ NmStrToInteger pas-src/common.pas /^function NmStrToInteger; (* (Str : NameString) : i/ -OBJCPPSRC Makefile /^OBJCPPSRC=$(addprefix .\/objcpp-src\/,SimpleCalc.H S/ -OBJCSRC Makefile /^OBJCSRC=$(addprefix .\/objc-src\/,Subprocess.h Subpr/ OPENBUTTON objc-src/PackInsp.m 47 -OPTIONS Makefile /^OPTIONS=--members --declarations --regex=@regexfil/ OR y-src/cccp.c 10 OVERLAYP c-src/emacs/src/lisp.h /^OVERLAYP (Lisp_Object x)$/ Objc_help c-src/etags.c 613 Objc_suffixes c-src/etags.c 609 OperatorFun c-src/h.h 88 Overview tex-src/gzip.texi /^@node Overview, Sample, Copying, Top$/ -PASSRC Makefile /^PASSRC=$(addprefix .\/pas-src\/,common.pas)$/ PDT c-src/h.h /^ Date 04 May 87 235311 PDT (Mon)$/ -PERLSRC Makefile /^PERLSRC=$(addprefix .\/perl-src\/,htlmify-cystic yag/ -PHPSRC Makefile /^PHPSRC=$(addprefix .\/php-src\/,lce_functions.php pt/ PHP_functions c-src/etags.c /^PHP_functions (FILE *inf)$/ PHP_help c-src/etags.c 639 PHP_suffixes c-src/etags.c 637 @@ -1059,13 +1034,13 @@ POReader php-src/lce_functions.php 163 POReader php-src/lce_functions.php /^ function POReader($domain, $filename)$/ PRINT_UNDOCUMENTED_OPTIONS_HELP c-src/etags.c 804 PROCESSP c-src/emacs/src/lisp.h /^PROCESSP (Lisp_Object a)$/ -PROLSRC Makefile /^PROLSRC=$(addprefix .\/prol-src\/,ordsets.prolog nat/ PROP c-src/emacs/src/keyboard.c /^#define PROP(IDX) AREF (tool_bar_item_properties, / PROP c-src/emacs/src/keyboard.c 8379 PROTECT_MALLOC_STATE c-src/emacs/src/gmalloc.c /^#define PROTECT_MALLOC_STATE(PROT) protect_malloc_/ PROTECT_MALLOC_STATE c-src/emacs/src/gmalloc.c /^#define PROTECT_MALLOC_STATE(PROT) \/* empty *\/$/ PRTPKG f-src/entry.for /^ LOGICAL FUNCTION PRTPKG ( SHORT, LONG, EXPL,/ PRTPKG f-src/entry.strange_suffix /^ LOGICAL FUNCTION PRTPKG ( SHORT, LONG, EXPL,/ +PRTPKG f-src/entry.strange /^ LOGICAL FUNCTION PRTPKG ( SHORT, LONG, EXPL,/ PSEUDO c-src/sysdep.h /^#define PSEUDO(name, syscall_name, args) / PSEUDOVECSIZE c-src/emacs/src/lisp.h /^#define PSEUDOVECSIZE(type, nonlispfield) \\$/ PSEUDOVECTORP c-src/emacs/src/lisp.h /^PSEUDOVECTORP (Lisp_Object a, int code)$/ @@ -1076,7 +1051,6 @@ PSEUDOVECTOR_REST_MASK c-src/emacs/src/lisp.h 814 PSEUDOVECTOR_SIZE_BITS c-src/emacs/src/lisp.h 808 PSEUDOVECTOR_SIZE_MASK c-src/emacs/src/lisp.h 809 PSEUDOVECTOR_TYPEP c-src/emacs/src/lisp.h /^PSEUDOVECTOR_TYPEP (struct vectorlike_header *a, i/ -PSSRC Makefile /^PSSRC=$(addprefix .\/ps-src\/,rfc1245.ps)$/ PS_functions c-src/etags.c /^PS_functions (FILE *inf)$/ PS_help c-src/etags.c 649 PS_suffixes c-src/etags.c 647 @@ -1101,7 +1075,6 @@ PVEC_TERMINAL c-src/emacs/src/lisp.h 790 PVEC_TYPE_MASK c-src/emacs/src/lisp.h 819 PVEC_WINDOW c-src/emacs/src/lisp.h 786 PVEC_WINDOW_CONFIGURATION c-src/emacs/src/lisp.h 791 -PYTSRC Makefile /^PYTSRC=$(addprefix .\/pyt-src\/,server.py)$/ PackageInspector objc-src/PackInsp.h /^@interface PackageInspector:WMInspector$/ Pascal_functions c-src/etags.c /^Pascal_functions (FILE *inf)$/ Pascal_help c-src/etags.c 621 @@ -1192,7 +1165,6 @@ RECC_UNIBYTE c-src/emacs/src/regex.h 617 RECC_UPPER c-src/emacs/src/regex.h 612 RECC_WORD c-src/emacs/src/regex.h 610 RECC_XDIGIT c-src/emacs/src/regex.h 614 -REGEX Makefile /^REGEX=\/[ \\t]*DEFVAR_[A-Z_ \\t\\n(]+"\\([^"]+\\)"\/$/ REGS_FIXED c-src/emacs/src/regex.h 378 REGS_REALLOCATE c-src/emacs/src/regex.h 377 REGS_UNALLOCATED c-src/emacs/src/regex.h 376 @@ -1267,7 +1239,6 @@ RE_TRANSLATE_TYPE c-src/emacs/src/regex.h 332 RE_UNMATCHED_RIGHT_PAREN_ORD c-src/emacs/src/regex.h 136 RSH y-src/cccp.c 17 RTE/s ada-src/2ataspri.adb /^ package RTE renames Interfaces.C.POSIX_RTE;$/ -RUN Makefile /^RUN=$/ Range cp-src/Range.h 35 Range::Range cp-src/Range.h /^ Range (void)$/ Range::Range cp-src/Range.h /^ Range (const Range& r)$/ @@ -1328,6 +1299,7 @@ SDTrefSkipSpaces pas-src/common.pas /^procedure SDTrefSkipSpaces;$/ SDTrefStringToRec pas-src/common.pas /^procedure SDTrefStringToRec (* ($/ SETPRT f-src/entry.for /^ ENTRY SETPRT ( SHORT, EXPL, LONG, TRACE, D/ SETPRT f-src/entry.strange_suffix /^ ENTRY SETPRT ( SHORT, EXPL, LONG, TRACE, D/ +SETPRT f-src/entry.strange /^ ENTRY SETPRT ( SHORT, EXPL, LONG, TRACE, D/ SET_SYMBOL_BLV c-src/emacs/src/lisp.h /^SET_SYMBOL_BLV (struct Lisp_Symbol *sym, struct Li/ SET_SYMBOL_FWD c-src/emacs/src/lisp.h /^SET_SYMBOL_FWD (struct Lisp_Symbol *sym, union Lis/ SET_SYMBOL_VAL c-src/emacs/src/lisp.h /^# define SET_SYMBOL_VAL(sym, v) lisp_h_SET_SYMBOL_/ @@ -1344,7 +1316,6 @@ SPECPDL_UNWIND c-src/emacs/src/lisp.h 2944 SPECPDL_UNWIND_INT c-src/emacs/src/lisp.h 2946 SPECPDL_UNWIND_PTR c-src/emacs/src/lisp.h 2945 SPECPDL_UNWIND_VOID c-src/emacs/src/lisp.h 2947 -SRCS Makefile /^SRCS=Makefile ${ADASRC} ${ASRC} ${CSRC} ${CPSRC} $/ SREF c-src/emacs/src/lisp.h /^SREF (Lisp_Object string, ptrdiff_t index)$/ SSDATA c-src/emacs/src/lisp.h /^SSDATA (Lisp_Object string)$/ SSET c-src/emacs/src/lisp.h /^SSET (Lisp_Object string, ptrdiff_t index, unsigne/ @@ -1419,7 +1390,6 @@ TAS_Cell/t ada-src/2ataspri.ads /^ type TAS_Cell is$/ TCB_Ptr/t ada-src/2ataspri.ads /^ type TCB_Ptr is access all Task_Control_Block;$/ TERMINALP c-src/emacs/src/lisp.h /^TERMINALP (Lisp_Object a)$/ TEST php-src/ptest.php 1 -TEXSRC Makefile /^TEXSRC=$(addprefix .\/tex-src\/,testenv.tex gzip.tex/ TEXTAGS make-src/Makefile 204 TEXTAGS make-src/Makefile 219 TEX_LESC c-src/etags.c 4986 @@ -1604,7 +1574,6 @@ XUNTAG c-src/emacs/src/lisp.h /^XUNTAG (Lisp_Object a, int type)$/ XWINDOW c-src/emacs/src/lisp.h /^XWINDOW (Lisp_Object a)$/ Y c-src/h.h 100 YACC c-src/etags.c 2199 -YSRC Makefile /^YSRC=$(addprefix .\/y-src\/,parse.y parse.c atest.y / YYABORT /usr/share/bison/bison.simple 153 YYABORT /usr/share/bison/bison.simple 153 YYACCEPT /usr/share/bison/bison.simple 152 @@ -2574,7 +2543,7 @@ b c-src/h.h 41 b c-src/h.h 103 b c-src/h.h 104 backslash=0 tex-src/texinfo.tex /^\\let\\indexbackslash=0 %overridden during \\printin/ -bar c-src//c.c /^void bar() {while(0) {}}$/ +bar c-src/c.c /^void bar() {while(0) {}}$/ bar c.c 143 bar c-src/h.h 19 bas_syn prol-src/natded.prolog /^bas_syn(n(_)).$/ @@ -2667,7 +2636,6 @@ cat c-src/h.h 81 cat prol-src/natded.prolog /^cat(A, Alpha@Beta, Ass3, Qs3, tree(fe,A:Alpha@Beta/ cat_atoms prol-src/natded.prolog /^cat_atoms(A1,A2,A3):-$/ cccccccccc c-src/h.h 115 -cdiff Makefile /^cdiff: CTAGS.good CTAGS ${infiles}$/ cdr c-src/emacs/src/lisp.h 1159 cell y-src/parse.y 278 cgrep html-src/software.html /^cgrep$/ @@ -2677,7 +2645,6 @@ char_bits c-src/emacs/src/lisp.h 2443 char_table_specials c-src/emacs/src/lisp.h 1692 charset_unibyte c-src/emacs/src/regex.h 410 chartonmstr pas-src/common.pas /^function chartonmstr; (*($/ -check Makefile /^check:$/ checkQuotation php-src/lce_functions.php /^ function checkQuotation($str)$/ check_cons_list c-src/emacs/src/lisp.h /^# define check_cons_list() lisp_h_check_cons_list/ checkhdr c-src/emacs/src/gmalloc.c /^checkhdr (const struct hdr *hdr)$/ @@ -2846,7 +2813,6 @@ echo_message_buffer c-src/emacs/src/keyboard.c 171 echo_now c-src/emacs/src/keyboard.c /^echo_now (void)$/ echo_truncate c-src/emacs/src/keyboard.c /^echo_truncate (ptrdiff_t nchars)$/ echoing c-src/emacs/src/keyboard.c 154 -ediff% Makefile /^ediff%: ETAGS.good% ETAGS ${infiles}$/ editItem pyt-src/server.py /^ def editItem(self):$/ editsite pyt-src/server.py /^ def editsite(self, site):$/ edituser pyt-src/server.py /^ def edituser(self, user):$/ @@ -2918,7 +2884,7 @@ expression_value cccp.y 68 expression_value y-src/cccp.y 68 extras c-src/emacs/src/lisp.h 1603 extvar c-src/h.h 109 -f c-src//c.c /^T f(){if(x){}$/ +f c-src/c.c /^T f(){if(x){}$/ f c.c 145 f c.c 156 f c.c 168 @@ -3002,7 +2968,7 @@ foo f-src/entry.strange /^ character*(*) function foo()$/ foo php-src/ptest.php /^foo()$/ foo::f cp-src/c.C /^ void f() {}$/ foo::x cp-src/c.C 80 -foobar c-src//c.c /^int foobar() {;}$/ +foobar c-src/c.c /^int foobar() {;}$/ foobar c.c /^extern void foobar (void) __attribute__ ((section / foobar2 c-src/h.h 20 foobar2_ c-src/h.h 16 @@ -3124,7 +3090,7 @@ hybrid_get_current_dir_name c-src/emacs/src/gmalloc.c /^hybrid_get_current_dir_n hybrid_malloc c-src/emacs/src/gmalloc.c /^hybrid_malloc (size_t size)$/ hybrid_realloc c-src/emacs/src/gmalloc.c /^hybrid_realloc (void *ptr, size_t size)$/ hypothetical_mem prol-src/natded.prolog /^hypothetical_mem(fi(N),Ass,_):-$/ -i c-src//c.c 2 +i c-src/c.c 2 i c.c 169 i c-src/emacs/src/lisp.h 567 i c-src/emacs/src/lisp.h 4673 @@ -3145,7 +3111,6 @@ inattribute c-src/etags.c 2400 index c-src/emacs/src/lisp.h 1856 infabsdir c-src/etags.c 206 infabsname c-src/etags.c 205 -infiles Makefile /^infiles = $(filter-out ${NONSRCS},${SRCS}) srclist/ infname c-src/etags.c 204 info c-src/emacs/src/gmalloc.c 157 infoPanel: objcpp-src/SimpleCalc.M /^- infoPanel:sender$/ @@ -3183,7 +3148,7 @@ integertonmstr pas-src/common.pas /^function integertonmstr; (* (TheInteger : in intensity1 f-src/entry.for /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/ intensity1 f-src/entry.strange_suffix /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/ intensity1 f-src/entry.strange /^ & intensity1(efv,fv,svin,svquad,sfpv,maxp,val/ -interface_locate c-src//c.c /^interface_locate(void)$/ +interface_locate c-src/c.c /^interface_locate(void)$/ intern c-src/emacs/src/lisp.h /^intern (const char *str)$/ intern_c_string c-src/emacs/src/lisp.h /^intern_c_string (const char *str)$/ internal_last_event_frame c-src/emacs/src/keyboard.c 228 @@ -3901,7 +3866,6 @@ regex make-src/Makefile 216 regex make-src/Makefile 219 regex_t c-src/emacs/src/regex.h 416 regex_tag_multiline c-src/etags.c /^regex_tag_multiline (void)$/ -regexfile Makefile /^regexfile: Makefile$/ regexp c-src/etags.c 256 regexp c-src/etags.c 268 registerAction: objcpp-src/SimpleCalc.M /^- registerAction:(SEL)action$/ @@ -4053,7 +4017,6 @@ specbind_tag c-src/emacs/src/lisp.h 2943 specbinding c-src/emacs/src/lisp.h 2955 specialsymbol prol-src/natded.prolog /^specialsymbol(C1,C2,S):-$/ splitexp prol-src/natded.prolog /^splitexp(E,E,('NIL','NIL')):-!.$/ -srclist Makefile /^srclist: Makefile$/ ss3 c.c 255 sss1 c.c 252 sss2 c.c 253 @@ -4419,7 +4382,6 @@ xref-location-line el-src/emacs/lisp/progmodes/etags.el /^(cl-defmethod xref-loc xref-location-marker el-src/emacs/lisp/progmodes/etags.el /^(cl-defmethod xref-location-marker ((l xref-etags-/ 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 Makefile /^xx="this line is here because of a fontlock bug$/ y-get-selection-internal c.c /^ Fy_get_selection_internal, Sy_get_selection_/ yyalloc /usr/share/bison/bison.simple 83 yyalloc /usr/share/bison/bison.simple 83 diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1 index 6762bf3..7ccc5a0 100644 --- a/test/etags/ETAGS.good_1 +++ b/test/etags/ETAGS.good_1 @@ -1,46 +1,4 @@ -Makefile,683 -ADASRC=1,0 -ASRC=2,91 -CSRC=3,139 -CPSRC=7,410 -ELSRC=10,584 -ERLSRC=11,654 -FORTHSRC=12,699 -FSRC=13,749 -HTMLSRC=14,821 -LUASRC=16,950 -MAKESRC=17,993 -OBJCSRC=18,1035 -OBJCPPSRC=19,1116 -PASSRC=20,1179 -PERLSRC=21,1221 -PHPSRC=22,1291 -PSSRC=23,1363 -PROLSRC=24,1403 -PYTSRC=25,1465 -TEXSRC=26,1506 -YSRC=27,1585 -SRCS=28,1650 -NONSRCS=32,1902 -ETAGS_PROG=34,1976 -CTAGS_PROG=35,2007 -REGEX=37,2039 -xx=38,2085 -RUN=40,2134 -OPTIONS=42,2140 -ARGS=43,2192 -infiles 45,2210 -check:check47,2272 -ediff%:ediff%55,2575 -cdiff:cdiff58,2676 -ETAGS:ETAGS61,2773 -CTAGS:CTAGS64,2843 -srclist:srclist67,2921 -regexfile:regexfile71,3012 -.PRECIOUS:.PRECIOUS77,3189 -FRC:FRC79,3223 - ada-src/etags-test-for.ada,1969 type LL_Task_Procedure_Access LL_Task_Procedure_Access/t1,0 function Body_RequiredBody_Required/f3,78 @@ -621,18 +579,18 @@ char **tab_fill(tab_fill70,1129 int tab_delete_first(91,1638 int tab_count_words(103,1820 -c-src/dostorture.c,197 -(*tag1 tag118,451 -#define notag2 26,552 -(*tag2 tag229,629 -(*tag3 tag339,771 -#define notag4 45,860 -(*tag4 tag448,954 -tag5 57,1080 -tag6 66,1207 -int pp1(74,1316 -pp287,1418 -pp3(100,1517 +c-src/dostorture.c,198 +(*tag1 tag118,468 +#define notag2 26,577 +(*tag2 tag229,657 +(*tag3 tag339,809 +#define notag4 45,904 +(*tag4 tag448,1001 +tag5 57,1136 +tag6 66,1272 +int pp1(74,1389 +pp287,1504 +pp3(100,1616 c-src/emacs/src/gmalloc.c,3539 #define USE_PTHREAD25,1002 @@ -1951,46 +1909,46 @@ template class AT 52,1668 class AU 53,1716 class B<B54,1735 class B { void f(B::f54,1735 -const A::B::T& abt 55,1765 -class A 56,1791 -class A { class B A::B56,1791 -class A 57,1826 - A operator+(A::operator+59,1860 -is_muldiv_operation(61,1887 -domain foo 68,1955 - void f(foo::f69,1968 -void A::A(72,1989 -struct A 73,2004 -struct B 74,2022 -void B::B(75,2041 -void BE_Node::BE_Node(76,2056 -class BE_Node 77,2083 -struct foo 79,2102 -class test 86,2156 - int f(test::f87,2169 - int ff(test::ff89,2231 - int g(test::g90,2254 -class AST_Root 92,2278 -AST_ConcreteType::AST_ConcreteType(99,2393 -AST_Array::AST_Array(107,2532 - void f(::f115,2733 -struct A 117,2753 -A::~A(120,2777 -struct B 122,2789 - ~B(B::~B123,2800 -enum {dog,::dog126,2817 -enum {dog, cat}::cat126,2817 -enum {dog, cat} animals;126,2817 -struct {int teats;} cow;127,2842 -class Boo 129,2868 - enum {dog,Boo::dog130,2880 - enum {dog, cat}Boo::cat130,2880 - foo(Boo::foo133,2954 - Boo(Boo::Boo137,2995 -Boo::Boo(141,3070 -typedef int should_see_this_one_enclosed_in_extern_C;149,3155 -typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228 -typedef int should_see_this_array_type[should_see_this_array_type156,3310 +const A::B::T& abt 55,1766 +class A 56,1792 +class A { class B A::B56,1792 +class A 57,1827 + A operator+(A::operator+59,1861 +is_muldiv_operation(61,1888 +domain foo 68,1956 + void f(foo::f69,1969 +void A::A(72,1990 +struct A 73,2005 +struct B 74,2023 +void B::B(75,2042 +void BE_Node::BE_Node(76,2057 +class BE_Node 77,2084 +struct foo 79,2103 +class test 86,2157 + int f(test::f87,2170 + int ff(test::ff89,2232 + int g(test::g90,2255 +class AST_Root 92,2279 +AST_ConcreteType::AST_ConcreteType(99,2394 +AST_Array::AST_Array(107,2533 + void f(::f115,2734 +struct A 117,2754 +A::~A(120,2778 +struct B 122,2790 + ~B(B::~B123,2801 +enum {dog,::dog126,2818 +enum {dog, cat}::cat126,2818 +enum {dog, cat} animals;126,2818 +struct {int teats;} cow;127,2843 +class Boo 129,2869 + enum {dog,Boo::dog130,2881 + enum {dog, cat}Boo::cat130,2881 + foo(Boo::foo133,2955 + Boo(Boo::Boo137,2996 +Boo::Boo(141,3071 +typedef int should_see_this_one_enclosed_in_extern_C;149,3156 +typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229 +typedef int should_see_this_array_type[should_see_this_array_type156,3311 cp-src/burton.cpp,103 ::dummy::dummy test::dummy1(1,0 @@ -2298,10 +2256,12 @@ f-src/entry.strange_suffix,172 & intensity1(577,12231 character*(*) function foo(579,12307 -f-src/entry.strange,103 - ENTRY MSGSEL 193,4382 - & intensity1(375,8135 - character*(*) function foo(377,8211 +f-src/entry.strange,171 + LOGICAL FUNCTION PRTPKG 2,2 + ENTRY SETPRT 193,3793 + ENTRY MSGSEL 394,8405 + & intensity1(576,12158 + character*(*) function foo(578,12234 forth-src/test-forth.fth,408 : a-forth-word 20,301 @@ -2317,44 +2277,44 @@ constant (a-forth-constant(a-forth-constant38,628 code assemby-code-word 43,685 : a-forth-word 50,870 -html-src/softwarelibero.html,198 -Cos' il software libero?4,38 -Licenze d'uso di un programmalicenze65,2474 -Sfatiamo alcuni miti138,6064 -Il movimento open sourceoss191,7968 -Impatto pratico del software liberoimpatto231,9986 +html-src/softwarelibero.html,200 +Cos'è il software libero?4,38 +Licenze d'uso di un programmalicenze65,2500 +Sfatiamo alcuni miti138,6118 +Il movimento open sourceoss191,8037 +Impatto pratico del software liberoimpatto231,10066 html-src/index.shtml,104  8,281 -In evidenza15,446 -Comunicati e iniziative32,974 -Ultime notizie dall'associazione63,2027 +In evidenza15,447 +Comunicati e iniziative32,976 +Ultime notizie dall'associazione63,2030 html-src/algrthms.html,467 -Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,276 -Descriptionalgorithms10,477 -Generating the Datagenalgorithm48,1953 -Convolutionallyconalgorithm55,2463 -Nextstatetable262,11331 -Outputoutputtable350,13571 -Mapping the Channel Symbolsmapping433,15786 -Adding Noise to theaddnoise439,16174 -Quantizing the Receivedquantizing469,18637 +Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282 +Descriptionalgorithms10,486 +Generating the Datagenalgorithm48,2000 +Convolutionallyconalgorithm55,2517 +Nextstatetable262,11592 +Outputoutputtable350,13920 +Mapping the Channel Symbolsmapping433,16218 +Adding Noise to theaddnoise439,16612 +Quantizing the Receivedquantizing469,19105 -html-src/software.html,438 -Francesco Potort Software Page9,280 -Software that I wrote for supporting my research activitysimulation36,1400 -MTGmtg41,1484 -Fracasfracas65,2626 -GaliLEOgalileo101,4234 -Leasqrleasqr114,4679 -Free software that I wrote for the GNU project or for my personal or workgnu142,6067 -Etagsetags148,6182 -checkiso161,6731 -cgrep178,7549 -debian-bug.eldebian-bug190,7981 -tcpdump205,8566 -Links to interesting softwarelinks216,8893 +html-src/software.html,439 +Francesco Potortì Software Page9,280 +Software that I wrote for supporting my research activitysimulation36,1398 +MTGmtg41,1482 +Fracasfracas65,2624 +GaliLEOgalileo101,4232 +Leasqrleasqr114,4677 +Free software that I wrote for the GNU project or for my personal or workgnu142,6065 +Etagsetags148,6180 +checkiso161,6729 +cgrep178,7547 +debian-bug.eldebian-bug190,7979 +tcpdump205,8564 +Links to interesting softwarelinks216,8891 lua-src/allegro.lua,400 local function get_layer_by_name 7,175 @@ -3730,7 +3690,7 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno % \global\def={=3306,107486 \def\normalbackslash{\normalbackslash3320,107868 -c-src//c.c,76 +c-src/c.c,76 T f(1,0 }T i;2,14 void bar(5,69 diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2 index 32b58d8..bd20d14 100644 --- a/test/etags/ETAGS.good_2 +++ b/test/etags/ETAGS.good_2 @@ -1,46 +1,4 @@ -Makefile,683 -ADASRC=1,0 -ASRC=2,91 -CSRC=3,139 -CPSRC=7,410 -ELSRC=10,584 -ERLSRC=11,654 -FORTHSRC=12,699 -FSRC=13,749 -HTMLSRC=14,821 -LUASRC=16,950 -MAKESRC=17,993 -OBJCSRC=18,1035 -OBJCPPSRC=19,1116 -PASSRC=20,1179 -PERLSRC=21,1221 -PHPSRC=22,1291 -PSSRC=23,1363 -PROLSRC=24,1403 -PYTSRC=25,1465 -TEXSRC=26,1506 -YSRC=27,1585 -SRCS=28,1650 -NONSRCS=32,1902 -ETAGS_PROG=34,1976 -CTAGS_PROG=35,2007 -REGEX=37,2039 -xx=38,2085 -RUN=40,2134 -OPTIONS=42,2140 -ARGS=43,2192 -infiles 45,2210 -check:check47,2272 -ediff%:ediff%55,2575 -cdiff:cdiff58,2676 -ETAGS:ETAGS61,2773 -CTAGS:CTAGS64,2843 -srclist:srclist67,2921 -regexfile:regexfile71,3012 -.PRECIOUS:.PRECIOUS77,3189 -FRC:FRC79,3223 - ada-src/etags-test-for.ada,1969 type LL_Task_Procedure_Access LL_Task_Procedure_Access/t1,0 function Body_RequiredBody_Required/f3,78 @@ -688,18 +646,18 @@ char **tab_fill(tab_fill70,1129 int tab_delete_first(91,1638 int tab_count_words(103,1820 -c-src/dostorture.c,197 -(*tag1 tag118,451 -#define notag2 26,552 -(*tag2 tag229,629 -(*tag3 tag339,771 -#define notag4 45,860 -(*tag4 tag448,954 -tag5 57,1080 -tag6 66,1207 -int pp1(74,1316 -pp287,1418 -pp3(100,1517 +c-src/dostorture.c,198 +(*tag1 tag118,468 +#define notag2 26,577 +(*tag2 tag229,657 +(*tag3 tag339,809 +#define notag4 45,904 +(*tag4 tag448,1001 +tag5 57,1136 +tag6 66,1272 +int pp1(74,1389 +pp287,1504 +pp3(100,1616 c-src/emacs/src/gmalloc.c,6643 #define USE_PTHREAD25,1002 @@ -2457,53 +2415,53 @@ template class AT 52,1668 class AU 53,1716 class B<B54,1735 class B { void f(B::f54,1735 -const A::B::T& abt 55,1765 -class A 56,1791 -class A { class B A::B56,1791 -class A { class B { int f(A::B::f56,1791 -class A 57,1826 - int get_data(A::get_data58,1836 - A operator+(A::operator+59,1860 -is_muldiv_operation(61,1887 -domain foo 68,1955 - void f(foo::f69,1968 -void A::A(72,1989 -struct A 73,2004 -struct A { A(A::A73,2004 -struct B 74,2022 -struct B { B(B::B74,2022 -void B::B(75,2041 -void BE_Node::BE_Node(76,2056 -class BE_Node 77,2083 -struct foo 79,2102 -class test 86,2156 - int f(test::f87,2169 - int ff(test::ff89,2231 - int g(test::g90,2254 -class AST_Root 92,2278 -class AST_Root;96,2327 -AST_ConcreteType::AST_ConcreteType(99,2393 -AST_Array::AST_Array(107,2532 - void f(::f115,2733 -struct A 117,2753 - ~A(A::~A118,2764 -A::~A(120,2777 -struct B 122,2789 - ~B(B::~B123,2800 -enum {dog,::dog126,2817 -enum {dog, cat}::cat126,2817 -enum {dog, cat} animals;126,2817 -struct {int teats;} cow;127,2842 -class Boo 129,2868 - enum {dog,Boo::dog130,2880 - enum {dog, cat}Boo::cat130,2880 - foo(Boo::foo133,2954 - Boo(Boo::Boo137,2995 - Boo(Boo::Boo138,3052 -Boo::Boo(141,3070 -typedef int should_see_this_one_enclosed_in_extern_C;149,3155 -typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228 -typedef int should_see_this_array_type[should_see_this_array_type156,3310 +const A::B::T& abt 55,1766 +class A 56,1792 +class A { class B A::B56,1792 +class A { class B { int f(A::B::f56,1792 +class A 57,1827 + int get_data(A::get_data58,1837 + A operator+(A::operator+59,1861 +is_muldiv_operation(61,1888 +domain foo 68,1956 + void f(foo::f69,1969 +void A::A(72,1990 +struct A 73,2005 +struct A { A(A::A73,2005 +struct B 74,2023 +struct B { B(B::B74,2023 +void B::B(75,2042 +void BE_Node::BE_Node(76,2057 +class BE_Node 77,2084 +struct foo 79,2103 +class test 86,2157 + int f(test::f87,2170 + int ff(test::ff89,2232 + int g(test::g90,2255 +class AST_Root 92,2279 +class AST_Root;96,2328 +AST_ConcreteType::AST_ConcreteType(99,2394 +AST_Array::AST_Array(107,2533 + void f(::f115,2734 +struct A 117,2754 + ~A(A::~A118,2765 +A::~A(120,2778 +struct B 122,2790 + ~B(B::~B123,2801 +enum {dog,::dog126,2818 +enum {dog, cat}::cat126,2818 +enum {dog, cat} animals;126,2818 +struct {int teats;} cow;127,2843 +class Boo 129,2869 + enum {dog,Boo::dog130,2881 + enum {dog, cat}Boo::cat130,2881 + foo(Boo::foo133,2955 + Boo(Boo::Boo137,2996 + Boo(Boo::Boo138,3053 +Boo::Boo(141,3071 +typedef int should_see_this_one_enclosed_in_extern_C;149,3156 +typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229 +typedef int should_see_this_array_type[should_see_this_array_type156,3311 cp-src/burton.cpp,103 ::dummy::dummy test::dummy1(1,0 @@ -2865,10 +2823,12 @@ f-src/entry.strange_suffix,172 & intensity1(577,12231 character*(*) function foo(579,12307 -f-src/entry.strange,103 - ENTRY MSGSEL 193,4382 - & intensity1(375,8135 - character*(*) function foo(377,8211 +f-src/entry.strange,171 + LOGICAL FUNCTION PRTPKG 2,2 + ENTRY SETPRT 193,3793 + ENTRY MSGSEL 394,8405 + & intensity1(576,12158 + character*(*) function foo(578,12234 forth-src/test-forth.fth,408 : a-forth-word 20,301 @@ -2884,44 +2844,44 @@ constant (a-forth-constant(a-forth-constant38,628 code assemby-code-word 43,685 : a-forth-word 50,870 -html-src/softwarelibero.html,198 -Cos' il software libero?4,38 -Licenze d'uso di un programmalicenze65,2474 -Sfatiamo alcuni miti138,6064 -Il movimento open sourceoss191,7968 -Impatto pratico del software liberoimpatto231,9986 +html-src/softwarelibero.html,200 +Cos'è il software libero?4,38 +Licenze d'uso di un programmalicenze65,2500 +Sfatiamo alcuni miti138,6118 +Il movimento open sourceoss191,8037 +Impatto pratico del software liberoimpatto231,10066 html-src/index.shtml,104  8,281 -In evidenza15,446 -Comunicati e iniziative32,974 -Ultime notizie dall'associazione63,2027 +In evidenza15,447 +Comunicati e iniziative32,976 +Ultime notizie dall'associazione63,2030 html-src/algrthms.html,467 -Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,276 -Descriptionalgorithms10,477 -Generating the Datagenalgorithm48,1953 -Convolutionallyconalgorithm55,2463 -Nextstatetable262,11331 -Outputoutputtable350,13571 -Mapping the Channel Symbolsmapping433,15786 -Adding Noise to theaddnoise439,16174 -Quantizing the Receivedquantizing469,18637 +Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282 +Descriptionalgorithms10,486 +Generating the Datagenalgorithm48,2000 +Convolutionallyconalgorithm55,2517 +Nextstatetable262,11592 +Outputoutputtable350,13920 +Mapping the Channel Symbolsmapping433,16218 +Adding Noise to theaddnoise439,16612 +Quantizing the Receivedquantizing469,19105 -html-src/software.html,438 -Francesco Potort Software Page9,280 -Software that I wrote for supporting my research activitysimulation36,1400 -MTGmtg41,1484 -Fracasfracas65,2626 -GaliLEOgalileo101,4234 -Leasqrleasqr114,4679 -Free software that I wrote for the GNU project or for my personal or workgnu142,6067 -Etagsetags148,6182 -checkiso161,6731 -cgrep178,7549 -debian-bug.eldebian-bug190,7981 -tcpdump205,8566 -Links to interesting softwarelinks216,8893 +html-src/software.html,439 +Francesco Potortì Software Page9,280 +Software that I wrote for supporting my research activitysimulation36,1398 +MTGmtg41,1482 +Fracasfracas65,2624 +GaliLEOgalileo101,4232 +Leasqrleasqr114,4677 +Free software that I wrote for the GNU project or for my personal or workgnu142,6065 +Etagsetags148,6180 +checkiso161,6729 +cgrep178,7547 +debian-bug.eldebian-bug190,7979 +tcpdump205,8564 +Links to interesting softwarelinks216,8891 lua-src/allegro.lua,400 local function get_layer_by_name 7,175 @@ -4299,7 +4259,7 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno % \global\def={=3306,107486 \def\normalbackslash{\normalbackslash3320,107868 -c-src//c.c,76 +c-src/c.c,76 T f(1,0 }T i;2,14 void bar(5,69 diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3 index 644ffe4..b3abf5f 100644 --- a/test/etags/ETAGS.good_3 +++ b/test/etags/ETAGS.good_3 @@ -1,46 +1,4 @@ -Makefile,683 -ADASRC=1,0 -ASRC=2,91 -CSRC=3,139 -CPSRC=7,410 -ELSRC=10,584 -ERLSRC=11,654 -FORTHSRC=12,699 -FSRC=13,749 -HTMLSRC=14,821 -LUASRC=16,950 -MAKESRC=17,993 -OBJCSRC=18,1035 -OBJCPPSRC=19,1116 -PASSRC=20,1179 -PERLSRC=21,1221 -PHPSRC=22,1291 -PSSRC=23,1363 -PROLSRC=24,1403 -PYTSRC=25,1465 -TEXSRC=26,1506 -YSRC=27,1585 -SRCS=28,1650 -NONSRCS=32,1902 -ETAGS_PROG=34,1976 -CTAGS_PROG=35,2007 -REGEX=37,2039 -xx=38,2085 -RUN=40,2134 -OPTIONS=42,2140 -ARGS=43,2192 -infiles 45,2210 -check:check47,2272 -ediff%:ediff%55,2575 -cdiff:cdiff58,2676 -ETAGS:ETAGS61,2773 -CTAGS:CTAGS64,2843 -srclist:srclist67,2921 -regexfile:regexfile71,3012 -.PRECIOUS:.PRECIOUS77,3189 -FRC:FRC79,3223 - ada-src/etags-test-for.ada,1969 type LL_Task_Procedure_Access LL_Task_Procedure_Access/t1,0 function Body_RequiredBody_Required/f3,78 @@ -690,18 +648,18 @@ char **tab_fill(tab_fill70,1129 int tab_delete_first(91,1638 int tab_count_words(103,1820 -c-src/dostorture.c,197 -(*tag1 tag118,451 -#define notag2 26,552 -(*tag2 tag229,629 -(*tag3 tag339,771 -#define notag4 45,860 -(*tag4 tag448,954 -tag5 57,1080 -tag6 66,1207 -int pp1(74,1316 -pp287,1418 -pp3(100,1517 +c-src/dostorture.c,198 +(*tag1 tag118,468 +#define notag2 26,577 +(*tag2 tag229,657 +(*tag3 tag339,809 +#define notag4 45,904 +(*tag4 tag448,1001 +tag5 57,1136 +tag6 66,1272 +int pp1(74,1389 +pp287,1504 +pp3(100,1616 c-src/emacs/src/gmalloc.c,4207 #define USE_PTHREAD25,1002 @@ -2241,54 +2199,54 @@ class AU 53,1716 class AU { T x;AU::x53,1716 class B<B54,1735 class B { void f(B::f54,1735 -const A::B::T& abt 55,1765 -class A 56,1791 -class A { class B A::B56,1791 -class A 57,1826 - A operator+(A::operator+59,1860 -is_muldiv_operation(61,1887 -domain foo 68,1955 - void f(foo::f69,1968 -void A::A(72,1989 -struct A 73,2004 -struct B 74,2022 -void B::B(75,2041 -void BE_Node::BE_Node(76,2056 -class BE_Node 77,2083 -struct foo 79,2102 - int x;foo::x80,2115 -class test 86,2156 - int f(test::f87,2169 - int ff(test::ff89,2231 - int g(test::g90,2254 -class AST_Root 92,2278 -AST_ConcreteType::AST_ConcreteType(99,2393 -AST_Array::AST_Array(107,2532 - void f(::f115,2733 -struct A 117,2753 -A::~A(120,2777 -struct B 122,2789 - ~B(B::~B123,2800 -enum {dog,::dog126,2817 -enum {dog, cat}::cat126,2817 -enum {dog, cat} animals;126,2817 -struct {int teats;::teats127,2842 -struct {int teats;} cow;127,2842 -class Boo 129,2868 - enum {dog,Boo::dog130,2880 - enum {dog, cat}Boo::cat130,2880 - enum {dog, cat} animals;Boo::animals130,2880 - struct {int treats;Boo::treats131,2909 - struct {int treats;} cow;Boo::cow131,2909 - int i,Boo::i132,2939 - int i,a,Boo::a132,2939 - int i,a,b;Boo::b132,2939 - foo(Boo::foo133,2954 - Boo(Boo::Boo137,2995 -Boo::Boo(141,3070 -typedef int should_see_this_one_enclosed_in_extern_C;149,3155 -typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228 -typedef int should_see_this_array_type[should_see_this_array_type156,3310 +const A::B::T& abt 55,1766 +class A 56,1792 +class A { class B A::B56,1792 +class A 57,1827 + A operator+(A::operator+59,1861 +is_muldiv_operation(61,1888 +domain foo 68,1956 + void f(foo::f69,1969 +void A::A(72,1990 +struct A 73,2005 +struct B 74,2023 +void B::B(75,2042 +void BE_Node::BE_Node(76,2057 +class BE_Node 77,2084 +struct foo 79,2103 + int x;foo::x80,2116 +class test 86,2157 + int f(test::f87,2170 + int ff(test::ff89,2232 + int g(test::g90,2255 +class AST_Root 92,2279 +AST_ConcreteType::AST_ConcreteType(99,2394 +AST_Array::AST_Array(107,2533 + void f(::f115,2734 +struct A 117,2754 +A::~A(120,2778 +struct B 122,2790 + ~B(B::~B123,2801 +enum {dog,::dog126,2818 +enum {dog, cat}::cat126,2818 +enum {dog, cat} animals;126,2818 +struct {int teats;::teats127,2843 +struct {int teats;} cow;127,2843 +class Boo 129,2869 + enum {dog,Boo::dog130,2881 + enum {dog, cat}Boo::cat130,2881 + enum {dog, cat} animals;Boo::animals130,2881 + struct {int treats;Boo::treats131,2910 + struct {int treats;} cow;Boo::cow131,2910 + int i,Boo::i132,2940 + int i,a,Boo::a132,2940 + int i,a,b;Boo::b132,2940 + foo(Boo::foo133,2955 + Boo(Boo::Boo137,2996 +Boo::Boo(141,3071 +typedef int should_see_this_one_enclosed_in_extern_C;149,3156 +typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229 +typedef int should_see_this_array_type[should_see_this_array_type156,3311 cp-src/burton.cpp,103 ::dummy::dummy test::dummy1(1,0 @@ -2615,10 +2573,12 @@ f-src/entry.strange_suffix,172 & intensity1(577,12231 character*(*) function foo(579,12307 -f-src/entry.strange,103 - ENTRY MSGSEL 193,4382 - & intensity1(375,8135 - character*(*) function foo(377,8211 +f-src/entry.strange,171 + LOGICAL FUNCTION PRTPKG 2,2 + ENTRY SETPRT 193,3793 + ENTRY MSGSEL 394,8405 + & intensity1(576,12158 + character*(*) function foo(578,12234 forth-src/test-forth.fth,408 : a-forth-word 20,301 @@ -2634,44 +2594,44 @@ constant (a-forth-constant(a-forth-constant38,628 code assemby-code-word 43,685 : a-forth-word 50,870 -html-src/softwarelibero.html,198 -Cos' il software libero?4,38 -Licenze d'uso di un programmalicenze65,2474 -Sfatiamo alcuni miti138,6064 -Il movimento open sourceoss191,7968 -Impatto pratico del software liberoimpatto231,9986 +html-src/softwarelibero.html,200 +Cos'è il software libero?4,38 +Licenze d'uso di un programmalicenze65,2500 +Sfatiamo alcuni miti138,6118 +Il movimento open sourceoss191,8037 +Impatto pratico del software liberoimpatto231,10066 html-src/index.shtml,104  8,281 -In evidenza15,446 -Comunicati e iniziative32,974 -Ultime notizie dall'associazione63,2027 +In evidenza15,447 +Comunicati e iniziative32,976 +Ultime notizie dall'associazione63,2030 html-src/algrthms.html,467 -Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,276 -Descriptionalgorithms10,477 -Generating the Datagenalgorithm48,1953 -Convolutionallyconalgorithm55,2463 -Nextstatetable262,11331 -Outputoutputtable350,13571 -Mapping the Channel Symbolsmapping433,15786 -Adding Noise to theaddnoise439,16174 -Quantizing the Receivedquantizing469,18637 +Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282 +Descriptionalgorithms10,486 +Generating the Datagenalgorithm48,2000 +Convolutionallyconalgorithm55,2517 +Nextstatetable262,11592 +Outputoutputtable350,13920 +Mapping the Channel Symbolsmapping433,16218 +Adding Noise to theaddnoise439,16612 +Quantizing the Receivedquantizing469,19105 -html-src/software.html,438 -Francesco Potort Software Page9,280 -Software that I wrote for supporting my research activitysimulation36,1400 -MTGmtg41,1484 -Fracasfracas65,2626 -GaliLEOgalileo101,4234 -Leasqrleasqr114,4679 -Free software that I wrote for the GNU project or for my personal or workgnu142,6067 -Etagsetags148,6182 -checkiso161,6731 -cgrep178,7549 -debian-bug.eldebian-bug190,7981 -tcpdump205,8566 -Links to interesting softwarelinks216,8893 +html-src/software.html,439 +Francesco Potortì Software Page9,280 +Software that I wrote for supporting my research activitysimulation36,1398 +MTGmtg41,1482 +Fracasfracas65,2624 +GaliLEOgalileo101,4232 +Leasqrleasqr114,4677 +Free software that I wrote for the GNU project or for my personal or workgnu142,6065 +Etagsetags148,6180 +checkiso161,6729 +cgrep178,7547 +debian-bug.eldebian-bug190,7979 +tcpdump205,8564 +Links to interesting softwarelinks216,8891 lua-src/allegro.lua,400 local function get_layer_by_name 7,175 @@ -4074,7 +4034,7 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno % \global\def={=3306,107486 \def\normalbackslash{\normalbackslash3320,107868 -c-src//c.c,76 +c-src/c.c,76 T f(1,0 }T i;2,14 void bar(5,69 diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4 index 5d31c36..438e8b5 100644 --- a/test/etags/ETAGS.good_4 +++ b/test/etags/ETAGS.good_4 @@ -1,46 +1,4 @@ -Makefile,683 -ADASRC=1,0 -ASRC=2,91 -CSRC=3,139 -CPSRC=7,410 -ELSRC=10,584 -ERLSRC=11,654 -FORTHSRC=12,699 -FSRC=13,749 -HTMLSRC=14,821 -LUASRC=16,950 -MAKESRC=17,993 -OBJCSRC=18,1035 -OBJCPPSRC=19,1116 -PASSRC=20,1179 -PERLSRC=21,1221 -PHPSRC=22,1291 -PSSRC=23,1363 -PROLSRC=24,1403 -PYTSRC=25,1465 -TEXSRC=26,1506 -YSRC=27,1585 -SRCS=28,1650 -NONSRCS=32,1902 -ETAGS_PROG=34,1976 -CTAGS_PROG=35,2007 -REGEX=37,2039 -xx=38,2085 -RUN=40,2134 -OPTIONS=42,2140 -ARGS=43,2192 -infiles 45,2210 -check:check47,2272 -ediff%:ediff%55,2575 -cdiff:cdiff58,2676 -ETAGS:ETAGS61,2773 -CTAGS:CTAGS64,2843 -srclist:srclist67,2921 -regexfile:regexfile71,3012 -.PRECIOUS:.PRECIOUS77,3189 -FRC:FRC79,3223 - ada-src/etags-test-for.ada,1969 type LL_Task_Procedure_Access LL_Task_Procedure_Access/t1,0 function Body_RequiredBody_Required/f3,78 @@ -645,18 +603,18 @@ char **tab_fill(tab_fill70,1129 int tab_delete_first(91,1638 int tab_count_words(103,1820 -c-src/dostorture.c,197 -(*tag1 tag118,451 -#define notag2 26,552 -(*tag2 tag229,629 -(*tag3 tag339,771 -#define notag4 45,860 -(*tag4 tag448,954 -tag5 57,1080 -tag6 66,1207 -int pp1(74,1316 -pp287,1418 -pp3(100,1517 +c-src/dostorture.c,198 +(*tag1 tag118,468 +#define notag2 26,577 +(*tag2 tag229,657 +(*tag3 tag339,809 +#define notag4 45,904 +(*tag4 tag448,1001 +tag5 57,1136 +tag6 66,1272 +int pp1(74,1389 +pp287,1504 +pp3(100,1616 c-src/emacs/src/gmalloc.c,3539 #define USE_PTHREAD25,1002 @@ -2115,46 +2073,46 @@ template class AT 52,1668 class AU 53,1716 class B<B54,1735 class B { void f(B::f54,1735 -const A::B::T& abt 55,1765 -class A 56,1791 -class A { class B A::B56,1791 -class A 57,1826 - A operator+(A::operator+59,1860 -is_muldiv_operation(61,1887 -domain foo 68,1955 - void f(foo::f69,1968 -void A::A(72,1989 -struct A 73,2004 -struct B 74,2022 -void B::B(75,2041 -void BE_Node::BE_Node(76,2056 -class BE_Node 77,2083 -struct foo 79,2102 -class test 86,2156 - int f(test::f87,2169 - int ff(test::ff89,2231 - int g(test::g90,2254 -class AST_Root 92,2278 -AST_ConcreteType::AST_ConcreteType(99,2393 -AST_Array::AST_Array(107,2532 - void f(::f115,2733 -struct A 117,2753 -A::~A(120,2777 -struct B 122,2789 - ~B(B::~B123,2800 -enum {dog,::dog126,2817 -enum {dog, cat}::cat126,2817 -enum {dog, cat} animals;126,2817 -struct {int teats;} cow;127,2842 -class Boo 129,2868 - enum {dog,Boo::dog130,2880 - enum {dog, cat}Boo::cat130,2880 - foo(Boo::foo133,2954 - Boo(Boo::Boo137,2995 -Boo::Boo(141,3070 -typedef int should_see_this_one_enclosed_in_extern_C;149,3155 -typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228 -typedef int should_see_this_array_type[should_see_this_array_type156,3310 +const A::B::T& abt 55,1766 +class A 56,1792 +class A { class B A::B56,1792 +class A 57,1827 + A operator+(A::operator+59,1861 +is_muldiv_operation(61,1888 +domain foo 68,1956 + void f(foo::f69,1969 +void A::A(72,1990 +struct A 73,2005 +struct B 74,2023 +void B::B(75,2042 +void BE_Node::BE_Node(76,2057 +class BE_Node 77,2084 +struct foo 79,2103 +class test 86,2157 + int f(test::f87,2170 + int ff(test::ff89,2232 + int g(test::g90,2255 +class AST_Root 92,2279 +AST_ConcreteType::AST_ConcreteType(99,2394 +AST_Array::AST_Array(107,2533 + void f(::f115,2734 +struct A 117,2754 +A::~A(120,2778 +struct B 122,2790 + ~B(B::~B123,2801 +enum {dog,::dog126,2818 +enum {dog, cat}::cat126,2818 +enum {dog, cat} animals;126,2818 +struct {int teats;} cow;127,2843 +class Boo 129,2869 + enum {dog,Boo::dog130,2881 + enum {dog, cat}Boo::cat130,2881 + foo(Boo::foo133,2955 + Boo(Boo::Boo137,2996 +Boo::Boo(141,3071 +typedef int should_see_this_one_enclosed_in_extern_C;149,3156 +typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229 +typedef int should_see_this_array_type[should_see_this_array_type156,3311 cp-src/burton.cpp,103 ::dummy::dummy test::dummy1(1,0 @@ -2462,10 +2420,12 @@ f-src/entry.strange_suffix,172 & intensity1(577,12231 character*(*) function foo(579,12307 -f-src/entry.strange,103 - ENTRY MSGSEL 193,4382 - & intensity1(375,8135 - character*(*) function foo(377,8211 +f-src/entry.strange,171 + LOGICAL FUNCTION PRTPKG 2,2 + ENTRY SETPRT 193,3793 + ENTRY MSGSEL 394,8405 + & intensity1(576,12158 + character*(*) function foo(578,12234 forth-src/test-forth.fth,408 : a-forth-word 20,301 @@ -2481,44 +2441,44 @@ constant (a-forth-constant(a-forth-constant38,628 code assemby-code-word 43,685 : a-forth-word 50,870 -html-src/softwarelibero.html,198 -Cos' il software libero?4,38 -Licenze d'uso di un programmalicenze65,2474 -Sfatiamo alcuni miti138,6064 -Il movimento open sourceoss191,7968 -Impatto pratico del software liberoimpatto231,9986 +html-src/softwarelibero.html,200 +Cos'è il software libero?4,38 +Licenze d'uso di un programmalicenze65,2500 +Sfatiamo alcuni miti138,6118 +Il movimento open sourceoss191,8037 +Impatto pratico del software liberoimpatto231,10066 html-src/index.shtml,104  8,281 -In evidenza15,446 -Comunicati e iniziative32,974 -Ultime notizie dall'associazione63,2027 +In evidenza15,447 +Comunicati e iniziative32,976 +Ultime notizie dall'associazione63,2030 html-src/algrthms.html,467 -Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,276 -Descriptionalgorithms10,477 -Generating the Datagenalgorithm48,1953 -Convolutionallyconalgorithm55,2463 -Nextstatetable262,11331 -Outputoutputtable350,13571 -Mapping the Channel Symbolsmapping433,15786 -Adding Noise to theaddnoise439,16174 -Quantizing the Receivedquantizing469,18637 +Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282 +Descriptionalgorithms10,486 +Generating the Datagenalgorithm48,2000 +Convolutionallyconalgorithm55,2517 +Nextstatetable262,11592 +Outputoutputtable350,13920 +Mapping the Channel Symbolsmapping433,16218 +Adding Noise to theaddnoise439,16612 +Quantizing the Receivedquantizing469,19105 -html-src/software.html,438 -Francesco Potort Software Page9,280 -Software that I wrote for supporting my research activitysimulation36,1400 -MTGmtg41,1484 -Fracasfracas65,2626 -GaliLEOgalileo101,4234 -Leasqrleasqr114,4679 -Free software that I wrote for the GNU project or for my personal or workgnu142,6067 -Etagsetags148,6182 -checkiso161,6731 -cgrep178,7549 -debian-bug.eldebian-bug190,7981 -tcpdump205,8566 -Links to interesting softwarelinks216,8893 +html-src/software.html,439 +Francesco Potortì Software Page9,280 +Software that I wrote for supporting my research activitysimulation36,1398 +MTGmtg41,1482 +Fracasfracas65,2624 +GaliLEOgalileo101,4232 +Leasqrleasqr114,4677 +Free software that I wrote for the GNU project or for my personal or workgnu142,6065 +Etagsetags148,6180 +checkiso161,6729 +cgrep178,7547 +debian-bug.eldebian-bug190,7979 +tcpdump205,8564 +Links to interesting softwarelinks216,8891 lua-src/allegro.lua,400 local function get_layer_by_name 7,175 @@ -3894,7 +3854,7 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno % \global\def={=3306,107486 \def\normalbackslash{\normalbackslash3320,107868 -c-src//c.c,76 +c-src/c.c,76 T f(1,0 }T i;2,14 void bar(5,69 diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5 index c7357d0..b4b2750 100644 --- a/test/etags/ETAGS.good_5 +++ b/test/etags/ETAGS.good_5 @@ -1,46 +1,4 @@ -Makefile,683 -ADASRC=1,0 -ASRC=2,91 -CSRC=3,139 -CPSRC=7,410 -ELSRC=10,584 -ERLSRC=11,654 -FORTHSRC=12,699 -FSRC=13,749 -HTMLSRC=14,821 -LUASRC=16,950 -MAKESRC=17,993 -OBJCSRC=18,1035 -OBJCPPSRC=19,1116 -PASSRC=20,1179 -PERLSRC=21,1221 -PHPSRC=22,1291 -PSSRC=23,1363 -PROLSRC=24,1403 -PYTSRC=25,1465 -TEXSRC=26,1506 -YSRC=27,1585 -SRCS=28,1650 -NONSRCS=32,1902 -ETAGS_PROG=34,1976 -CTAGS_PROG=35,2007 -REGEX=37,2039 -xx=38,2085 -RUN=40,2134 -OPTIONS=42,2140 -ARGS=43,2192 -infiles 45,2210 -check:check47,2272 -ediff%:ediff%55,2575 -cdiff:cdiff58,2676 -ETAGS:ETAGS61,2773 -CTAGS:CTAGS64,2843 -srclist:srclist67,2921 -regexfile:regexfile71,3012 -.PRECIOUS:.PRECIOUS77,3189 -FRC:FRC79,3223 - ada-src/etags-test-for.ada,1969 type LL_Task_Procedure_Access LL_Task_Procedure_Access/t1,0 function Body_RequiredBody_Required/f3,78 @@ -781,18 +739,18 @@ char **tab_fill(tab_fill70,1129 int tab_delete_first(91,1638 int tab_count_words(103,1820 -c-src/dostorture.c,197 -(*tag1 tag118,451 -#define notag2 26,552 -(*tag2 tag229,629 -(*tag3 tag339,771 -#define notag4 45,860 -(*tag4 tag448,954 -tag5 57,1080 -tag6 66,1207 -int pp1(74,1316 -pp287,1418 -pp3(100,1517 +c-src/dostorture.c,198 +(*tag1 tag118,468 +#define notag2 26,577 +(*tag2 tag229,657 +(*tag3 tag339,809 +#define notag4 45,904 +(*tag4 tag448,1001 +tag5 57,1136 +tag6 66,1272 +int pp1(74,1389 +pp287,1504 +pp3(100,1616 c-src/emacs/src/gmalloc.c,7311 #define USE_PTHREAD25,1002 @@ -2911,61 +2869,61 @@ class AU 53,1716 class AU { T x;AU::x53,1716 class B<B54,1735 class B { void f(B::f54,1735 -const A::B::T& abt 55,1765 -class A 56,1791 -class A { class B A::B56,1791 -class A { class B { int f(A::B::f56,1791 -class A 57,1826 - int get_data(A::get_data58,1836 - A operator+(A::operator+59,1860 -is_muldiv_operation(61,1887 -domain foo 68,1955 - void f(foo::f69,1968 -void A::A(72,1989 -struct A 73,2004 -struct A { A(A::A73,2004 -struct B 74,2022 -struct B { B(B::B74,2022 -void B::B(75,2041 -void BE_Node::BE_Node(76,2056 -class BE_Node 77,2083 -struct foo 79,2102 - int x;foo::x80,2115 -class test 86,2156 - int f(test::f87,2169 - int ff(test::ff89,2231 - int g(test::g90,2254 -class AST_Root 92,2278 -class AST_Root;96,2327 -AST_ConcreteType::AST_ConcreteType(99,2393 -AST_Array::AST_Array(107,2532 - void f(::f115,2733 -struct A 117,2753 - ~A(A::~A118,2764 -A::~A(120,2777 -struct B 122,2789 - ~B(B::~B123,2800 -enum {dog,::dog126,2817 -enum {dog, cat}::cat126,2817 -enum {dog, cat} animals;126,2817 -struct {int teats;::teats127,2842 -struct {int teats;} cow;127,2842 -class Boo 129,2868 - enum {dog,Boo::dog130,2880 - enum {dog, cat}Boo::cat130,2880 - enum {dog, cat} animals;Boo::animals130,2880 - struct {int treats;Boo::treats131,2909 - struct {int treats;} cow;Boo::cow131,2909 - int i,Boo::i132,2939 - int i,a,Boo::a132,2939 - int i,a,b;Boo::b132,2939 - foo(Boo::foo133,2954 - Boo(Boo::Boo137,2995 - Boo(Boo::Boo138,3052 -Boo::Boo(141,3070 -typedef int should_see_this_one_enclosed_in_extern_C;149,3155 -typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3228 -typedef int should_see_this_array_type[should_see_this_array_type156,3310 +const A::B::T& abt 55,1766 +class A 56,1792 +class A { class B A::B56,1792 +class A { class B { int f(A::B::f56,1792 +class A 57,1827 + int get_data(A::get_data58,1837 + A operator+(A::operator+59,1861 +is_muldiv_operation(61,1888 +domain foo 68,1956 + void f(foo::f69,1969 +void A::A(72,1990 +struct A 73,2005 +struct A { A(A::A73,2005 +struct B 74,2023 +struct B { B(B::B74,2023 +void B::B(75,2042 +void BE_Node::BE_Node(76,2057 +class BE_Node 77,2084 +struct foo 79,2103 + int x;foo::x80,2116 +class test 86,2157 + int f(test::f87,2170 + int ff(test::ff89,2232 + int g(test::g90,2255 +class AST_Root 92,2279 +class AST_Root;96,2328 +AST_ConcreteType::AST_ConcreteType(99,2394 +AST_Array::AST_Array(107,2533 + void f(::f115,2734 +struct A 117,2754 + ~A(A::~A118,2765 +A::~A(120,2778 +struct B 122,2790 + ~B(B::~B123,2801 +enum {dog,::dog126,2818 +enum {dog, cat}::cat126,2818 +enum {dog, cat} animals;126,2818 +struct {int teats;::teats127,2843 +struct {int teats;} cow;127,2843 +class Boo 129,2869 + enum {dog,Boo::dog130,2881 + enum {dog, cat}Boo::cat130,2881 + enum {dog, cat} animals;Boo::animals130,2881 + struct {int treats;Boo::treats131,2910 + struct {int treats;} cow;Boo::cow131,2910 + int i,Boo::i132,2940 + int i,a,Boo::a132,2940 + int i,a,b;Boo::b132,2940 + foo(Boo::foo133,2955 + Boo(Boo::Boo137,2996 + Boo(Boo::Boo138,3053 +Boo::Boo(141,3071 +typedef int should_see_this_one_enclosed_in_extern_C;149,3156 +typedef int (*should_see_this_function_pointer)should_see_this_function_pointer153,3229 +typedef int should_see_this_array_type[should_see_this_array_type156,3311 cp-src/burton.cpp,103 ::dummy::dummy test::dummy1(1,0 @@ -3346,10 +3304,12 @@ f-src/entry.strange_suffix,172 & intensity1(577,12231 character*(*) function foo(579,12307 -f-src/entry.strange,103 - ENTRY MSGSEL 193,4382 - & intensity1(375,8135 - character*(*) function foo(377,8211 +f-src/entry.strange,171 + LOGICAL FUNCTION PRTPKG 2,2 + ENTRY SETPRT 193,3793 + ENTRY MSGSEL 394,8405 + & intensity1(576,12158 + character*(*) function foo(578,12234 forth-src/test-forth.fth,408 : a-forth-word 20,301 @@ -3365,44 +3325,44 @@ constant (a-forth-constant(a-forth-constant38,628 code assemby-code-word 43,685 : a-forth-word 50,870 -html-src/softwarelibero.html,198 -Cos' il software libero?4,38 -Licenze d'uso di un programmalicenze65,2474 -Sfatiamo alcuni miti138,6064 -Il movimento open sourceoss191,7968 -Impatto pratico del software liberoimpatto231,9986 +html-src/softwarelibero.html,200 +Cos'è il software libero?4,38 +Licenze d'uso di un programmalicenze65,2500 +Sfatiamo alcuni miti138,6118 +Il movimento open sourceoss191,8037 +Impatto pratico del software liberoimpatto231,10066 html-src/index.shtml,104  8,281 -In evidenza15,446 -Comunicati e iniziative32,974 -Ultime notizie dall'associazione63,2027 +In evidenza15,447 +Comunicati e iniziative32,976 +Ultime notizie dall'associazione63,2030 html-src/algrthms.html,467 -Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,276 -Descriptionalgorithms10,477 -Generating the Datagenalgorithm48,1953 -Convolutionallyconalgorithm55,2463 -Nextstatetable262,11331 -Outputoutputtable350,13571 -Mapping the Channel Symbolsmapping433,15786 -Adding Noise to theaddnoise439,16174 -Quantizing the Receivedquantizing469,18637 +Tutorial on Convolutional Coding with Viterbi Decoding--Description of the Data Generation, Convolutional Encoding, Channel Mapping and AWGN, and Quantizing Algorithms7,282 +Descriptionalgorithms10,486 +Generating the Datagenalgorithm48,2000 +Convolutionallyconalgorithm55,2517 +Nextstatetable262,11592 +Outputoutputtable350,13920 +Mapping the Channel Symbolsmapping433,16218 +Adding Noise to theaddnoise439,16612 +Quantizing the Receivedquantizing469,19105 -html-src/software.html,438 -Francesco Potort Software Page9,280 -Software that I wrote for supporting my research activitysimulation36,1400 -MTGmtg41,1484 -Fracasfracas65,2626 -GaliLEOgalileo101,4234 -Leasqrleasqr114,4679 -Free software that I wrote for the GNU project or for my personal or workgnu142,6067 -Etagsetags148,6182 -checkiso161,6731 -cgrep178,7549 -debian-bug.eldebian-bug190,7981 -tcpdump205,8566 -Links to interesting softwarelinks216,8893 +html-src/software.html,439 +Francesco Potortì Software Page9,280 +Software that I wrote for supporting my research activitysimulation36,1398 +MTGmtg41,1482 +Fracasfracas65,2624 +GaliLEOgalileo101,4232 +Leasqrleasqr114,4677 +Free software that I wrote for the GNU project or for my personal or workgnu142,6065 +Etagsetags148,6180 +checkiso161,6729 +cgrep178,7547 +debian-bug.eldebian-bug190,7979 +tcpdump205,8564 +Links to interesting softwarelinks216,8891 lua-src/allegro.lua,400 local function get_layer_by_name 7,175 @@ -4807,7 +4767,7 @@ Section\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno % \global\def={=3306,107486 \def\normalbackslash{\normalbackslash3320,107868 -c-src//c.c,76 +c-src/c.c,76 T f(1,0 }T i;2,14 void bar(5,69 diff --git a/test/etags/Makefile b/test/etags/Makefile index a0914e4..3f4ad7b 100644 --- a/test/etags/Makefile +++ b/test/etags/Makefile @@ -25,7 +25,7 @@ PROLSRC=$(addprefix ./prol-src/,ordsets.prolog natded.prolog) PYTSRC=$(addprefix ./pyt-src/,server.py) TEXSRC=$(addprefix ./tex-src/,testenv.tex gzip.texi texinfo.tex nonewline.tex) YSRC=$(addprefix ./y-src/,parse.y parse.c atest.y cccp.c cccp.y) -SRCS=Makefile ${ADASRC} ${ASRC} ${CSRC} ${CPSRC} ${ELSRC} ${ERLSRC} ${FSRC}\ +SRCS=${ADASRC} ${ASRC} ${CSRC} ${CPSRC} ${ELSRC} ${ERLSRC} ${FSRC}\ ${FORTHSRC} ${HTMLSRC} ${JAVASRC} ${LUASRC} ${MAKESRC} ${OBJCSRC}\ ${OBJCPPSRC} ${PASSRC} ${PHPSRC} ${PERLSRC} ${PSSRC} ${PROLSRC} ${PYTSRC}\ ${TEXSRC} ${YSRC} @@ -44,13 +44,31 @@ ARGS=- < srclist infiles = $(filter-out ${NONSRCS},${SRCS}) srclist regexfile +# This test requires a UTF-8 locale. Use the current locale if it is UTF-8, +# else $(UTF8_LOCALE) if it works, else skip this test. +UTF8_LOCALE = en_US.utf8 +UTF8_ENCODING = yes +ifneq ($(shell locale -k charmap), charmap="UTF-8") + ifeq ($(shell LC_ALL=$(UTF8_LOCALE) locale -k charmap), charmap="UTF-8") + export LC_ALL = $(UTF8_LOCALE) + else + UTF8_ENCODING = no + endif +endif + +.PHONY: check ediff_1 ediff_2 ediff_3 ediff_4 ediff_5 cdiff ETAGS CTAGS + check: + ifeq ($(UTF8_ENCODING), yes) @$(MAKE) OPTIONS='--no-members' ediff_1 @$(MAKE) OPTIONS='--declarations --no-members' ediff_2 @$(MAKE) OPTIONS='--members' ediff_3 @$(MAKE) OPTIONS='--regex=@regexfile --no-members' ediff_4 @$(MAKE) OPTIONS='nonexistent --members --declarations --regex=@regexfile' ediff_5 @$(MAKE) cdiff + else + : 'No locale with UTF-8 found; skipping check' + endif ediff%: ETAGS.good% ETAGS ${infiles} diff -u --suppress-common-lines --width=80 ETAGS.good$* ETAGS @@ -58,10 +76,10 @@ ediff%: ETAGS.good% ETAGS ${infiles} cdiff: CTAGS.good CTAGS ${infiles} diff -u --suppress-common-lines --width=80 CTAGS.good CTAGS -ETAGS: FRC ${infiles} +ETAGS: ${infiles} ${RUN} ${ETAGS_PROG} ${OPTIONS} -o $@ ${ARGS} -CTAGS: FRC ${infiles} +CTAGS: ${infiles} ${RUN} ${CTAGS_PROG} -o $@ --regex=@regexfile ${ARGS} srclist: Makefile @@ -70,10 +88,6 @@ srclist: Makefile regexfile: Makefile @echo ' -- This is for GNU Emacs source files' > regexfile - @echo '${REGEX}' >> regexfile - @echo '{c}${REGEX}\\1/m' >> regexfile + @printf '%s\n' '${REGEX}' >> regexfile + @printf '%s\n' '{c}${REGEX}\\1/m' >> regexfile @echo "regexfile remade" - -.PRECIOUS: ETAGS.good CTAGS.good - -FRC:; diff --git a/test/etags/html-src/index.shtml b/test/etags/html-src/index.shtml index 24f269f..6d8cd85 100644 --- a/test/etags/html-src/index.shtml +++ b/test/etags/html-src/index.shtml @@ -8,7 +8,7 @@

 

@@ -23,7 +23,7 @@ sostenere il disegno di legge sul software libero dal titolo "Norme in materia di pluralismo informatico sulla adozione e la diffusione del software libero e sulla - portabilit dei documenti informatici nella Pubblica + portabilità dei documenti informatici nella Pubblica Amministrazione" (XIV Legislatura Atto Senato n. 1188).

@@ -42,7 +42,7 @@ ottenere l'esenzione dal bollilno SIAE per la distribuzione di software libero a titolo oneroso o gratuito. Qui il disegno di legge - Semenzato Pieroni sul diritto d'autore. E non finita. + Semenzato Pieroni sul diritto d'autore. E non è finita.

  • Salutiamo l'arrivo di ADEOS, kernel diff --git a/test/etags/html-src/software.html b/test/etags/html-src/software.html index 4d174c6..b5de1e6 100644 --- a/test/etags/html-src/software.html +++ b/test/etags/html-src/software.html @@ -6,14 +6,14 @@ P { text-indent: 0; text-align: justify } DD { text-indent: 0; text-align: justify } --> - Francesco Potort Software Page + Francesco Potortì Software Page - + - +
    diff --git a/test/etags/html-src/softwarelibero.html b/test/etags/html-src/softwarelibero.html index 7aa74c5..1594329 100644 --- a/test/etags/html-src/softwarelibero.html +++ b/test/etags/html-src/softwarelibero.html @@ -1,27 +1,27 @@

    - Cos' il software libero? + Cos'è il software libero?

    Il concetto di software libero discende naturalmente da quello di - libert di scambio di idee e di informazioni. Negli ambienti - scientifici, quest'ultimo principio tenuto in alta considerazione - per la fecondit che ha dimostrato; ad esso infatti generalmente + libertà di scambio di idee e di informazioni. Negli ambienti + scientifici, quest'ultimo principio è tenuto in alta considerazione + per la fecondità che ha dimostrato; ad esso infatti è generalmente attribuita molta parte dell'eccezionale ed imprevedibile crescita del sapere negli ultimi tre secoli.

    - La libert di scambio di idee non tuttavia una questione puramente - pratica: essa anche alla base dei concetti di libert di pensiero e - di espressione. Analogamente alle idee, il software immateriale, e - pu essere riprodotto e trasmesso facilmente. In modo simile a quanto + La libertà di scambio di idee non è tuttavia una questione puramente + pratica: essa è anche alla base dei concetti di libertà di pensiero e + di espressione. Analogamente alle idee, il software è immateriale, e + può essere riprodotto e trasmesso facilmente. In modo simile a quanto avviene per le idee, parte essenziale del processo che sostiene la - crescita e l'evoluzione del software la sua libera diffusione. Ed - ogni giorno di pi, come le idee, il software permea il tessuto + crescita e l'evoluzione del software è la sua libera diffusione. Ed + ogni giorno di più, come le idee, il software permea il tessuto sociale e lo influenza, produce effetti etici, economici, politici e - in un senso pi generale culturali. + in un senso più generale culturali.

    Fu Richard M. Stallman, nei primi anni Ottanta, a formalizzare per la @@ -30,34 +30,34 @@ href="http://www.it.gnu.org/philosophy/free-sw.it.html">definizione di Stallman, che da subito assurse al ruolo di definizione per eccellenza di software libero, assume la forma di quattro principi di - libert: + libertà:

    -
    Libert 0, o libert fondamentale: -
    La libert di eseguire il programma per qualunque scopo, senza +
    Libertà 0, o libertà fondamentale: +
    La libertà di eseguire il programma per qualunque scopo, senza vincoli sul suo utilizzo. -
    Libert 1: -
    La libert di studiare il funzionamento del programma, e +
    Libertà 1: +
    La libertà di studiare il funzionamento del programma, e di adattarlo alle proprie esigenze. -
    Libert 2: -
    La libert di redistribuire copie del programma. +
    Libertà 2: +
    La libertà di redistribuire copie del programma. -
    Libert 3: -
    La libert di migliorare il programma, e di distribuirne +
    Libertà 3: +
    La libertà di migliorare il programma, e di distribuirne i miglioramenti.

    - Il software distribuito con una licenza che rispetti questi principi + Il software distribuito con una licenza che rispetti questi principi è detto software libero (in inglese free software). Nel 1984 Richard M. Stallman diede vita al progetto GNU, con lo scopo di tradurre in pratica il concetto di - software libero, e cre la Free Software Foundation per + software libero, e creò la Free Software Foundation per dare supporto logistico, legale ed economico al progetto GNU.

    @@ -66,19 +66,19 @@

    • - La licenza d'uso un documento legale generalmente + La licenza d'uso è un documento legale generalmente distribuito assieme a ogni programma. Essa, appoggiandosi alle norme sul diritto d'autore, specifica diritti e doveri di chi riceve tale programma.

    Gran parte delle licenze comunemente usate sono proprietarie, - cio non libere, in quanto non garantiscono le quattro libert. Quasi + cioè non libere, in quanto non garantiscono le quattro libertà. Quasi sempre tali licenze non consentono infatti la libera copia del - programma, n la sua modifica. Spesso, se il programma installato + programma, né la sua modifica. Spesso, se il programma è installato sul computer di casa, la licenza impedisce persino di installarlo sul proprio portatile (per utilizzare il programma fuori casa); se il - programma utilizzato in uno studio professionale, non consente di + programma è utilizzato in uno studio professionale, non consente di tenerlo installato su un computer di riserva, nel caso che quello principale si guasti.

    @@ -87,50 +87,50 @@ TITLE="traduzione della licenza GNU GPL" HREF="http://softwarelibero.it/gnudoc/gpl.it.txt">GNU GPL), al contrario, concede all'utente del programma tutte e quattro le - libert suddette. Inoltre si occupa anche di proteggerle: chi + libertà suddette. Inoltre si occupa anche di proteggerle: chi modifichi un programma protetto da GPL e lo distribuisca con tali - modifiche, deve distribuirlo sotto licenza GPL. grazie a questo - tipo di protezione che la GPL attualmente la licenza pi usata per + modifiche, deve distribuirlo sotto licenza GPL. È grazie a questo + tipo di protezione che la GPL è attualmente la licenza più usata per il software libero.

    Con un gioco di parole, il nome dato a questo tipo di protezione - permesso d'autore (in inglese copyleft): - il criterio che prevede che le modifiche ad un programma possano + è il criterio che prevede che le modifiche ad un programma possano essere distribuite solo con la stessa licenza del programma originale. Le licenze proprietarie usano le norme sul diritto d'autore (copyright - in inglese) per togliere libert agli utenti di un programma; il - permesso d'autore usa le stesse norme per garantire quelle libert e + in inglese) per togliere libertà agli utenti di un programma; il + permesso d'autore usa le stesse norme per garantire quelle libertà e per proteggerle.

    - La GNU GPL non unica nel suo genere. Diverse altre - licenze garantiscono le quattro libert e si possono pertanto + licenze garantiscono le quattro libertà e si possono pertanto qualificare come licenze per il software libero. Fra queste, merita una speciale menzione per la sua diffusione la licenza BSD, - la cui principale differenza dalla GPL che, non essendo basata sul + la cui principale differenza dalla GPL è che, non essendo basata sul permesso d'autore, non ha fra i propri obiettivi quello di proteggere - la libert del software cui applicata. Chi infatti modifichi un - programma protetto da BSD, pu distribuirlo con le modifiche usando + la libertà del software cui è applicata. Chi infatti modifichi un + programma protetto da BSD, può distribuirlo con le modifiche usando qualunque licenza.

    Sia BSD che GPL hanno pro e contro. La licenza GPL riflette l'idea - della cooperazione: se io concedo ad altri la libert di modificare e + della cooperazione: se io concedo ad altri la libertà di modificare e redistribuire il mio programma, costoro sono tenuti a concedere le - stesse libert sulle loro modifiche. Il problema che alcuni vedono + stesse libertà sulle loro modifiche. Il problema è che alcuni vedono questo vincolo come un'imposizione ingenerosa, se non addirittura una restrizione insopportabile. La licenza BSD riflette l'idea del dono - liberale: chiunque pu fare ci che meglio crede del mio programma. - Il problema che questo significa che chiunque pu redistribuire + liberale: chiunque può fare ciò che meglio crede del mio programma. + Il problema è che questo significa che chiunque può redistribuire anche in forma chiusa con una licenza proprietaria un programma BSD - modificato, impedendo cos ai propri acquirenti di modificarlo e + modificato, impedendo così ai propri acquirenti di modificarlo e redistribuirlo a loro volta.

    @@ -141,24 +141,24 @@

    -
    Il software libero gratuito +
    Il software libero è gratuito -
    falso: la libert del software non ha nulla a che vedere con - il suo prezzo. Bench gran parte del software libero pi diffuso +
    È falso: la libertà del software non ha nulla a che vedere con + il suo prezzo. Benché gran parte del software libero più diffuso sia distribuito gratuitamente, ci sono programmatori che vivono della vendita e della manutenzione dei programmi liberi da loro creati. -
    Il software gratuito libero +
    Il software gratuito è libero -
    falso. Molti programmi proprietari vengono distribuiti +
    È falso. Molti programmi proprietari vengono distribuiti gratuitamente. -
    Il software libero privo di copyright +
    Il software libero è privo di copyright -
    falso. Bench si possa rinunciare al copyright su un proprio - programma e renderlo cos di pubblico dominio, la gran parte del - software libero distribuito con una licenza. Per esempio, sono +
    È falso. Benché si possa rinunciare al copyright su un proprio + programma e renderlo così di pubblico dominio, la gran parte del + software libero è distribuito con una licenza. Per esempio, sono licenze di copyright la licenza BSD e la GNU GPL, anche se per qualificare quest'ultima spesso si parla di permesso d'autore (copyleft). @@ -167,17 +167,17 @@ amministrazione, ma anche nei paesi poveri, ridurrebbe i costi relativi al software -
    Potrebbe essere vero, ma una seria valutazione dei costi molto +
    Potrebbe essere vero, ma una seria valutazione dei costi è molto difficile. Qualunque tipo di software, se usato in ambito non domestico, ha dei costi di manutenzione che sono solitamente maggiori del suo prezzo di acquisto. I motivi per sostenere l'uso del software libero, specie in ambiti pubblici, riguardano anzitutto - la libert, non il prezzo. + la libertà, non il prezzo. commit ef5c3eb66b78e3cfd698d2b44c49ff4bd461e13d Author: Paul Eggert Date: Sun May 17 17:16:26 2015 -0700 Rename 'foo-gzipped' to 'foo.gz' * test/automated/data/decompress/foo.gz: Rename from test/automated/data/decompress/foo-gzipped, to make it easier for other tools to tell that it's compressed. * test/automated/zlib-tests.el (zlib--decompress): Adjust to renamed file. diff --git a/test/automated/data/decompress/foo-gzipped b/test/automated/data/decompress/foo-gzipped deleted file mode 100644 index a68653f..0000000 Binary files a/test/automated/data/decompress/foo-gzipped and /dev/null differ diff --git a/test/automated/data/decompress/foo.gz b/test/automated/data/decompress/foo.gz new file mode 100644 index 0000000..a68653f Binary files /dev/null and b/test/automated/data/decompress/foo.gz differ diff --git a/test/automated/zlib-tests.el b/test/automated/zlib-tests.el index 6718601..c6c084d 100644 --- a/test/automated/zlib-tests.el +++ b/test/automated/zlib-tests.el @@ -35,7 +35,7 @@ (with-temp-buffer (set-buffer-multibyte nil) (insert-file-contents-literally - (expand-file-name "foo-gzipped" zlib-tests-data-directory)) + (expand-file-name "foo.gz" zlib-tests-data-directory)) (zlib-decompress-region (point-min) (point-max)) (buffer-string)) "foo\n")))) commit d7b3166e2b919df811694778dd4bde3e26e74cbc Author: Dmitry Gutov Date: Mon May 18 02:01:04 2015 +0300 Set up default-directory * lisp/vc/vc-annotate.el (vc-annotate-mode-map): Remove duplicate binding for `v'. (vc-annotate-show-changeset-diff-revision-at-line): Set up an appropriate value for default-directory. diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index 8bcea5f..d369c90 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el @@ -175,7 +175,6 @@ List of factors, used to expand/compress the time scale. See `vc-annotate'." (define-key m "p" 'vc-annotate-prev-revision) (define-key m "w" 'vc-annotate-working-revision) (define-key m "v" 'vc-annotate-toggle-annotation-visibility) - (define-key m "v" 'vc-annotate-toggle-annotation-visibility) (define-key m "\C-m" 'vc-annotate-goto-line) m) "Local keymap used for VC-Annotate mode.") @@ -605,7 +604,10 @@ the file in question, search for the log entry required and move point." (interactive) (when (eq 'file (vc-call-backend vc-annotate-backend 'revision-granularity)) (error "The %s backend does not support changeset diffs" vc-annotate-backend)) - (vc-annotate-show-diff-revision-at-line-internal nil)) + ;; Make sure `diff-goto-source' will be able to find all files. + (let ((default-directory (vc-call-backend vc-annotate-backend + 'root default-directory))) + (vc-annotate-show-diff-revision-at-line-internal nil))) (defun vc-annotate-warp-revision (revspec &optional file) "Annotate the revision described by REVSPEC. commit 76f2d19edd7180874f9539897f674ae05d892419 Author: Samer Masterson Date: Sun May 17 14:55:16 2015 -0700 * lisp/eshell/em-term.el (eshell-term-sentinel): No-op by default, only kills term buffer if `eshell-destroy-buffer-when-process-dies' is non-nil. (Bug#18108) (eshell-destroy-buffer-when-process-dies): New custom to preserve previous behavior. diff --git a/etc/NEWS b/etc/NEWS index cf26ded..c040186 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -681,6 +681,14 @@ buffers from eshell more convenient. Custom variable `eshell-buffer-shorthand', which has been broken for a while, has been removed. +*** By default, eshell "visual" program buffers (created by +`eshell-visual-commands' and similar custom vars) are no longer killed +when their processes die. This fixes issues with short-lived commands +and makes visual programs more useful in general. For example, if +"git log" is a visual command, it will always show the visual command +buffer, even if the "git log" process dies. For the old behavior, +make the new option `eshell-destroy-buffer-when-process-dies' non-nil. + ** Browse-url *** Support for the Conkeror web browser. diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index 4a6ac23..9ac2813 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el @@ -132,6 +132,13 @@ character to the invoked process." :type 'boolean :group 'eshell-term) +(defcustom eshell-destroy-buffer-when-process-dies nil + "If non-nil, term buffers are destroyed after their processes die. +WARNING: Setting this to non-nil may result in unexpected +behavior for short-lived processes, see bug#18108." + :type 'boolean + :group 'eshell-term) + ;;; Internal Variables: (defvar eshell-parent-buffer) @@ -190,20 +197,24 @@ allowed." nil) ;; Process sentinels receive two arguments. -(defun eshell-term-sentinel (proc _string) - "Destroy the buffer visiting PROC." - (let ((proc-buf (process-buffer proc))) - (when (and proc-buf (buffer-live-p proc-buf) - (not (eq 'run (process-status proc))) - (= (process-exit-status proc) 0)) - (if (eq (current-buffer) proc-buf) - (let ((buf (and (boundp 'eshell-parent-buffer) - eshell-parent-buffer - (buffer-live-p eshell-parent-buffer) - eshell-parent-buffer))) - (if buf - (switch-to-buffer buf)))) - (kill-buffer proc-buf)))) +(defun eshell-term-sentinel (proc msg) + "Clean up the buffer visiting PROC. +If `eshell-destroy-buffer-when-process-dies' is non-nil, destroy +the buffer." + (term-sentinel proc msg) ;; First call the normal term sentinel. + (when eshell-destroy-buffer-when-process-dies + (let ((proc-buf (process-buffer proc))) + (when (and proc-buf (buffer-live-p proc-buf) + (not (eq 'run (process-status proc))) + (= (process-exit-status proc) 0)) + (if (eq (current-buffer) proc-buf) + (let ((buf (and (boundp 'eshell-parent-buffer) + eshell-parent-buffer + (buffer-live-p eshell-parent-buffer) + eshell-parent-buffer))) + (if buf + (switch-to-buffer buf)))) + (kill-buffer proc-buf))))) ;; jww (1999-09-17): The code below will allow Eshell to send input ;; characters directly to the currently running interactive process. commit e37da5a4a8055826f0fc1051083495a828509672 Author: Samer Masterson Date: Fri May 15 19:42:00 2015 -0700 eshell: Introduce new buffer syntax The new buffer syntax '#' is equivalent to '#'. Remove `eshell-buffer-shorthand', as it is no longer needed (Bug#19319). * lisp/eshell/esh-io.el (eshell-buffer-shorthand): Remove. (eshell-get-target): Remove shorthand-specific code. * lisp/eshell/esh-arg.el (eshell-parse-special-reference): Parse '#'. diff --git a/etc/NEWS b/etc/NEWS index fdd0c87..cf26ded 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -675,6 +675,12 @@ command line's password prompt. *** The new built-in command `clear' can scroll window contents out of sight. If provided with an optional non-nil argument, the scrollback contents will be cleared. +*** New buffer syntax '#', which is equivalent to +'#'. This shorthand makes interacting with +buffers from eshell more convenient. Custom variable +`eshell-buffer-shorthand', which has been broken for a while, has been +removed. + ** Browse-url *** Support for the Conkeror web browser. diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index a5f697f..49ba727 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -357,22 +357,31 @@ after are both returned." (goto-char (1+ end))))))) (defun eshell-parse-special-reference () - "Parse a special syntax reference, of the form '#'." - (if (and (not eshell-current-argument) - (not eshell-current-quoted) - (looking-at "#<\\(buffer\\|process\\)\\s-")) - (let ((here (point))) - (goto-char (match-end 0)) - (let* ((buffer-p (string= (match-string 1) "buffer")) - (end (eshell-find-delimiter ?\< ?\>))) - (if (not end) - (throw 'eshell-incomplete ?\<) - (if (eshell-arg-delimiter (1+ end)) - (prog1 - (list (if buffer-p 'get-buffer-create 'get-process) - (buffer-substring-no-properties (point) end)) - (goto-char (1+ end))) - (ignore (goto-char here)))))))) + "Parse a special syntax reference, of the form '#'. + +args := `type' `whitespace' `arbitrary-args' | `arbitrary-args' +type := \"buffer\" or \"process\" +arbitrary-args := any string of characters. + +If the form has no 'type', the syntax is parsed as if 'type' were +\"buffer\"." + (when (and (not eshell-current-argument) + (not eshell-current-quoted) + (looking-at "#<\\(\\(buffer\\|process\\)\\s-\\)?")) + (let ((here (point))) + (goto-char (match-end 0)) ;; Go to the end of the match. + (let ((buffer-p (if (match-string 1) + (string= (match-string 2) "buffer") + t)) ;; buffer-p is non-nil by default. + (end (eshell-find-delimiter ?\< ?\>))) + (when (not end) + (throw 'eshell-incomplete ?\<)) + (if (eshell-arg-delimiter (1+ end)) + (prog1 + (list (if buffer-p 'get-buffer-create 'get-process) + (buffer-substring-no-properties (point) end)) + (goto-char (1+ end))) + (ignore (goto-char here))))))) (defun eshell-parse-delimiter () "Parse an argument delimiter, which is essentially a command operator." diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index 7dfc39f..dc731bc 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -31,6 +31,18 @@ ;; consistent with most shells. Therefore, only unique features are ;; mentioned here. ;; +;;;_* Redirect to a Buffer or Process +;; +;; Buffers and processes can be named with '#' and +;; '#', respectively. As a shorthand, +;; '#' without the explicit "buffer" arg is equivalent to +;; '#'. +;; +;; echo hello > # # Overwrite '*scratch*' with 'hello'. +;; echo hello > #<*scratch*> # Same as the command above. +;; +;; echo hello > # # Pipe "hello" into the shell process. +;; ;;;_* Insertion ;; ;; To insert at the location of point in a buffer, use '>>>': @@ -98,19 +110,6 @@ other buffers) ." :type 'integer :group 'eshell-io) -(defcustom eshell-buffer-shorthand nil - "If non-nil, a symbol name can be used for a buffer in redirection. -If nil, redirecting to a buffer requires buffer name syntax. If this -variable is set, redirection directly to Lisp symbols will be -impossible. - -Example: - - echo hello > '*scratch* ; works if `eshell-buffer-shorthand' is t - echo hello > # ; always works" - :type 'boolean - :group 'eshell-io) - (defcustom eshell-print-queue-size 5 "The size of the print queue, for doing buffered printing. This is basically a speed enhancement, to avoid blocking the Lisp code @@ -355,21 +354,14 @@ it defaults to `insert'." (goto-char (point-max)))) (point-marker)))))) - ((or (bufferp target) - (and (boundp 'eshell-buffer-shorthand) - (symbol-value 'eshell-buffer-shorthand) - (symbolp target) - (not (memq target '(t nil))))) - (let ((buf (if (bufferp target) - target - (get-buffer-create - (symbol-name target))))) - (with-current-buffer buf - (cond ((eq mode 'overwrite) - (erase-buffer)) - ((eq mode 'append) - (goto-char (point-max)))) - (point-marker)))) + + ((bufferp target) + (with-current-buffer target + (cond ((eq mode 'overwrite) + (erase-buffer)) + ((eq mode 'append) + (goto-char (point-max)))) + (point-marker))) ((functionp target) nil) commit b510a83ef677c3876cfd71d6bebf0e2ecaf2f976 Author: Glenn Morris Date: Sun May 17 14:02:52 2015 -0400 ; Auto-commit of ChangeLog files. diff --git a/ChangeLog.2 b/ChangeLog.2 index d1c9477..b75a665 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,3 +1,604 @@ +2015-05-17 Johan Bockgård + + Fix integer-valued `mouse-highlight' (Bug#20590) + * src/xterm.c (handle_one_xevent) [USE_GTK]: Fix ifdef scope. + +2015-05-17 Eli Zaretskii + + MS-Windows followup for ASCIIfication of curved quotes + * lisp/term/w32console.el (terminal-init-w32console): Repeat the + test for curved quotes being displayable, after switching the + terminal encoding. (Bug#20545) + +2015-05-17 Paul Eggert + + Spelling fixes + +2015-05-17 Jan D + + Add comment that x_shift_glyphs_for_insert is never called. + * xterm.c (x_shift_glyphs_for_insert, x_redisplay_interface): Add + comment that this function is never called. + +2015-05-16 Glenn Morris + + * src/lisp.mk: Remove from repository and generate at build-time. + * src/Makefile.in (lisp.mk): New rule to generate from loadup.el. + (shortlisp_filter): New variable. + (emacs$(EXEEXT), $(etc)/DOC): Depend on lisp.mk. + (distclean): Remove lisp.mk. + * Makefile.in ($(MAKEFILE_NAME)): No longer depend on src/lisp.mk. + * lisp/loadup.el: Tweak layout to make it easier to parse. + * make-dist: Do not distribute src/lisp.mk. + +2015-05-16 Dmitry Gutov + + Display shorter dates in Git annotate output + * lisp/vc/vc-git.el (vc-git-annotate-command): Use the short date + format (when not overridden with vc-git-annotate-switches). + (vc-git-annotate-time): Support the short format, as well as ISO + 8601 that has been used until now (bug#5428). + +2015-05-16 Paul Eggert + + ASCIIfy curved quotes on displays lacking them + * lisp/international/mule-cmds.el (set-locale-environment): + If curved quotes don't work, display straight ASCII approximations + (Bug#20545). + +2015-05-16 Glenn Morris + + Small src/Makefile simplification. + * src/lisp.mk (shortlisp): Rename from lisp, remove $lispsource prefix. + * src/Makefile.in (lisp): Derive from shortlisp. + ($(etc)/DOC): Use $shortlisp rather than parsing lisp.mk. + +2015-05-16 Eli Zaretskii + + * lisp/help-mode.el (help-go-forward): Doc fix. + (Bug#20577) + + * doc/lispref/debugging.texi (Profiling): Improve indexing. + (Bug#20576) + +2015-05-16 Dmitry Gutov + + Use `unless' to have one fewer `not' + * lisp/vc/vc-git.el (vc-git-resolve-when-done): Use `unless' to + have one fewer `not'. + + Remove redundant :group declarations from vc-git.el + * lisp/vc/vc-git.el (vc-git-diff-switches) + (vc-git-annotate-switches, vc-git-resolve-conflicts) + (vc-git-program, vc-git-root-log-format): Remove the redundant + :group declarations. + +2015-05-16 Nicolas Petton + + Removes the predicate from lisp-complete-symbol (Bug#20456) + * lisp/emacs-lisp/lisp.el (lisp-complete-symbol): Do not use predicate + and remove it from the docstring. + +2015-05-16 Dmitry Gutov + + Add new option vc-git-resolve-conflicts + * lisp/vc/vc-git.el (vc-git-resolve-conflicts): New variable. + (vc-git-find-file-hook): Add to after-save-hook only when the + above is non-nil. + (vc-git-resolve-when-done): Update to honor the new variable. + (Bug#20292) + +2015-05-16 Eli Zaretskii + + Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs + +2015-05-16 Artur Malabarba + + * lisp/emacs-lisp/tabulated-list.el: Don't error on nil header-string + (tabulated-list-init-header): Document new behavior. + (tabulated-list-print-fake-header): No nothing if + `tabulated-list--header-string' is nil. + (tabulated-list--header-string): Add a docstring. + * doc/lispref/modes.texi (Tabulated List Mode): Document it. + * etc/NEWS: Document it. + +2015-05-15 Leo Liu + + Revert "Fix cps--gensym" + * lisp/emacs-lisp/generator.el (cps--gensym): Revert commit + fbda511ab8069d0115eafca411a43353b85431b1 on 2015-05-14. + +2015-05-15 Glenn Morris + + Replace AC_SUBST_FILE in configure with include in Makefiles. + * configure.ac (DEPDIR, MKDEPDIR, deps_frag, lwlib_deps_frag) + (oldxmenu_deps_frag, lisp_frag): Remove output variables/files. + (AUTO_DEPEND): New output variable. + * lwlib/Makefile.in (AUTO_DEPEND): New, set by configure. + (DEPFLAGS, MKDEPDIR): Set directly via conditional. + (lwlib_deps_frag): Replace by conditional include. + * lwlib/autodeps.mk: Remove file. + * oldXMenu/Makefile.in (AUTO_DEPEND): New, set by configure. + (DEPFLAGS, MKDEPDIR): Set directly via conditional. + (oldxmenu_deps_frag): Replace by conditional include. + * oldXMenu/autodeps.mk: Remove file. + * src/Makefile.in (AUTO_DEPEND): New, set by configure. + (DEPFLAGS, MKDEPDIR): Set directly via conditional. + (lisp_frag): Replace by an include. + (deps_frag): Replace by conditional include. + * src/autodeps.mk: Remove file. + + Tweak japanese.el's loading of dependencies. + * lisp/loadup.el: Explicitly load cp51932 and eucjp-ms. + * lisp/language/japanese.el: Use require rather than load. + * lisp/international/cp51932.el, lisp/international/eucjp-ms.el: + Provide a feature. + * admin/charsets/eucjp-ms.awk, admin/charsets/cp51932.awk: + Provide a feature in the generated file. + +2015-05-15 Jan D + + Fix NS warnings. + * nsmenu.m (ns_popup_dialog) + * nsimage.m (initFromXBM:width:height:fg:bg:) + * nsfns.m (Fx_create_frame): Remove unused variables. + (Fns_read_file_name): Initialize fname, remove ret. + * nsterm.m (ns_draw_window_cursor): Handle DEFAULT_CURSOR in switch. + (ns_get_color, ns_set_horizontal_scroll_bar, keyDown): Remove unused + variable. + (init): Add parantesis in if. + (ns_create_terminal): Assign set_horizontal_scroll_bar_hook. + +2015-05-15 Jan Djärv + + Fix a enum conversion warning in macfont.m + * src/macfont.h (CharacterCollection): Typedef to NSCharacterCollection. + (MAC_CHARACTER_COLLECTION_*): Use the NS variants. + +2015-05-15 Eli Zaretskii + + Support de-alt dictionary with Aspell. + * lisp/textmodes/ispell.el (ispell-aspell-find-dictionary): + Support Aspell dictionaries with names like "de-alt". (Bug#20581) + +2015-05-15 Jan Djärv + + cus-start.el: Add ns-confirm-quit. + * cus-start.el: Add ns-confirm-quit. + + Fix warnings on OSX 10.10. + * nsfns.m (MODAL_OK_RESPONSE): New define for different OSX versions. + (Fns_read_file_name): Check against MODAL_OK_RESPONSE. + (compute_tip_xy): Use convertRectToScreen for OSX >= 10.7 + * nsmenu.m (initWithContentRect:styleMask:backing:defer:) + * nsimage.m (allocInitFromFile, setPixmapData): Only call + setScalesWhenResized for OSX < 10.6. + * nsterm.h (EmacsScroller): Declare scrollerWidth. + * nsterm.m (ns_copy_bits): New function that does not use deprecated + NSCopyBits. + (ns_scroll_run, ns_shift_glyphs_for_insert): Call ns_copy_bits. + (runAlertPanel): New function. + (applicationShouldTerminate:): Call runAlertPanel. + (initFrameFromEmacs, toggleFullScreen:): Only call useOptimizedDrawing + for OSX < 10.10. + (initFrameFromEmacs:): Only call allocateGState for OSX < 10.10. + (windowWillUseStandardFrame:defaultFrame:): Cast arg to abs to int. + (draggingEntered:): Returns NSDragOperation. + (scrollerWidth): Use scrollerWidthForControlSize for OSX >= 10.7. + +2015-05-15 Artur Malabarba + + * lisp/emacs-lisp/package.el: Don't ensure-init during startup + (package--init-file-ensured): New variable. + (package-initialize, package--ensure-init-file): Use it. + +2015-05-15 Jan Djärv + + Honor :fore/background for XBM on NS (Bug#14969). + * nsterm.h (EmacsImage): Add xbm_fg, remove initFromSkipXBM, + initFromXBM takes bg, fg args, remove flip arg. + (ns_image_from_XBM): Add bg, fg args. + * image.c (x_create_bitmap_from_data) + (Create_Pixmap_From_Bitmap_Data): ns_image_from_XBM takes bg, fg args. + * nsimage.m (ns_image_from_XBM): Add fg, bg args, pass to initFromXBM. + Remove flip arg. + (initFromSkipXBM): Move code to initFromXBM. + (initFromXBM): Actually set fg and bg, instead of playing alpha games. + Use fg, bg from args (Bug#14969). Remove if (length) section, was always + false. + Remove bit flipping (bitPat, swt), generated incorrect images when + width/height wasn't a multiple of 8. + (setXBMColor:): Modify planes by comparing to saved xbm_fg. + * nsterm.m (ns_draw_fringe_bitmap): initFromXBM takes fg, bg args, remove + flip arg. + +2015-05-15 Artur Malabarba + + * lisp/emacs-lisp/package.el: Be more careful with the init file + (package--ensure-init-file): Check that user-init-file is set, + exists, is readable, and is writable. (Bug#20584) + Also expand the docstring. + +2015-05-14 Wilson Snyder + + Sync with upstream verilog-mode revision 6232468 + * lisp/progmodes/verilog-mode.el (verilog-font-lock-grouping-keywords-face) + (verilog-highlight-grouping-keywords): Fix use of face when + `verilog-highlight-grouping-keywords' set. Reported by Jeff + Pompa. + (verilog-auto-reset): Fix AUTORESET to ignore member resets if + parent is reset, bug906. Reported by Ken Schmidt. + (verilog-auto-inout-module): Add fourth regexp argument to + AUTOINOUTMODULE and AUTOINOUTCOMP for signals to not match, + bug856. Reported by John Tillema. + (verilog-auto-inst-port): Fix AUTOINST interfaces to not show + modport if signal attachment is itself a modport. Reported by + Matthew Lovell. + (verilog-auto-reset, verilog-auto-sense-sigs): Fix AUTORESET with + always_comb and always_latch, bug844. Reported by Greg Hilton. + (verilog-at-constraint-p, verilog-beg-of-statement-1): Fix hanging + with many curly-bracket pairs, bug663. + (verilog-set-auto-endcomments): Fix end comments for functions of + type void, etc. Reported by Alex Reed. + (verilog-do-indent): Fix electric tab deleting form-feeds. Note + caused by indent-line-to deleting tabls pre 24.5. + (verilog-nameable-item-re): Fix nameable items that can have an + end-identifier to include endchecker, endgroup, endprogram, + endproperty, and endsequence. Reported by Alex Reed. + (verilog-label-be): When auto-commenting a buffer, consider + auto-comments on all known keywords (not just a subset thereof). + Reported by Alex Reed. + (verilog-auto-end-comment-lines-re) + (verilog-end-block-ordered-re, verilog-set-auto-endcomments): + Automatically comment property/endproperty blocks to match other + similar blocks like sequence/endsequence, function/endfunction, + etc. Reported by Alex Reed. + (verilog-set-auto-endcomments): Detect the function- or task-name + when auto-commenting blocks that lack an explicit + portlist. Reported by Alex Reed. + (verilog-auto, verilog-auto-insert-last): Add AUTOINSERTLAST to + allow post-AUTO user fixups, bug826. Reported by Dennis + Muhlestein. + (verilog-no-indent-begin-re): When `verilog-indent-begin-after-if' + is nil, fix indenting initial/final to match always statements, + bug825. Reported by Tim Clapp. + (verilog-extended-complete-re): Fix indentation of DPI-C imports + with c_identifiers, and DPI-C imports, bug557. Reported by ZeDong + Mao and Jason Forkey. + (verilog-read-decls): Fix parsing typed interfaces. Fix + AUTOINOUTMODPORT missing types. Reported by Stephan Bourduas. + Fix localparam not being ignored in AUTOINSTPARAM, + bug889. Reported by Shannon Hill. + (verilog-auto-output-every): Add regexp to AUTOOUTPUTEVERY, + bug793. Reported by Pierre-David Pfister. + (verilog-auto-arg-format, verilog-auto-arg-ports): Add + verilog-auto-arg-format to support newlines in AUTOARG. Reported + by Jie Xiao. + (verilog-batch-execute-func): Do not batch re-auto files loaded by + Local Variables. Fix printing "no changes to be saved" with + verilog-batch. Reported by Dan Dever. + (verilog-auto-inout-module): Fix AUTOINOUTMODULE not inserting + interface-only modules, bug721. Reported by Dean Hoyt. + Author: Alex Reed + * lisp/progmodes/verilog-mode.el (verilog-beg-of-statement): Don't + treat ':' as the start of a labeled + statement, bug905. Reported by Enzo Chi. + (verilog-directive-re, verilog-compiler-directives) + (verilog-keywords): Match full set of IEEE 2012-1800 compiler + directives (plus some extras) when determining indentation, bug + 901. Reported by Bernd Beuster. + (verilog-at-constraint-p): Fix indentation of coverpoint bins if + iff expression doesn't start with word-character, bug900. + (verilog-optional-signed-range-re, verilog-optional-signed-re): + Fix incorrect indentation/alignment of unsigned declarations, + bug897. + (verilog-looking-back, verilog-in-attribute-p): Fix labling of + always constructs, bug895. + (verilog-calc-1): Fix verilog-mode constraint indentation, + bug324. Reported by Eric Mastromarchi. + (verilog-beg-of-statement): Fix indenting for some forms of + constraintsm bug433. Reported by Brad Parker. Fix indentation of + continued assignment incorrect if first line ends with ']', + bug437. Reported by Dan Dever. Fix indention of cover inside an + ifdef, bug 862. Reported by Bernd Beuster Fix labeling do-while + blocks, bug842. + (verilog-preprocessor-re): Fix fork/end UNMATCHED warning, + bug859. Reported by Kaushal Modi. + (verilog-set-auto-endcomments): Fix endlabel end comments, bug888. + (verilog-backward-token): Fix indenting sensitivity lists with + named events, bug840. Reed. + (verilog-no-indent-begin-re): Fix `verilog-indent-begin-after-if' + nil not honoring 'forever', 'foreach', and 'do' keywords. + +2015-05-14 Paul Eggert + + Check for invalid GTK+ monitor scales + * src/gtkutil.c (xg_get_gdk_scale): Return 1 for invalid scales, + INT_MAX for too-large scales. All callers changed to assume the + result is valid (Bug#20432). + (xg_frame_set_char_size, xg_update_scrollbar_pos): + Calculate scale only if needed. + show ASCII approximations instead. + +2015-05-14 Eli Zaretskii + + Fix daemon crashes when linum-mode is turned on early on + * src/window.c (Fwindow_end): Don't try calling display engine + functions on initial-frame frame. (Bug#20565) + + Fix selective diff browsing in Ediff + * lisp/vc/ediff-util.el (ediff-focus-on-regexp-matches): Go to the + beginning of the region before searching for the + ediff-regexp-focus-* regexps. (Bug#20568) + +2015-05-14 Jan D + + Fixes Bug#20142. + * gtkutil.c (delete_cb): Don't send delete event here, it does arrive + in the main loop, even for Gtk 3 (Bug#20142). + + Don't access display after i/o error (Bug#19147). + * xterm.c (x_connection_closed): Add third arg ioerror. + If ioerror, set display to 0 (Bug#19147). + (x_error_quitter): Call x_connection_closed with third arg false. + (x_io_error_quitter): Call x_connection_closed with third arg true. + + Handle GTK_SCALE, fixes Bug#20432. + * gtkutil.c (xg_get_gdk_scale): New function. + (xg_frame_set_char_size) + (x_wm_set_size_hint, xg_get_default_scrollbar_width) + (xg_get_default_scrollbar_height) + (xg_update_horizontal_scrollbar_pos): Take GTK_SCALE in to account + when setting sizes (Bug#20432). + +2015-05-13 Leo Liu + + Fix cps--gensym + * lisp/emacs-lisp/generator.el (cps--gensym): Fix. + +2015-05-13 Glenn Morris + + Fix bootstrap (void function cl-member). + * lisp/emacs-lisp/cl-lib.el: Load cl-seq if no cl-loaddefs file. + * lisp/emacs-lisp/cl-seq.el: Provide a feature. + +2015-05-13 Stefan Monnier + + * lisp/loadup.el ("emacs-lisp/cl-generic"): Preload + * src/lisp.mk (lisp): Add emacs-lisp/cl-generic.elc. + * lisp/emacs-lisp/cl-generic.el (cl-generic-define-method): + Avoid defalias for closures which are not immutable. + (cl--generic-prefill-dispatchers): New macro. Use it to prefill the + dispatchers table with various entries. + * lisp/emacs-lisp/ert.el (emacs-lisp-mode-hook): + * lisp/emacs-lisp/seq.el (emacs-lisp-mode-hook): Use add-hook. + +2015-05-13 Eli Zaretskii + + Improve tagging of C bindings in DEFVAR_* + * src/Makefile.in (TAGS): Add --regex options to tag the C binding + from DEFVAR_*. + +2015-05-13 Paul Eggert + + * src/editfns.c (Fformat): Fix use-after-free bug (Bug#20548). + +2015-05-12 Glenn Morris + + * lisp/progmodes/tcl.el (tcl-filter): + Handle comint-prompt-read-only like gud.el does. (Bug#20549) + + Add basic VC push support. + * lisp/vc/vc.el (vc-push): New autoloaded command. + * lisp/vc/vc-hooks.el (vc-prefix-map, vc-menu-map): Add vc-push. + * lisp/vc/vc-bzr.el (vc-bzr--pushpull): New, factored from vc-bzr-pull. + (vc-bzr-pull): Reimplement using vc-bzr--pushpull. + (vc-bzr-push): New. + * lisp/vc/vc-git.el (vc-git--pushpull): New, factored from vc-git-pull. + (vc-git-pull): Reimplement using vc-git--pushpull. + (vc-git-push): New. + * lisp/vc/vc-hg.el (vc-hg--pushpull): New, factored from vc-hg-pull. + (vc-hg-pull, vc-hg-push): Reimplement using vc-hg--pushpull. + * doc/emacs/maintaining.texi (Pulling / Pushing): + Rename from "VC Pull". Mention pushing. + (VC With A Merging VCS, VC Change Log): Update xrefs. + (Branches): Update menu. + * doc/emacs/emacs.texi: Update menu. + * etc/NEWS: Mention this. + +2015-05-12 Nicolas Petton + + Improve the seq pcase pattern and the `seq-let' macro + * lisp/emacs-lisp/seq.el: The pcase pattern now matches only if the + object is a sequence, and binds each element of ARGS to the + corresponding element of the sequence. + +2015-05-12 Eli Zaretskii + + Fix tags created from DEFVAR_* declarations in C + * src/Makefile.in (TAGS): Improve the --regex argument to etags, + to make tags extracted from DEFVAR_* declarations more accurate. + + Add a test suite for etags + * test/etags/: New test suite, adapted from + http://fly.isti.cnr.it/pub/software/unix/etags-regression-test.tar.bz2, + whose original author is Francesco Potortì . + + Fix tagging of symbols in C enumerations + * lib-src/etags.c (consider_token): Don't tag symbols in + expressions that assign values to enum constants. See + http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00291.html + for details. + (C_entries): Reset fvdef to fvnone after processing a preprocessor + conditional and after a comma outside of parentheses. + +2015-05-12 Glenn Morris + + * lisp/url/url-handlers.el (url-file-name-completion) + (url-file-name-all-completions): Silence compiler. + + * lisp/emacs-lisp/chart.el (chart-axis-draw): Replace obsolete alias. + + * lisp/play/dunnet.el (dun-dos-boot-msg): Fix time. (Bug#20554) + +2015-05-12 Stefan Monnier + + * lisp/emacs-lisp/cl-generic.el: Add dispatch on &context arguments + (cl--generic-mandatory-args): Remove. + (cl--generic-split-args): New function. + (cl-generic-define, cl--generic-lambda): Use it. + (cl-generic-define-method): Use it as well, and add support for + context args. + (cl--generic-get-dispatcher): Handle &context dispatch. + (cl--generic-cache-miss): `dispatch-arg' can now be a context expression. + (cl--generic-dispatchers): Pre-fill. + * test/automated/cl-generic-tests.el (sm-generic-test-12-context): New test. + +2015-05-11 Glenn Morris + + * make-dist: Abort if "make ChangeLog" fails. Add "--no-changelog". + +2015-05-11 Stefan Monnier + + * lisp/term/xterm.el: Fix xterm-paste handling for rxvt + * lisp/term/rxvt.el: Require term/xterm. + (rxvt-function-map): Use xterm-rxvt-function-map. + (rxvt-standard-colors): Move before first use. + (terminal-init-rxvt): Use xterm--push-map and xterm-register-default-colors. + (rxvt-rgb-convert-to-16bit, rxvt-register-default-colors): Remove. + * lisp/term/xterm.el (xterm-rxvt-function-map): New var. + Move shared bindings between rxvt and xterm to it. + (xterm-function-map): Use it. Move the xterm-paste binding to + xterm-rxvt-function-map (bug#20444). + (xterm-standard-colors): Move before first use. + (xterm--push-map): New function. + (xterm-register-default-colors): Take standard colors as argument. + (terminal-init-xterm): Use it. Adjust call to + xterm-register-default-colors. + +2015-05-11 Glenn Morris + + * lisp/term/x-win.el: Quieten --without-x compilation. + (x-own-selection-internal, x-disown-selection-internal) + (x-selection-owner-p, x-selection-exists-p, x-get-selection-internal): + Declare. + + * Makefile.in (emacslog): Remove srcdir. + (ChangeLog): Update for the above. + +2015-05-11 Paul Eggert + + Spelling fix + +2015-05-10 Fabián Ezequiel Gallina + + python.el: better limit for looking-back calls + * lisp/progmodes/python.el (python-shell-accept-process-output): + Use last comint prompt start as limit for looking-back. + +2015-05-10 Stefan Monnier + + CEDET (srecode-insert-fcn): Fix use of oref on a class + * lisp/cedet/srecode/insert.el (srecode-insert-fcn): Fix use of oref on + a class. Reported by Pierre Lorenzon. + (srecode-template-inserter-point): Remove declaration. + + CEDET (srecode-create-dictionary): Avoid obsolete object name + * lisp/cedet/srecode/dictionary.el (srecode-create-dictionary): + Don't use a symbol as an object name. Reported by Pierre Lorenzon. + +2015-05-10 Paul Eggert + + C-x 8 shorthands for curved quotes, Euro, etc. + Although C-x 8 lets you insert arbitrary Unicode characters, + it's awkward to use this to insert commonly used symbols such as curved + quotes, the Euro symbol, etc. This patch adds simpler sequences for + characters commonly found in English text and in basic math. + For example, assuming the Alt key works on your keyboard and iso-transl + is loaded, one can now type "A-[" instead of "A-RET LEFT SIN TAB RET" + to get the character "‘" (U+2018 LEFT SINGLE QUOTATION MARK). + (Bug#20499) + * doc/emacs/mule.texi (Unibyte Mode): + A few other printing characters now work too. + * etc/NEWS: Document this. + * lisp/international/iso-transl.el (iso-transl-char-map): + Also support the following characters: + ‐ ‑ ‒ – — ― ‘ ’ “ ” † ‡ • ′ ″ € № ← → ↔ − ≈ ≠ ≤ ≥ + +2015-05-10 Dmitry Gutov + + Add xref-find-regexp + * lisp/progmodes/xref.el (xref-find-function): Describe the + `matches' action. + (xref-find-regexp): New command, using it. + (xref-collect-references): Rename to xref-collect-matches. + (xref--collect-reference): Rename to xref--collect-match. + (xref-collect-matches, xref--collect-match): Accept new argument, + KIND. Update accordingly. + (xref--regexp-to-extended): New function. + * lisp/progmodes/elisp-mode.el (elisp-xref-find): Support the + `matches' action. + (elisp--xref-find-matches): Accept new argument. Resolve a FIXME. + * lisp/progmodes/etags.el (etags-xref-find): + Support the `matches' action. + (etags--xref-find-matches): New function. + +2015-05-10 Glenn Morris + + * Makefile.in: Fixes for recent change-history changes. + (change-history-nocommit): Update footer regexp. + Ensure output script stays executable. + +2015-05-10 Nicolas Petton + + New version of `seq-let' based on a pcase pattern + * lisp/emacs-lisp/seq.el (seq-let): Define the macro in terms of a + pcase pattern if `pcase-defmacro' is defined (Emacs>=25.1). + +2015-05-10 Przemysław Wojnowski + + Add basic HTML5 tags and a template + * lisp/textmodes/sgml-mode.el: Basic HTML5 support. + (html-tag-alist): Add HTML5 tags. + (html-tag-help): Add new tags descriptions. + (html-navigational-links): Template for nav links. + (html-html5-template): Template for a HTML5 page. + +2015-05-10 Dmitry Gutov + + semantic/symref/grep: Don't use word boundaries + * lisp/cedet/semantic/symref/grep.el + (semantic-symref-perform-search): Instead of wrapping input in + word boundaries, check that the characters before and after are + not word constituents. + + semantic/symref/grep: Support regexp search + * lisp/cedet/semantic/symref.el + (semantic-symref-hit-to-tag-via-buffer): Don't regexp-quote when + the search type is regexp. + * lisp/cedet/semantic/symref/grep.el + (semantic-symref-perform-search): Support the regexp search type. + Pass -E to Grep when it's used. + + semantic-symref-regexp: Allow to input an arbitrary string + * lisp/cedet/semantic/symref/list.el (semantic-symref-regexp): + Allow to input an arbitrary string interactively. + + Remove tag-symbol-match-p from etags-xref-find-definitions-tag-order + * lisp/progmodes/etags.el (etags-xref-find-definitions-tag-order): + Remove tag-symbol-match-p from the default value + (http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00292.html). + + Declare find-tag obsolete + * lisp/progmodes/etags.el (find-tag): Declare obsolete in favor of + xref-find-definitions. + +2015-05-10 Jan D + + Draw composite string correctly (Bug#20537). + * nsterm.m (ns_draw_composite_glyph_string_foreground): New function. + (ns_draw_glyph_string): Call it (Bug#20537). + 2015-05-09 Eli Zaretskii Avoid infloop in ERC diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog index e38f896..aa42060 100755 --- a/build-aux/gitlog-to-emacslog +++ b/build-aux/gitlog-to-emacslog @@ -23,7 +23,7 @@ LC_ALL=C export LC_ALL # The newest revision that should not appear in the generated ChangeLog. -gen_origin=d2c7e14ac3bd2b517d35a86255c28d5b6d779451 +gen_origin=f89080d18dd64e0c92c5f3d206182d65f23eafeb force= output=ChangeLog nmax=2 commit f89080d18dd64e0c92c5f3d206182d65f23eafeb Author: Johan Bockgård Date: Sat May 16 22:47:30 2015 +0200 Fix integer-valued `mouse-highlight' (Bug#20590) * src/xterm.c (handle_one_xevent) [USE_GTK]: Fix ifdef scope. diff --git a/src/xterm.c b/src/xterm.c index 94d6d57..06ce707 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7059,17 +7059,18 @@ handle_one_xevent (struct x_display_info *dpyinfo, f = any; -#if ! defined (USE_GTK) /* If mouse-highlight is an integer, input clears out mouse highlighting. */ if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) +#if ! defined (USE_GTK) && (f == 0 - || !EQ (f->tool_bar_window, hlinfo->mouse_face_window))) + || !EQ (f->tool_bar_window, hlinfo->mouse_face_window)) +#endif + ) { clear_mouse_face (hlinfo); hlinfo->mouse_face_hidden = true; } -#endif #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS if (f == 0) commit a0cfd563d26661ce2a509e525487644fd421966b Author: Eli Zaretskii Date: Sun May 17 18:33:22 2015 +0300 MS-Windows followup for ASCIIfication of curved quotes * lisp/term/w32console.el (terminal-init-w32console): Repeat the test for curved quotes being displayable, after switching the terminal encoding. (Bug#20545) diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el index a7056cd..29ab2f1 100644 --- a/lisp/term/w32console.el +++ b/lisp/term/w32console.el @@ -65,7 +65,15 @@ (when oem-cs-p (set-keyboard-coding-system oem-code-page-coding) (set-terminal-coding-system - (if oem-o-cs-p oem-code-page-output-coding oem-code-page-coding)))) + (if oem-o-cs-p oem-code-page-output-coding oem-code-page-coding)) + ;; Since we changed the terminal encoding, we need to repeat + ;; the test for Unicode quotes being displayable. + (dolist (char-repl + '((?‘ . [?\']) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"]))) + (when (not (char-displayable-p (car char-repl))) + (or standard-display-table + (setq standard-display-table (make-display-table))) + (aset standard-display-table (car char-repl) (cdr char-repl)))))) (let* ((colors w32-tty-standard-colors) (color (car colors))) (tty-color-clear) commit 05e69458e7de94b936f128a4e3691e4bd699f475 Author: Paul Eggert Date: Sun May 17 08:18:29 2015 -0700 Spelling fixes diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index f67fae8..e48a708 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1076,7 +1076,7 @@ of `ispell-dictionary-base-alist' elements." ispell-aspell-data-dir )) ;; Try xx.dat first, strip out variant, country code, etc, ;; then try xx_YY.dat (without stripping country code), - ;; then try xx-alt.dat, for deu-alt etc. + ;; then try xx-alt.dat, for de-alt etc. (dolist (tmp-regexp (list "^[[:alpha:]]+" "^[[:alpha:]_]+" "^[[:alpha:]]+-\\(alt\\|old\\)")) diff --git a/src/xterm.c b/src/xterm.c index ad2bef9..94d6d57 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11452,7 +11452,7 @@ static struct redisplay_interface x_redisplay_interface = x_draw_window_cursor, x_draw_vertical_window_border, x_draw_window_divider, - x_shift_glyphs_for_insert, /* Never called, se comment in function. */ + x_shift_glyphs_for_insert, /* Never called; see comment in function. */ x_show_hourglass, x_hide_hourglass }; commit c9c4708ed47b18987940a71b98eb9873150d2b95 Author: Jan D Date: Sun May 17 11:30:09 2015 +0200 Add comment that x_shift_glyphs_for_insert is never called. * xterm.c (x_shift_glyphs_for_insert, x_redisplay_interface): Add comment that this function is never called. diff --git a/src/xterm.c b/src/xterm.c index 9616dab..ad2bef9 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2896,6 +2896,9 @@ x_draw_glyph_string (struct glyph_string *s) static void x_shift_glyphs_for_insert (struct frame *f, int x, int y, int width, int height, int shift_by) { +/* Never called on a GUI frame, see + http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00456.html +*/ XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), FRAME_X_WINDOW (f), f->output_data.x->normal_gc, x, y, width, height, @@ -11449,7 +11452,7 @@ static struct redisplay_interface x_redisplay_interface = x_draw_window_cursor, x_draw_vertical_window_border, x_draw_window_divider, - x_shift_glyphs_for_insert, + x_shift_glyphs_for_insert, /* Never called, se comment in function. */ x_show_hourglass, x_hide_hourglass };