From 0e0dced58b185b05445ad288ae2a0578ec1bce96 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 18 Dec 2006 16:47:28 +0000 Subject: [WINDOWSNT] (set_fg, get_wc): New variables. [WINDOWSNT] (w32_find_emacs_process, w32_give_focus): New functions. (main) [WINDOWSNT]: Remove code to release the focus; call w32_give_focus instead. --- lib-src/ChangeLog | 30 ++++++++++---------- lib-src/emacsclient.c | 77 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 74 insertions(+), 33 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f15644050d9..9c8a69f27f1 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +2006-12-18 Juanma Barranquero + + * emacsclient.c [WINDOWSNT] (set_fg, get_wc): New variables. + [WINDOWSNT] (w32_find_emacs_process, w32_give_focus): New functions. + (main) [WINDOWSNT]: Remove code to release the focus; call + w32_give_focus instead. + 2006-12-15 Juanma Barranquero * emacsclient.c (w32_execvp): New function; wrapper for `execvp'. @@ -454,10 +461,9 @@ 2005-07-13 Ken Raeburn - * pop.c: Don't include des.h (or variants thereof); krb.h will do - it. - (sendline): Add the \r\n to the line in a temporary buffer, and - write it all at once. + * pop.c: Don't include des.h (or variants thereof); krb.h will do it. + (sendline): Add the \r\n to the line in a temporary buffer, and write + it all at once. 2005-07-04 Lute Kamstra @@ -497,10 +503,9 @@ 2005-02-04 Andreas Schwab - * movemail.c (fatal): Accept third parameter and pass down to - error. - (pfatal_with_name): Pass error string as format parameter instead - of as part of format string. + * movemail.c (fatal): Accept third parameter and pass down to error. + (pfatal_with_name): Pass error string as format parameter instead of + as part of format string. (pfatal_and_delete): Likewise. (main): Adjust call to fatal. (xmalloc): Likewise. @@ -511,8 +516,7 @@ 2004-12-26 YAMAMOTO Mitsuharu - * make-docfile.c: Include stdlib.h even if WINDOWSNT is not - defined. + * make-docfile.c: Include stdlib.h even if WINDOWSNT is not defined. 2004-12-15 Andreas Schwab @@ -578,8 +582,7 @@ 2004-05-10 Thien-Thi Nguyen - * test-distrib.c (main): For failing cases, exit with - `EXIT_FAILURE'. + * test-distrib.c (main): For failing cases, exit with `EXIT_FAILURE'. 2004-05-08 Jason Rumney @@ -752,8 +755,7 @@ 2003-04-27 Oliver Scholz - * update-game-score.c (read_scores): Fix corruption of scores on - read. + * update-game-score.c (read_scores): Fix corruption of scores on read. 2003-04-12 Stefan Monnier diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index bbd6cbe239b..419cdd94b88 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -523,7 +523,7 @@ initialize_sockets () /* * Read the information needed to set up a TCP comm channel with * the Emacs server: host, port, pid and authentication string. -*/ + */ int get_server_config (server, authentication) struct sockaddr_in *server; @@ -845,6 +845,62 @@ set_socket () exit (EXIT_FAILURE); } +#ifdef WINDOWSNT +FARPROC set_fg; /* Pointer to AllowSetForegroundWindow. */ +FARPROC get_wc; /* Pointer to RealGetWindowClassA. */ + +BOOL CALLBACK +w32_find_emacs_process (hWnd, lParam) + HWND hWnd; + LPARAM lParam; +{ + DWORD pid; + char class[6]; + + /* Reject any window not of class "Emacs". */ + if (! get_wc (hWnd, class, sizeof (class)) + || strcmp (class, "Emacs")) + return TRUE; + + /* We only need the process id, not the thread id. */ + (void) GetWindowThreadProcessId (hWnd, &pid); + + /* Not the one we're looking for. */ + if (pid != (DWORD) emacs_pid) return TRUE; + + /* OK, let's raise it. */ + set_fg (emacs_pid); + + /* Stop enumeration. */ + return FALSE; +} + +/* + * Search for a window of class "Emacs" and owned by a process with + * process id = emacs_pid. If found, allow it to grab the focus. + */ +void +w32_give_focus () +{ + HMODULE hUser32; + + /* It should'nt happen when dealing with TCP sockets. */ + if (!emacs_pid) return; + + if (!(hUser32 = LoadLibrary ("user32.dll"))) return; + + /* Modern Windows restrict which processes can set the foreground window. + emacsclient can allow Emacs to grab the focus by calling the function + AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 and + NT) lack this function, so we have to check its availability. */ + if ((set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow")) + && (get_wc = GetProcAddress (hUser32, "RealGetWindowClassA"))) + EnumWindows (w32_find_emacs_process, (LPARAM) 0); + + FreeLibrary (hUser32); +} +#endif + int main (argc, argv) int argc; @@ -889,24 +945,7 @@ main (argc, argv) } #ifdef WINDOWSNT - /* - Modern Windows restrict which processes can set the foreground window. - emacsclient can allow Emacs to grab the focus by calling the function - AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 - and NT) lack this function, so we have to check its availability. - */ - if (emacs_pid) - { - HMODULE hUser32; - - if (hUser32 = LoadLibrary ("user32.dll")) - { - FARPROC set_fg; - if (set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow")) - set_fg (emacs_pid); - FreeLibrary (hUser32); - } - } + w32_give_focus (); #endif if (nowait) -- cgit v1.2.3 From 3efe9e568ee024a6f55be0ecbd2e6c8ae644cade Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 19 Dec 2006 19:25:57 +0000 Subject: Bump version number to 22.0.92 --- README | 2 +- lib-src/makefile.w32-in | 2 +- lisp/version.el | 2 +- lispref/elisp.texi | 2 +- mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings | 4 ++-- mac/src/Emacs.r | 6 +++--- man/emacs.texi | 2 +- nt/emacs.rc | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'lib-src') diff --git a/README b/README index 793b7560620..06e18c244bb 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This directory tree holds version 22.0.91 of GNU Emacs, the extensible, +This directory tree holds version 22.0.92 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 01c2aa0df62..2bbf6d07648 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs .PHONY: $(ALL) -VERSION = 22.0.91 +VERSION = 22.0.92 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ diff --git a/lisp/version.el b/lisp/version.el index 144a77602e4..6dbfaffcf3c 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -27,7 +27,7 @@ ;;; Code: -(defconst emacs-version "22.0.91" "\ +(defconst emacs-version "22.0.92" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version diff --git a/lispref/elisp.texi b/lispref/elisp.texi index 7b869d04041..bfd91c58562 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -7,7 +7,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.0.91 +@set EMACSVER 22.0.92 @dircategory Emacs @direntry diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index d297cfb34ef..88098f4728f 100644 --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.0.91"; -CFBundleGetInfoString = "22.0.91, Copyright (C) 2006 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.0.92"; +CFBundleGetInfoString = "22.0.92, Copyright (C) 2006 Free Software Foundation, Inc."; diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index 73be8488f6b..37d6d0f7c39 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r @@ -221,10 +221,10 @@ resource 'vers' (1) { 0x22, /* Major revision in BCD */ 0x0, /* Minor revision in BCD */ alpha, /* development, alpha, beta, or final (release) */ - 91, /* Non-final release # */ + 92, /* Non-final release # */ 0, /* Region code */ - "22.0.91", /* Short version number */ - "22.0.91, Copyright \0xa9 2006 " + "22.0.92", /* Short version number */ + "22.0.92, Copyright \0xa9 2006 " "Free Software Foundation, Inc." /* Long version number */ }; diff --git a/man/emacs.texi b/man/emacs.texi index 76b77f38f8b..080883cef97 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 22.0.91 +@set EMACSVER 22.0.92 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, diff --git a/nt/emacs.rc b/nt/emacs.rc index 0384adc2816..4dbd51c6adc 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -6,8 +6,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 22,0,91,0 - PRODUCTVERSION 22,0,91,0 + FILEVERSION 22,0,92,0 + PRODUCTVERSION 22,0,92,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" - VALUE "FileVersion", "22, 0, 91, 0\0" + VALUE "FileVersion", "22, 0, 92, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" - VALUE "ProductVersion", "22, 0, 91, 0\0" + VALUE "ProductVersion", "22, 0, 92, 0\0" VALUE "OLESelfRegister", "\0" END END -- cgit v1.2.3 From bd3b41c6eea14667b2ba10ab166cf63f94d50915 Mon Sep 17 00:00:00 2001 From: Francesco Potortì Date: Wed, 20 Dec 2006 10:41:07 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 9c8a69f27f1..bc722b4822d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2006-12-20 Francesco Potort,Al(B + + * etags.c (C_entries): DEFUN names were longer by one: corrected. + 2006-12-18 Juanma Barranquero * emacsclient.c [WINDOWSNT] (set_fg, get_wc): New variables. -- cgit v1.2.3 From f6880bf34653356033569c2a482a0b8bf5143777 Mon Sep 17 00:00:00 2001 From: Francesco Potortì Date: Wed, 20 Dec 2006 10:41:29 +0000 Subject: (C_entries): DEFUN names were longer by one: corrected. --- lib-src/etags.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib-src') diff --git a/lib-src/etags.c b/lib-src/etags.c index c3578a4b1ad..3a976c3d756 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -41,7 +41,7 @@ * configuration file containing regexp definitions for etags. */ -char pot_etags_version[] = "@(#) pot revision number is $Revision: 17.22 $"; +char pot_etags_version[] = "@(#) pot revision number is 17.23"; #define TRUE 1 #define FALSE 0 @@ -3163,7 +3163,7 @@ static void make_C_tag (isfun) bool isfun; { - /* This function should never be called when token.valid is FALSE, but + /* This function is never called when token.valid is FALSE, but we must protect against invalid input or internal errors. */ if (!DEBUG && !token.valid) return; @@ -3493,7 +3493,6 @@ C_entries (c_ext, inf) off += 1; len -= 1; } - len = toklen; linebuffer_setlen (&token_name, len); strncpy (token_name.buffer, newlb.buffer + off, len); -- cgit v1.2.3 From 1a8a626d0223ac99a269a3249431df50cdde92f3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 22 Dec 2006 18:43:11 +0000 Subject: (make-docfile, ctags, etags, ebrowse, hexl) (movemail, fakemail, sorted-doc, digest-doc, emacsclient) (test-distrib, $(DOC), all): depend on stamp_BLD instead of $(BLD). ($(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O)) ($(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O)) ($(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS)) ($(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O)) ($(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O)): Depend on stamp_BLD. --- lib-src/makefile.w32-in | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) (limited to 'lib-src') diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 2bbf6d07648..7d49748ebc5 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -45,18 +45,18 @@ $(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS) -make-docfile: $(BLD) $(BLD)/make-docfile.exe -ctags: $(BLD) $(BLD)/ctags.exe -etags: $(BLD) $(BLD)/etags.exe -ebrowse: $(BLD) $(BLD)/ebrowse.exe -hexl: $(BLD) $(BLD)/hexl.exe -movemail: $(BLD) $(BLD)/movemail.exe -fakemail: $(BLD) $(BLD)/fakemail.exe -sorted-doc: $(BLD) $(BLD)/sorted-doc.exe -digest-doc: $(BLD) $(BLD)/digest-doc.exe -emacsclient: $(BLD) $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe - -test-distrib: $(BLD) $(BLD)/test-distrib.exe +make-docfile: stamp_BLD $(BLD)/make-docfile.exe +ctags: stamp_BLD $(BLD)/ctags.exe +etags: stamp_BLD $(BLD)/etags.exe +ebrowse: stamp_BLD $(BLD)/ebrowse.exe +hexl: stamp_BLD $(BLD)/hexl.exe +movemail: stamp_BLD $(BLD)/movemail.exe +fakemail: stamp_BLD $(BLD)/fakemail.exe +sorted-doc: stamp_BLD $(BLD)/sorted-doc.exe +digest-doc: stamp_BLD $(BLD)/digest-doc.exe +emacsclient: stamp_BLD $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe + +test-distrib: stamp_BLD $(BLD)/test-distrib.exe "$(BLD)/test-distrib.exe" "$(SRC)/testfile" GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O) @@ -285,7 +285,7 @@ lisp2 = \ - $(DEL) temacs.exe DOC = DOC -$(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) +$(DOC): stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) - $(DEL) $(DOC) "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) @@ -301,7 +301,7 @@ $(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp # # Build the executables # -all: $(BLD) $(ALL) $(DOC) +all: stamp_BLD $(ALL) $(DOC) # # Assuming INSTALL_DIR is defined, build and install emacs in it. @@ -482,3 +482,16 @@ $(BLD)/timer.$(O) : \ $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/lib-src/../src/config.h + +# The following dependencies are for supporting parallel builds, where +# we must make sure $(BLD) exists before any compilation starts. +# +$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O): stamp_BLD + +$(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O): stamp_BLD + +$(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS): stamp_BLD + +$(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O): stamp_BLD + +$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O): stamp_BLD -- cgit v1.2.3 From 5e059fc1d70aa049f7c76189673d9796e2be8671 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 22 Dec 2006 19:28:37 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 11 +++++++++++ nt/ChangeLog | 4 ++++ src/ChangeLog | 7 +++++++ 3 files changed, 22 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bc722b4822d..c58bf9177c9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,14 @@ +2006-12-22 Eli Zaretskii + + * makefile.w32-in (make-docfile, ctags, etags, ebrowse, hexl) + (movemail, fakemail, sorted-doc, digest-doc, emacsclient) + (test-distrib, $(DOC), all): depend on stamp_BLD instead of $(BLD). + ($(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O)) + ($(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O)) + ($(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS)) + ($(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O)) + ($(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O)): Depend on stamp_BLD. + 2006-12-20 Francesco Potort,Al(B * etags.c (C_entries): DEFUN names were longer by one: corrected. diff --git a/nt/ChangeLog b/nt/ChangeLog index 421742ce3af..3ce26854660 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,9 @@ 2006-12-22 Eli Zaretskii + * makefile.w32-in (bootstrap-gmake): Pass XMFLAGS="$(XMFLAGS)" + command-line argument to sub-Make in src, since src/makefile.w32-in + invokes Make recursively during bootstrap. + * gmake.defs (stamp_BLD): Rename from $(BLD). Create a file stamp_BLD after creating the $(BLD) directory. diff --git a/src/ChangeLog b/src/ChangeLog index 3428722beca..9b764950123 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2006-12-22 Eli Zaretskii + + * makefile.w32-in (emacs, temacs): Depend on stamp_BLD instead of + $(BLD). + ($(OBJ0) $(OBJ1) $(WIN32OBJ)): New dependency on stamp_BLD. + (bootstrap-temacs): Pass $(XMFLAGS) to sub-make. + 2006-12-22 YAMAMOTO Mitsuharu * macfns.c (mac_update_title_bar) [TARGET_API_MAC_CARBON]: Call -- cgit v1.2.3 From e313b518e8113c98fa88282073e215eb83afacb7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 22 Dec 2006 20:41:35 +0000 Subject: (clean): Delete stamp_BLD. --- lib-src/makefile.w32-in | 1 + nt/makefile.w32-in | 1 + 2 files changed, 2 insertions(+) (limited to 'lib-src') diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 7d49748ebc5..bc998e710d7 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -329,6 +329,7 @@ clean: - $(DEL) ctags.c - $(DEL) getopt.h - $(DEL_TREE) $(OBJDIR) + - $(DEL) stamp_BLD cleanall: clean - $(DEL_TREE) obj diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 364e2985a72..a72e79146d2 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -246,6 +246,7 @@ info-gmake: clean: clean-other-dirs-$(MAKETYPE) - $(DEL) *~ $(COMPILER_TEMP_FILES) - $(DEL_TREE) $(OBJDIR) + - $(DEL) stamp_BLD - $(DEL) ../etc/DOC ../etc/DOC-X clean-other-dirs-nmake: -- cgit v1.2.3 From 6808dce14b966988dd2884e8e93fc63a988bda45 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 22 Dec 2006 21:04:40 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 1 + nt/ChangeLog | 1 + src/ChangeLog | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c58bf9177c9..69c09e7535d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -8,6 +8,7 @@ ($(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS)) ($(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O)) ($(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O)): Depend on stamp_BLD. + (clean): Delete stamp_BLD. 2006-12-20 Francesco Potort,Al(B diff --git a/nt/ChangeLog b/nt/ChangeLog index bd2591d15ba..b7621c63a26 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -4,6 +4,7 @@ command-line argument to sub-Make in src, since src/makefile.w32-in invokes Make recursively during bootstrap. (clean): Delete stamp_BLD. + (bootstrap): Make `all' explicitly in a recursive Make. * gmake.defs (stamp_BLD): Rename from $(BLD). Create a file stamp_BLD after creating the $(BLD) directory. diff --git a/src/ChangeLog b/src/ChangeLog index cbf9bc8182c..b335cf0a291 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,7 +4,7 @@ $(BLD). ($(OBJ0) $(OBJ1) $(WIN32OBJ)): New dependency on stamp_BLD. (bootstrap-temacs): Pass $(XMFLAGS) to sub-make. - ($(OBJ0) $(OBJ1) $(WIN32OBJ) lastfile.$(O)): Add lastfile.$(O). + ($(OBJ0) $(OBJ1) $(WIN32OBJ)): Add lastfile.$(O) and firstfile.$(O). (clean): Delete stamp_BLD. 2006-12-22 YAMAMOTO Mitsuharu -- cgit v1.2.3 From 41e2a949ccb4ca1d9b9937c1b9ff69d7a7e357a5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 23 Dec 2006 09:53:24 +0000 Subject: Add stamp_BLD. --- lib-src/.gitignore | 1 + nt/.gitignore | 1 + src/.gitignore | 1 + 3 files changed, 3 insertions(+) (limited to 'lib-src') diff --git a/lib-src/.gitignore b/lib-src/.gitignore index faf263e740d..157ce12c972 100644 --- a/lib-src/.gitignore +++ b/lib-src/.gitignore @@ -24,3 +24,4 @@ makefile blessmail *-spd *.pdb +stamp_BLD diff --git a/nt/.gitignore b/nt/.gitignore index 26f5de661a0..cfa059286f2 100644 --- a/nt/.gitignore +++ b/nt/.gitignore @@ -5,3 +5,4 @@ config.log makefile obj oo +stamp_BLD diff --git a/src/.gitignore b/src/.gitignore index 8dbbc9f86b6..9bb6e8932b6 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -19,3 +19,4 @@ prefix-args stamp-oldxmenu temacs buildobj.lst +stamp_BLD -- cgit v1.2.3 From 8c57275b06f0a865e11ee27c8e712f23945fd6ff Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 26 Dec 2006 00:10:43 +0000 Subject: Remove spurious "(tiny change)". --- lib-src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 69c09e7535d..43d21ee963f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -49,7 +49,7 @@ (set_tcp_socket): Make the message for non-local connections informational rather than an error. -2006-11-28 Kevin Ryde (tiny change) +2006-11-28 Kevin Ryde * etags.c (readline): Check for double quote after #line. -- cgit v1.2.3 From 18f9bf25315d21c1a8b4f7da37a9d5bf5a49198f Mon Sep 17 00:00:00 2001 From: Francesco Potortì Date: Wed, 27 Dec 2006 23:58:29 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 43d21ee963f..6c3d0173f6d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,12 @@ +2006-12-28 Francesco Potort,Al(B + + * etags.c (readline): When creating a relative file name from a + #line directive, leave the file name alone. The previous + behaviour was to make it relative to the tags file directory, + under the hypothesis that the #line directive file name was + relative to the directory of the tagged file. That hypothesis is + wrong with Cpp and Lex. + 2006-12-22 Eli Zaretskii * makefile.w32-in (make-docfile, ctags, etags, ebrowse, hexl) -- cgit v1.2.3 From 17d5f8a676acddb92053852b58037eebe87f56bd Mon Sep 17 00:00:00 2001 From: Francesco Potortì Date: Thu, 28 Dec 2006 00:05:16 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 6c3d0173f6d..76a0dcf1b9e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -6,6 +6,7 @@ under the hypothesis that the #line directive file name was relative to the directory of the tagged file. That hypothesis is wrong with Cpp and Lex. + (Makefile_targets): Do not include spaces in tag names. 2006-12-22 Eli Zaretskii -- cgit v1.2.3 From 6598a3d4225d702e81378d958c44b2e011781d2e Mon Sep 17 00:00:00 2001 From: Francesco Potortì Date: Thu, 28 Dec 2006 00:05:53 +0000 Subject: (readline): When creating a relative file name from a #line directive, leave the file name alone. The previous behaviour was to make it relative to the tags file directory, under the hypothesis that the #line directive file name was relative to the directory of the tagged file. That hypothesis is wrong with Cpp and Lex. (Makefile_targets): Do not include spaces in tag names. --- lib-src/etags.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'lib-src') diff --git a/lib-src/etags.c b/lib-src/etags.c index 3a976c3d756..c4f7fdc4d69 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -41,7 +41,7 @@ * configuration file containing regexp definitions for etags. */ -char pot_etags_version[] = "@(#) pot revision number is 17.23"; +char pot_etags_version[] = "@(#) pot revision number is 17.25"; #define TRUE 1 #define FALSE 0 @@ -4686,8 +4686,16 @@ Makefile_targets (inf) while (*bp != '\0' && *bp != '=' && *bp != ':') bp++; if (*bp == ':' || (globals && *bp == '=')) - make_tag (lb.buffer, bp - lb.buffer, TRUE, - lb.buffer, bp - lb.buffer + 1, lineno, linecharno); + { + /* We should detect if there is more than one tag, but we do not. + We just skip initial and final spaces. */ + char * namestart = skip_spaces (lb.buffer); + while (--bp > namestart) + if (!notinname (*bp)) + break; + make_tag (namestart, bp - namestart + 1, TRUE, + lb.buffer, bp - lb.buffer + 2, lineno, linecharno); + } } } @@ -6277,7 +6285,7 @@ readline (lbp, stream) name = lbp->buffer + start; *endp = '\0'; canonicalize_filename (name); /* for DOS */ - taggedabsname = absolute_filename (name, curfdp->infabsdir); + taggedabsname = absolute_filename (name, tagfiledir); if (filename_is_absolute (name) || filename_is_absolute (curfdp->infname)) taggedfname = savestr (taggedabsname); -- cgit v1.2.3