Now on revision 109542. ------------------------------------------------------------ revno: 109542 fixes bug: http://debbugs.gnu.org/10299 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2012-08-10 09:54:37 +0300 message: Fix bug #10299 with Unicode characters sent on MS-Windows by MSKLC. src/w32fns.c (INIT_WINDOW_CLASS): New macro. (w32_init_class): Use it to initialize the Emacs class with either ANSI or Unicode API calls. (w32_msg_pump): Call GetMessageW and DispatchMessageW on NT and later. (w32_wnd_proc): If the character code sent by WM_CHAR or WM_SYSCHAR is above 255, post a WM_UNICHAR message, not the original message. Call DefWindowProcW on NT and later. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-10 00:47:21 +0000 +++ src/ChangeLog 2012-08-10 06:54:37 +0000 @@ -1,3 +1,17 @@ +2012-08-10 Joakim HÃ¥rsman (tiny patch) + Eli Zaretskii + + Fix bug #10299 with Unicode characters sent by customized + keyboards created by MSKLC. + * w32fns.c (INIT_WINDOW_CLASS): New macro. + (w32_init_class): Use it to initialize the Emacs class with either + ANSI or Unicode API calls. + (w32_msg_pump): Call GetMessageW and DispatchMessageW on NT and + later. + (w32_wnd_proc): If the character code sent by WM_CHAR or + WM_SYSCHAR is above 255, post a WM_UNICHAR message, not the + original message. Call DefWindowProcW on NT and later. + 2012-08-10 Glenn Morris * Makefile.in (config_h): Fix conf_post.h out-of-tree build location. === modified file 'src/w32fns.c' --- src/w32fns.c 2012-08-07 07:33:18 +0000 +++ src/w32fns.c 2012-08-10 06:54:37 +0000 @@ -1780,23 +1780,37 @@ static LRESULT CALLBACK w32_wnd_proc (HWND, UINT, WPARAM, LPARAM); +#define INIT_WINDOW_CLASS(WC) \ + (WC).style = CS_HREDRAW | CS_VREDRAW; \ + (WC).lpfnWndProc = (WNDPROC) w32_wnd_proc; \ + (WC).cbClsExtra = 0; \ + (WC).cbWndExtra = WND_EXTRA_BYTES; \ + (WC).hInstance = hinst; \ + (WC).hIcon = LoadIcon (hinst, EMACS_CLASS); \ + (WC).hCursor = w32_load_cursor (IDC_ARROW); \ + (WC).hbrBackground = NULL; \ + (WC).lpszMenuName = NULL; \ + static BOOL w32_init_class (HINSTANCE hinst) { - WNDCLASS wc; - - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC) w32_wnd_proc; - wc.cbClsExtra = 0; - wc.cbWndExtra = WND_EXTRA_BYTES; - wc.hInstance = hinst; - wc.hIcon = LoadIcon (hinst, EMACS_CLASS); - wc.hCursor = w32_load_cursor (IDC_ARROW); - wc.hbrBackground = NULL; /* GetStockObject (WHITE_BRUSH); */ - wc.lpszMenuName = NULL; - wc.lpszClassName = EMACS_CLASS; - - return (RegisterClass (&wc)); + + if (os_subtype == OS_NT) + { + WNDCLASSW uwc; + INIT_WINDOW_CLASS(uwc); + uwc.lpszClassName = L"Emacs"; + + return RegisterClassW (&uwc); + } + else + { + WNDCLASS wc; + INIT_WINDOW_CLASS(wc); + wc.lpszClassName = EMACS_CLASS; + + return RegisterClassA (&wc); + } } static HWND @@ -2246,7 +2260,7 @@ msh_mousewheel = RegisterWindowMessage (MSH_MOUSEWHEEL); - while (GetMessage (&msg, NULL, 0, 0)) + while ((os_subtype == OS_NT ? GetMessageW : GetMessageA) (&msg, NULL, 0, 0)) { if (msg.hwnd == NULL) { @@ -2341,7 +2355,10 @@ } else { - DispatchMessage (&msg); + if (os_subtype == OS_NT) + DispatchMessageW (&msg); + else + DispatchMessageA (&msg); } /* Exit nested loop when our deferred message has completed. */ @@ -2918,8 +2935,18 @@ case WM_SYSCHAR: case WM_CHAR: - post_character_message (hwnd, msg, wParam, lParam, - w32_get_key_modifiers (wParam, lParam)); + if (wParam > 255 ) + { + W32Msg wmsg; + + wmsg.dwModifiers = w32_get_key_modifiers (wParam, lParam); + signal_user_input (); + my_post_msg (&wmsg, hwnd, WM_UNICHAR, wParam, lParam); + + } + else + post_character_message (hwnd, msg, wParam, lParam, + w32_get_key_modifiers (wParam, lParam)); break; case WM_UNICHAR: @@ -3801,7 +3828,7 @@ } dflt: - return DefWindowProc (hwnd, msg, wParam, lParam); + return (os_subtype == OS_NT ? DefWindowProcW : DefWindowProcA) (hwnd, msg, wParam, lParam); } /* The most common default return code for handled messages is 0. */ ------------------------------------------------------------ revno: 109541 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-08-09 20:47:21 -0400 message: * src/Makefile.in (config_h): Fix conf_post.h out-of-tree build location. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-10 00:02:10 +0000 +++ src/ChangeLog 2012-08-10 00:47:21 +0000 @@ -1,5 +1,7 @@ 2012-08-10 Glenn Morris + * Makefile.in (config_h): Fix conf_post.h out-of-tree build location. + * lisp.h (DIRECTORY_SEP): Let configure set it. 2012-08-09 Dmitry Antipov === modified file 'src/Makefile.in' --- src/Makefile.in 2012-08-01 15:19:51 +0000 +++ src/Makefile.in 2012-08-10 00:47:21 +0000 @@ -56,7 +56,7 @@ lispdir = ../lisp # Configuration files for .o files to depend on. -config_h = config.h conf_post.h +config_h = config.h $(srcdir)/conf_post.h bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) ------------------------------------------------------------ revno: 109540 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-08-09 20:16:33 -0400 message: Remove some make-docfile.c undes that are no longer needed * lib-src/make-docfile.c (main): (fopen) [!WINDOWSNT]: (chdir) [!DOS_NT]: No more need to undef. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-08-10 00:02:10 +0000 +++ lib-src/ChangeLog 2012-08-10 00:16:33 +0000 @@ -1,5 +1,9 @@ 2012-08-10 Glenn Morris + * make-docfile.c (main): + (fopen) [!WINDOWSNT]: + (chdir) [!DOS_NT]: No more need to undef. + * movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP): * make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP): * emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP): === modified file 'lib-src/make-docfile.c' --- lib-src/make-docfile.c 2012-08-10 00:02:10 +0000 +++ lib-src/make-docfile.c 2012-08-10 00:16:33 +0000 @@ -36,23 +36,26 @@ #include -/* Defined to be emacs_main, sys_fopen, etc. in config.h. */ -/* FIXME Not for ages? */ -#undef main +#include +#include /* config.h unconditionally includes this anyway */ +#ifdef MSDOS +#include +#endif /* MSDOS */ +#ifdef WINDOWSNT +/* Defined to be sys_fopen in ms-w32.h, but only #ifdef emacs, so this + is really just insurance. */ #undef fopen -#undef chdir - -#include -#include /* FIXME config.h unconditionally includes this */ -#ifdef MSDOS -#include -#endif /* MSDOS */ -#ifdef WINDOWSNT #include #include #endif /* WINDOWSNT */ #ifdef DOS_NT +/* Defined to be sys_chdir in ms-w32.h, but only #ifdef emacs, so this + is really just insurance. + + Similarly, msdos defines this as sys_chdir, but we're not linking with the + file where that function is defined. */ +#undef chdir #define READ_TEXT "rt" #define READ_BINARY "rb" #else /* not DOS_NT */ @@ -73,14 +76,6 @@ static void start_globals (void); static void write_globals (void); -/* FIXME msdos does not define this any more, and in any case we - undefined it for everyone just above. */ -#ifdef MSDOS -/* s/msdos.h defines this as sys_chdir, but we're not linking with the - file where that function is defined. */ -#undef chdir -#endif - #include /* Stdio stream for output to the DOC file. */ ------------------------------------------------------------ revno: 109539 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-08-09 20:02:10 -0400 message: Move DIRECTORY_SEP from lisp.h to config.h * configure.ac (DIRECTORY_SEP): Move here from src/lisp.h. * src/lisp.h (DIRECTORY_SEP): Let configure set it. * nt/config.nt (DIRECTORY_SEP): Move here from src/lisp.h. * lib-src/movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP): * lib-src/make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP): * lib-src/emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP): Remove (they are in config.h now). diff: === modified file 'ChangeLog' --- ChangeLog 2012-08-08 16:17:15 +0000 +++ ChangeLog 2012-08-10 00:02:10 +0000 @@ -1,3 +1,7 @@ +2012-08-10 Glenn Morris + + * configure.ac (DIRECTORY_SEP): Move here from src/lisp.h. + 2012-08-08 Dmitry Antipov * configure.ac (--disable-features): Rename to --without-all. === modified file 'configure.ac' --- configure.ac 2012-08-08 16:17:15 +0000 +++ configure.ac 2012-08-10 00:02:10 +0000 @@ -3185,6 +3185,9 @@ AC_DEFINE(USER_FULL_NAME, [pw->pw_gecos], [How to get a user's full name.]) +AC_DEFINE(DIRECTORY_SEP, ['/'], + [Character that separates directories in a file name.]) + dnl Only used on MS platforms. AH_TEMPLATE(DEVICE_SEP, [Character that separates a device in a file name.]) === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-08-09 23:53:07 +0000 +++ lib-src/ChangeLog 2012-08-10 00:02:10 +0000 @@ -1,4 +1,9 @@ -2012-08-09 Glenn Morris +2012-08-10 Glenn Morris + + * movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP): + * make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP): + * emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP): + Remove (they are in config.h now). * ebrowse.c (PATH_LIST_SEPARATOR): Remove, and replace with SEPCHAR from config.h. === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2012-07-11 05:44:06 +0000 +++ lib-src/emacsclient.c 2012-08-10 00:02:10 +0000 @@ -1,5 +1,6 @@ /* Client process that communicates with GNU Emacs acting as server. - Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc. + +Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -213,21 +214,6 @@ /* From sysdep.c */ #if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME) -/* From lisp.h */ -#ifndef DIRECTORY_SEP -#define DIRECTORY_SEP '/' -#endif -#ifndef IS_DIRECTORY_SEP -#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) -#endif -#ifndef IS_DEVICE_SEP -#ifndef DEVICE_SEP -#define IS_DEVICE_SEP(_c_) 0 -#else -#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP) -#endif -#endif - char *get_current_dir_name (void); /* Return the current working directory. Returns NULL on errors. === modified file 'lib-src/make-docfile.c' --- lib-src/make-docfile.c 2012-07-10 21:48:34 +0000 +++ lib-src/make-docfile.c 2012-08-10 00:02:10 +0000 @@ -1,6 +1,7 @@ /* Generate doc-string file for GNU Emacs from source files. - Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012 - Free Software Foundation, Inc. + +Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -36,12 +37,13 @@ #include /* Defined to be emacs_main, sys_fopen, etc. in config.h. */ +/* FIXME Not for ages? */ #undef main #undef fopen #undef chdir #include -#include +#include /* FIXME config.h unconditionally includes this */ #ifdef MSDOS #include #endif /* MSDOS */ @@ -58,14 +60,6 @@ #define READ_BINARY "r" #endif /* not DOS_NT */ -#ifndef DIRECTORY_SEP -#define DIRECTORY_SEP '/' -#endif - -#ifndef IS_DIRECTORY_SEP -#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) -#endif - /* Use this to suppress gcc's `...may be used before initialized' warnings. */ #ifdef lint # define IF_LINT(Code) Code @@ -79,6 +73,8 @@ static void start_globals (void); static void write_globals (void); +/* FIXME msdos does not define this any more, and in any case we + undefined it for everyone just above. */ #ifdef MSDOS /* s/msdos.h defines this as sys_chdir, but we're not linking with the file where that function is defined. */ === modified file 'lib-src/movemail.c' --- lib-src/movemail.c 2012-08-08 16:03:04 +0000 +++ lib-src/movemail.c 2012-08-10 00:02:10 +0000 @@ -275,13 +275,6 @@ else #endif { - #ifndef DIRECTORY_SEP - #define DIRECTORY_SEP '/' - #endif - #ifndef IS_DIRECTORY_SEP - #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) - #endif - /* Use a lock file named after our first argument with .lock appended: If it exists, the mail file is locked. */ /* Note: this locking mechanism is *required* by the mailer === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-08-07 11:03:48 +0000 +++ nt/ChangeLog 2012-08-10 00:02:10 +0000 @@ -1,3 +1,7 @@ +2012-08-10 Glenn Morris + + * config.nt (DIRECTORY_SEP): Move here from src/lisp.h. + 2012-08-07 Juanma Barranquero * config.nt: Sync with autogen/config.nt. === modified file 'nt/config.nt' --- nt/config.nt 2012-08-07 11:03:48 +0000 +++ nt/config.nt 2012-08-10 00:02:10 +0000 @@ -1,7 +1,6 @@ /* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 2001-2012 - Free Software Foundation, Inc. +Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -131,6 +130,9 @@ /* Define to 1 for DGUX with . */ #undef DGUX +/* Character that separates directories in a file name. */ +#define DIRECTORY_SEP '/' + /* Define if dispnew.c should include stdio_ext.h. */ #undef DISPNEW_NEEDS_STDIO_EXT === modified file 'src/ChangeLog' --- src/ChangeLog 2012-08-09 05:14:23 +0000 +++ src/ChangeLog 2012-08-10 00:02:10 +0000 @@ -1,3 +1,7 @@ +2012-08-10 Glenn Morris + + * lisp.h (DIRECTORY_SEP): Let configure set it. + 2012-08-09 Dmitry Antipov Use TSET for write access to Lisp_Object slots of struct terminal. === modified file 'src/lisp.h' --- src/lisp.h 2012-08-08 19:53:44 +0000 +++ src/lisp.h 2012-08-10 00:02:10 +0000 @@ -3418,8 +3418,6 @@ /* Set up the name of the machine we're running on. */ extern void init_system_name (void); -static char const DIRECTORY_SEP = '/'; - /* Use this to suppress gcc's warnings. */ #ifdef lint ------------------------------------------------------------ revno: 109538 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-08-09 19:59:38 -0400 message: Comments diff: === modified file 'lib-src/ntlib.c' --- lib-src/ntlib.c 2012-08-03 10:23:30 +0000 +++ lib-src/ntlib.c 2012-08-09 23:59:38 +0000 @@ -1,5 +1,9 @@ /* Utility and Unix shadow routines for GNU Emacs support programs on NT. - Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. + +Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. + +Author: Geoff Voelker (voelker@cs.washington.edu) +Created: 10-8-94 This file is part of GNU Emacs. @@ -14,11 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . - - - Geoff Voelker (voelker@cs.washington.edu) 10-8-94 -*/ +along with GNU Emacs. If not, see . */ #include #include @@ -260,6 +260,7 @@ stricmp (p, ".cmd") == 0)); } +/* FIXME? This is in config.nt now - is this still needed? */ #define IS_DIRECTORY_SEP(x) ((x) == '/' || (x) == '\\') /* We need this because nt/inc/sys/stat.h defines struct stat that is ------------------------------------------------------------ revno: 109537 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-08-09 19:53:07 -0400 message: * lib-src/ebrowse.c (PATH_LIST_SEPARATOR): Remove Replace with SEPCHAR from config.h. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-08-03 12:16:40 +0000 +++ lib-src/ChangeLog 2012-08-09 23:53:07 +0000 @@ -1,3 +1,8 @@ +2012-08-09 Glenn Morris + + * ebrowse.c (PATH_LIST_SEPARATOR): + Remove, and replace with SEPCHAR from config.h. + 2012-08-03 Juanma Barranquero * makefile.w32-in (LOCAL_FLAGS): Remove WINDOWSNT and DOS_NT, === modified file 'lib-src/ebrowse.c' --- lib-src/ebrowse.c 2012-06-24 17:39:14 +0000 +++ lib-src/ebrowse.c 2012-08-09 23:53:07 +0000 @@ -43,17 +43,12 @@ #define READ_CHUNK_SIZE (100 * 1024) -/* The character used as a separator in path lists (like $PATH). */ - #if defined (__MSDOS__) -#define PATH_LIST_SEPARATOR ';' #define FILENAME_EQ(X,Y) (strcasecmp (X,Y) == 0) #else #if defined (WINDOWSNT) -#define PATH_LIST_SEPARATOR ';' #define FILENAME_EQ(X,Y) (stricmp (X,Y) == 0) #else -#define PATH_LIST_SEPARATOR ':' #define FILENAME_EQ(X,Y) (streq (X,Y)) #endif #endif @@ -3417,7 +3412,7 @@ char *start = path_list; struct search_path *p; - while (*path_list && *path_list != PATH_LIST_SEPARATOR) + while (*path_list && *path_list != SEPCHAR) ++path_list; p = (struct search_path *) xmalloc (sizeof *p); @@ -3434,7 +3429,7 @@ else search_path = search_path_tail = p; - while (*path_list == PATH_LIST_SEPARATOR) + while (*path_list == SEPCHAR) ++path_list; } } ------------------------------------------------------------ revno: 109536 committer: Jay Belanger branch nick: trunk timestamp: Thu 2012-08-09 09:46:03 -0500 message: calccomp.el (math-compose-expr): Add extra argument indicating that parentheses should be put around products in denominators. Give multiplication precedence over division during composition. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-09 13:37:31 +0000 +++ lisp/ChangeLog 2012-08-09 14:46:03 +0000 @@ -1,3 +1,10 @@ +2012-08-09 Jay Belanger + + * calc/calccomp.el (math-compose-expr): Add extra argument + indicating that parentheses should be put around products in + denominators. Give multiplication precedence over division during + composition. + 2012-08-09 Chong Yidong * man.el (Man-switches, Man-sed-command, Man-awk-command) === modified file 'lisp/calc/calccomp.el' --- lisp/calc/calccomp.el 2012-07-27 15:05:13 +0000 +++ lisp/calc/calccomp.el 2012-08-09 14:46:03 +0000 @@ -86,8 +86,11 @@ (setq sn (math-to-underscores sn))) sn))) -(defun math-compose-expr (a prec) - (let ((math-compose-level (1+ math-compose-level)) +;;; Give multiplication precendence when composing to avoid +;;; writing a*(b c) instead of a b c +(defun math-compose-expr (a prec &optional div) + (let ((calc-multiplication-has-precedence t) + (math-compose-level (1+ math-compose-level)) (math-expr-opers (math-expr-ops)) spfn) (cond @@ -591,7 +594,9 @@ (or (= (length a) 3) (eq (car a) 'calcFunc-if)) (/= (nth 3 op) -1)) (cond - ((> prec (or (nth 4 op) (min (nth 2 op) (nth 3 op)))) + ((or + (> prec (or (nth 4 op) (min (nth 2 op) (nth 3 op)))) + (and div (eq (car a) '*))) (if (and (memq calc-language '(tex latex)) (not (math-tex-expr-is-flat a))) (if (eq (car-safe a) '/) @@ -631,7 +636,7 @@ nil) math-compose-level)) (lhs (math-compose-expr (nth 1 a) (nth 2 op))) - (rhs (math-compose-expr (nth 2 a) (nth 3 op)))) + (rhs (math-compose-expr (nth 2 a) (nth 3 op) (eq (nth 1 op) '/)))) (and (equal (car op) "^") (eq (math-comp-first-char lhs) ?-) (setq lhs (list 'horiz "(" lhs ")"))) ------------------------------------------------------------ revno: 109535 fixes bug: http://debbugs.gnu.org/10429 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-08-09 21:37:31 +0800 message: Convert several man.el defvars to defcustoms. * man.el (Man-switches, Man-sed-command, Man-awk-command) (Man-mode-hook, Man-cooked-hook, Man-untabify-command-args) (Man-untabify-command, manual-program): Convert to defcustom. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-09 08:16:13 +0000 +++ lisp/ChangeLog 2012-08-09 13:37:31 +0000 @@ -1,5 +1,10 @@ 2012-08-09 Chong Yidong + * man.el (Man-switches, Man-sed-command, Man-awk-command) + (Man-mode-hook, Man-cooked-hook, Man-untabify-command-args) + (Man-untabify-command, manual-program): Convert to defcustom + (Bug#10429). + * vc/add-log.el (change-log-mode): Bind comment-start to nil. * descr-text.el (describe-char): Don't insert extra newlines === modified file 'lisp/man.el' --- lisp/man.el 2012-07-31 13:34:20 +0000 +++ lisp/man.el 2012-08-09 13:37:31 +0000 @@ -90,9 +90,6 @@ (require 'button) -;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -;; empty defvars (keep the compiler quiet) - (defgroup man nil "Browse UNIX manual pages." :prefix "Man-" @@ -100,6 +97,7 @@ :group 'help) (defvar Man-notify) + (defcustom Man-filter-list nil "Manpage cleaning filter command phrases. This variable contains a list of the following form: @@ -121,9 +119,6 @@ (defvar Man-sed-script nil "Script for sed to nuke backspaces and ANSI codes from manpages.") -;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -;; user variables - (defcustom Man-fontify-manpage-flag t "Non-nil means make up the manpage with fonts." :type 'boolean @@ -236,26 +231,40 @@ :version "24.1" :type 'string :group 'bookmark) -(defvar manual-program "man" - "The name of the program that produces man pages.") - -(defvar Man-untabify-command "pr" - "Command used for untabifying.") - -(defvar Man-untabify-command-args (list "-t" "-e") - "List of arguments to be passed to `Man-untabify-command' (which see).") - -(defvar Man-sed-command "sed" - "Command used for processing sed scripts.") - -(defvar Man-awk-command "awk" - "Command used for processing awk scripts.") - -(defvar Man-mode-hook nil - "Hook run when Man mode is enabled.") - -(defvar Man-cooked-hook nil - "Hook run after removing backspaces but before `Man-mode' processing.") +(defcustom manual-program "man" + "Program used by `man' to produce man pages." + :type 'string + :group 'man) + +(defcustom Man-untabify-command "pr" + "Program used by `man' for untabifying." + :type 'string + :group 'man) + +(defcustom Man-untabify-command-args (list "-t" "-e") + "List of arguments to be passed to `Man-untabify-command' (which see)." + :type '(repeat string) + :group 'man) + +(defcustom Man-sed-command "sed" + "Program used by `man' to process sed scripts." + :type 'string + :group 'man) + +(defcustom Man-awk-command "awk" + "Program used by `man' to process awk scripts." + :type 'string + :group 'man) + +(defcustom Man-mode-hook nil + "Hook run when Man mode is enabled." + :type 'hook + :group 'man) + +(defcustom Man-cooked-hook nil + "Hook run after removing backspaces but before `Man-mode' processing." + :type 'hook + :group 'man) (defvar Man-name-regexp "[-a-zA-Z0-9_­+][-a-zA-Z0-9_.:­+]*" "Regular expression describing the name of a manpage (without section).") @@ -330,11 +339,12 @@ (concat "\\(" Man-name-regexp "\\)\\((\\(" Man-section-regexp "\\))\\)?") "Regular expression describing a reference in the SEE ALSO section.") -(defvar Man-switches "" +(defcustom Man-switches "" "Switches passed to the man command, as a single string. - -If you want to be able to see all the manpages for a subject you type, -make -a one of the switches, if your `man' program supports it.") +For example, the -a switch lets you see all the manpages for a +specified subject, if your `man' program supports it." + :type 'string + :group 'man) (defvar Man-specified-section-option (if (string-match "-solaris[0-9.]*$" system-configuration) @@ -348,8 +358,6 @@ Otherwise, the value is whatever the function `Man-support-local-filenames' should return.") -;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -;; end user variables ;; other variables and keymap initializations (defvar Man-original-frame) ------------------------------------------------------------ revno: 109534 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-08-09 06:17:30 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2012-08-07 10:17:30 +0000 +++ autogen/configure 2012-08-09 10:17:30 +0000 @@ -1326,7 +1326,7 @@ ns_frag' ac_user_opts=' enable_option_checking -enable_features +with_all with_pop with_kerberos with_kerberos5 @@ -2010,8 +2010,6 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-features omit almost all features and build small executable - with minimal dependencies --disable-ns-self-contained disable self contained build under NeXTstep --enable-locallisppath=PATH @@ -2044,6 +2042,8 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --without-all omit almost all features and build small executable + with minimal dependencies --without-pop don't support POP mail retrieval with movemail --with-kerberos support Kerberos-authenticated POP --with-kerberos5 support Kerberos version 5 authenticated POP @@ -3805,11 +3805,12 @@ docdir='${datadir}/emacs/${version}/etc' gamedir='${localstatedir}/games/emacs' -# Check whether --enable-features was given. -if test "${enable_features+set}" = set; then : - enableval=$enable_features; enable_features=$enableval + +# Check whether --with-all was given. +if test "${with_all+set}" = set; then : + withval=$with_all; with_features=$withval else - enable_features=yes + with_features=yes fi @@ -3820,7 +3821,7 @@ if test "${with_pop+set}" = set; then : withval=$with_pop; else - with_pop=$enable_features + with_pop=$with_features fi if test "$with_pop" = yes; then @@ -3918,7 +3919,7 @@ if test "${with_sound+set}" = set; then : withval=$with_sound; else - with_sound=$enable_features + with_sound=$with_features fi @@ -3927,7 +3928,7 @@ if test "${with_sync_input+set}" = set; then : withval=$with_sync_input; else - with_sync_input=$enable_features + with_sync_input=$with_features fi if test "$with_sync_input" = yes; then @@ -3977,7 +3978,7 @@ if test "${with_xpm+set}" = set; then : withval=$with_xpm; else - with_xpm=$enable_features + with_xpm=$with_features fi @@ -3985,7 +3986,7 @@ if test "${with_jpeg+set}" = set; then : withval=$with_jpeg; else - with_jpeg=$enable_features + with_jpeg=$with_features fi @@ -3993,7 +3994,7 @@ if test "${with_tiff+set}" = set; then : withval=$with_tiff; else - with_tiff=$enable_features + with_tiff=$with_features fi @@ -4001,7 +4002,7 @@ if test "${with_gif+set}" = set; then : withval=$with_gif; else - with_gif=$enable_features + with_gif=$with_features fi @@ -4009,7 +4010,7 @@ if test "${with_png+set}" = set; then : withval=$with_png; else - with_png=$enable_features + with_png=$with_features fi @@ -4017,7 +4018,7 @@ if test "${with_rsvg+set}" = set; then : withval=$with_rsvg; else - with_rsvg=$enable_features + with_rsvg=$with_features fi @@ -4025,7 +4026,7 @@ if test "${with_xml2+set}" = set; then : withval=$with_xml2; else - with_xml2=$enable_features + with_xml2=$with_features fi @@ -4033,7 +4034,7 @@ if test "${with_imagemagick+set}" = set; then : withval=$with_imagemagick; else - with_imagemagick=$enable_features + with_imagemagick=$with_features fi @@ -4042,7 +4043,7 @@ if test "${with_xft+set}" = set; then : withval=$with_xft; else - with_xft=$enable_features + with_xft=$with_features fi @@ -4050,7 +4051,7 @@ if test "${with_libotf+set}" = set; then : withval=$with_libotf; else - with_libotf=$enable_features + with_libotf=$with_features fi @@ -4058,7 +4059,7 @@ if test "${with_m17n_flt+set}" = set; then : withval=$with_m17n_flt; else - with_m17n_flt=$enable_features + with_m17n_flt=$with_features fi @@ -4067,7 +4068,7 @@ if test "${with_toolkit_scroll_bars+set}" = set; then : withval=$with_toolkit_scroll_bars; else - with_toolkit_scroll_bars=$enable_features + with_toolkit_scroll_bars=$with_features fi @@ -4075,7 +4076,7 @@ if test "${with_xaw3d+set}" = set; then : withval=$with_xaw3d; else - with_xaw3d=$enable_features + with_xaw3d=$with_features fi @@ -4083,7 +4084,7 @@ if test "${with_xim+set}" = set; then : withval=$with_xim; else - with_xim=$enable_features + with_xim=$with_features fi @@ -4100,7 +4101,7 @@ if test "${with_gpm+set}" = set; then : withval=$with_gpm; else - with_gpm=$enable_features + with_gpm=$with_features fi @@ -4108,7 +4109,7 @@ if test "${with_dbus+set}" = set; then : withval=$with_dbus; else - with_dbus=$enable_features + with_dbus=$with_features fi @@ -4116,7 +4117,7 @@ if test "${with_gconf+set}" = set; then : withval=$with_gconf; else - with_gconf=$enable_features + with_gconf=$with_features fi @@ -4124,7 +4125,7 @@ if test "${with_gsettings+set}" = set; then : withval=$with_gsettings; else - with_gsettings=$enable_features + with_gsettings=$with_features fi @@ -4132,7 +4133,7 @@ if test "${with_selinux+set}" = set; then : withval=$with_selinux; else - with_selinux=$enable_features + with_selinux=$with_features fi @@ -4140,7 +4141,7 @@ if test "${with_gnutls+set}" = set; then : withval=$with_gnutls; else - with_gnutls=$enable_features + with_gnutls=$with_features fi @@ -4151,7 +4152,7 @@ if test "${with_makeinfo+set}" = set; then : withval=$with_makeinfo; else - with_makeinfo=$enable_features + with_makeinfo=$with_features fi @@ -4165,7 +4166,7 @@ if test "${with_compress_info+set}" = set; then : withval=$with_compress_info; else - with_compress_info=$enable_features + with_compress_info=$with_features fi if test $with_compress_info = yes; then ------------------------------------------------------------ revno: 109533 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-08-09 16:16:13 +0800 message: * lisp/vc/add-log.el (change-log-mode): Bind comment-start to nil. This fixes M-q for Change Log entries which contain "(Bug#123)". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-09 08:10:32 +0000 +++ lisp/ChangeLog 2012-08-09 08:16:13 +0000 @@ -1,5 +1,7 @@ 2012-08-09 Chong Yidong + * vc/add-log.el (change-log-mode): Bind comment-start to nil. + * descr-text.el (describe-char): Don't insert extra newlines (Bug#10127). === modified file 'lisp/vc/add-log.el' --- lisp/vc/add-log.el 2012-07-25 05:48:19 +0000 +++ lisp/vc/add-log.el 2012-08-09 08:16:13 +0000 @@ -1049,6 +1049,7 @@ show-trailing-whitespace t) (set (make-local-variable 'fill-forward-paragraph-function) 'change-log-fill-forward-paragraph) + (set (make-local-variable 'comment-start) nil) ;; Make sure we call `change-log-indent' when filling. (set (make-local-variable 'fill-indent-according-to-mode) t) ;; Avoid that filling leaves behind a single "*" on a line. ------------------------------------------------------------ revno: 109532 fixes bug: http://debbugs.gnu.org/10127 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-08-09 16:10:32 +0800 message: * descr-text.el (describe-char): Don't insert extra newlines. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-09 07:45:23 +0000 +++ lisp/ChangeLog 2012-08-09 08:10:32 +0000 @@ -1,5 +1,8 @@ 2012-08-09 Chong Yidong + * descr-text.el (describe-char): Don't insert extra newlines + (Bug#10127). + * vc/log-view.el (log-view-diff): Use use-region-p (Bug#10133). (log-view-diff-changeset, log-view-minor-wrap): Likewise. === modified file 'lisp/descr-text.el' --- lisp/descr-text.el 2012-07-17 18:15:02 +0000 +++ lisp/descr-text.el 2012-08-09 08:10:32 +0000 @@ -679,17 +679,11 @@ (when (cadr elt) (insert (format formatter (car elt))) (dolist (clm (cdr elt)) - (if (eq (car-safe clm) 'insert-text-button) - (progn (insert " ") (eval clm)) - (when (>= (+ (current-column) - (or (string-match-p "\n" clm) - (string-width clm)) - 1) - (window-width)) - (insert "\n") - (indent-to (1+ max-width))) - (unless (zerop (length clm)) - (insert " " clm)))) + (cond ((eq (car-safe clm) 'insert-text-button) + (insert " ") + (eval clm)) + ((not (zerop (length clm))) + (insert " " clm)))) (insert "\n")))) (when overlays ------------------------------------------------------------ revno: 109531 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-08-09 15:50:49 +0800 message: Update docstrings for last change. diff: === modified file 'lisp/vc/log-view.el' --- lisp/vc/log-view.el 2012-08-09 07:45:23 +0000 +++ lisp/vc/log-view.el 2012-08-09 07:50:49 +0000 @@ -537,12 +537,14 @@ (defun log-view-diff (beg end) "Get the diff between two revisions. -If the mark is not active or the mark is on the revision at point, -get the diff between the revision at point and its previous revision. -Otherwise, get the diff between the revisions where the region starts -and ends. -Contrary to `log-view-diff-changeset', it will only show the part of the -changeset that affected the currently considered file(s)." +If the region is inactive or the mark is on the revision at +point, get the diff between the revision at point and its +previous revision. Otherwise, get the diff between the revisions +where the region starts and ends. + +Unlike `log-view-diff-changeset', this function only shows the +part of the changeset which affected the currently considered +file(s)." (interactive (list (if (use-region-p) (region-beginning) (point)) (if (use-region-p) (region-end) (point)))) @@ -562,12 +564,14 @@ (defun log-view-diff-changeset (beg end) "Get the diff between two revisions. -If the mark is not active or the mark is on the revision at point, -get the diff between the revision at point and its previous revision. -Otherwise, get the diff between the revisions where the region starts -and ends. -Contrary to `log-view-diff', it will show the whole changeset including -the changes that affected other files than the currently considered file(s)." +If the region is inactive or the mark is on the revision at +point, get the diff between the revision at point and its +previous revision. Otherwise, get the diff between the revisions +where the region starts and ends. + +Unlike `log-view-diff' this function shows the whole changeset, +including changes affecting other files than the currently +considered file(s)." (interactive (list (if (use-region-p) (region-beginning) (point)) (if (use-region-p) (region-end) (point)))) ------------------------------------------------------------ revno: 109530 fixes bug: http://debbugs.gnu.org/10133 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-08-09 15:45:23 +0800 message: * lisp/vc/log-view.el (log-view-diff): Use use-region-p. (log-view-diff-changeset, log-view-minor-wrap): Likewise. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-09 07:34:53 +0000 +++ lisp/ChangeLog 2012-08-09 07:45:23 +0000 @@ -1,5 +1,8 @@ 2012-08-09 Chong Yidong + * vc/log-view.el (log-view-diff): Use use-region-p (Bug#10133). + (log-view-diff-changeset, log-view-minor-wrap): Likewise. + * align.el (align-region): Delete temporary markers (Bug#10047). Plus some code cleanups. === modified file 'lisp/vc/log-view.el' --- lisp/vc/log-view.el 2012-07-11 04:35:13 +0000 +++ lisp/vc/log-view.el 2012-08-09 07:45:23 +0000 @@ -452,7 +452,7 @@ (defun log-view-minor-wrap (buf f) (let ((data (with-current-buffer buf (let* ((beg (point)) - (end (if mark-active (mark) (point))) + (end (if (use-region-p) (mark) (point))) (fr (log-view-current-tag beg)) (to (log-view-current-tag end))) (when (string-equal fr to) @@ -544,8 +544,8 @@ Contrary to `log-view-diff-changeset', it will only show the part of the changeset that affected the currently considered file(s)." (interactive - (list (if mark-active (region-beginning) (point)) - (if mark-active (region-end) (point)))) + (list (if (use-region-p) (region-beginning) (point)) + (if (use-region-p) (region-end) (point)))) (let ((fr (log-view-current-tag beg)) (to (log-view-current-tag end))) (when (string-equal fr to) @@ -569,8 +569,8 @@ Contrary to `log-view-diff', it will show the whole changeset including the changes that affected other files than the currently considered file(s)." (interactive - (list (if mark-active (region-beginning) (point)) - (if mark-active (region-end) (point)))) + (list (if (use-region-p) (region-beginning) (point)) + (if (use-region-p) (region-end) (point)))) (when (eq (vc-call-backend log-view-vc-backend 'revision-granularity) 'file) (error "The %s backend does not support changeset diffs" log-view-vc-backend)) (let ((fr (log-view-current-tag beg)) ------------------------------------------------------------ revno: 109529 fixes bug: http://debbugs.gnu.org/10047 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-08-09 15:34:53 +0800 message: * align.el (align-region): Delete temporary markers. Plus some code cleanups. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-09 07:15:04 +0000 +++ lisp/ChangeLog 2012-08-09 07:34:53 +0000 @@ -1,3 +1,8 @@ +2012-08-09 Chong Yidong + + * align.el (align-region): Delete temporary markers (Bug#10047). + Plus some code cleanups. + 2012-08-09 Fabián Ezequiel Gallina * progmodes/python.el (python-pdbtrack-tracked-buffer) === modified file 'lisp/align.el' --- lisp/align.el 2012-01-19 07:21:25 +0000 +++ lisp/align.el 2012-08-09 07:34:53 +0000 @@ -1295,7 +1295,8 @@ (report (and (not func) align-large-region beg end (>= (- end beg) align-large-region))) (rule-index 1) - (rule-count (length rules))) + (rule-count (length rules)) + markers) (if (and align-indent-before-aligning real-beg end-mark) (indent-region real-beg end-mark nil)) (while rules @@ -1315,14 +1316,14 @@ (thissep (if rulesep (cdr rulesep) separate)) same (eol 0) search-start - group group-c + groups group-c spacing spacing-c tab-stop tab-stop-c repeat repeat-c valid valid-c first regions index - last-point b e + last-point save-match-data exclude-p align-props) @@ -1386,7 +1387,7 @@ (when (or (not func) (funcall func beg end rule)) (unwind-protect - (let (exclude-areas) + (let (rule-beg exclude-areas) ;; determine first of all where the exclusions ;; lie in this region (when exclude-rules @@ -1451,11 +1452,10 @@ ;; lookup the `group' attribute the first time ;; that we need it (unless group-c - (setq group (or (cdr (assq 'group rule)) 1)) - (if (listp group) - (setq first (car group)) - (setq first group group (list group))) - (setq group-c t)) + (setq groups (or (cdr (assq 'group rule)) 1)) + (unless (listp groups) + (setq groups (list groups))) + (setq first (car groups))) (unless spacing-c (setq spacing (cdr (assq 'spacing rule)) @@ -1464,19 +1464,19 @@ (unless tab-stop-c (setq tab-stop (let ((rule-ts (assq 'tab-stop rule))) - (if rule-ts - (cdr rule-ts) - (if (symbolp align-to-tab-stop) - (symbol-value align-to-tab-stop) - align-to-tab-stop))) + (cond (rule-ts + (cdr rule-ts)) + ((symbolp align-to-tab-stop) + (symbol-value align-to-tab-stop)) + (t + align-to-tab-stop))) tab-stop-c t)) ;; test whether we have found a match on the same ;; line as a previous match - (if (> (point) eol) - (progn - (setq same nil) - (align--set-marker eol (line-end-position)))) + (when (> (point) eol) + (setq same nil) + (align--set-marker eol (line-end-position))) ;; lookup the `repeat' attribute the first time (or repeat-c @@ -1492,7 +1492,7 @@ ;; match, and save the match-data, since either ;; the `valid' form, or the code that searches for ;; section separation, might alter it - (setq b (match-beginning first) + (setq rule-beg (match-beginning first) save-match-data (match-data)) ;; unless the `valid' attribute is set, and tells @@ -1504,15 +1504,13 @@ ;; section. If so, we should align what we've ;; collected so far, and then begin collecting ;; anew for the next alignment section - (if (and last-point - (align-new-section-p last-point b - thissep)) - (progn - (align-regions regions align-props - rule func) - (setq regions nil) - (setq align-props nil))) - (align--set-marker last-point b t) + (when (and last-point + (align-new-section-p last-point rule-beg + thissep)) + (align-regions regions align-props rule func) + (setq regions nil) + (setq align-props nil)) + (align--set-marker last-point rule-beg t) ;; restore the match data (set-match-data save-match-data) @@ -1522,62 +1520,60 @@ (let ((excls exclude-areas)) (setq exclude-p nil) (while excls - (if (and (< (match-beginning (car group)) + (if (and (< (match-beginning (car groups)) (cdar excls)) - (> (match-end (car (last group))) + (> (match-end (car (last groups))) (caar excls))) (setq exclude-p t excls nil) (setq excls (cdr excls))))) - ;; go through the list of parenthesis groups - ;; matching whitespace text to be - ;; contracted/expanded (or possibly - ;; justified, if the `justify' attribute was - ;; set) + ;; go through the parenthesis groups + ;; matching whitespace to be contracted or + ;; expanded (or possibly justified, if the + ;; `justify' attribute was set) (unless exclude-p - (let ((g group)) - (while g - - ;; we have to use markers, since - ;; `align-areas' may modify the buffer - (setq b (copy-marker - (match-beginning (car g)) t) - e (copy-marker (match-end (car g)) t)) - - ;; record this text region for alignment + (dolist (g groups) + ;; We must use markers, since + ;; `align-areas' may modify the buffer. + ;; Avoid polluting the markers. + (let* ((group-beg (copy-marker + (match-beginning g) t)) + (group-end (copy-marker + (match-end g) t)) + (region (cons group-beg group-end)) + (props (cons (if (listp spacing) + (car spacing) + spacing) + (if (listp tab-stop) + (car tab-stop) + tab-stop)))) + (push group-beg markers) + (push group-end markers) (setq index (if same (1+ index) 0)) - (let ((region (cons b e)) - (props (cons - (if (listp spacing) - (car spacing) - spacing) - (if (listp tab-stop) - (car tab-stop) - tab-stop)))) - (if (nth index regions) - (setcar (nthcdr index regions) - (cons region - (nth index regions))) - (if regions - (progn - (nconc regions - (list (list region))) - (nconc align-props (list props))) - (setq regions - (list (list region))) - (setq align-props (list props))))) - - ;; if any further rule matches are - ;; found before `eol', then they are - ;; on the same line as this one; this - ;; can only happen if the `repeat' - ;; attribute is non-nil - (if (listp spacing) - (setq spacing (cdr spacing))) - (if (listp tab-stop) - (setq tab-stop (cdr tab-stop))) - (setq same t g (cdr g)))) + (cond + ((nth index regions) + (setcar (nthcdr index regions) + (cons region + (nth index regions)))) + (regions + (nconc regions + (list (list region))) + (nconc align-props (list props))) + (t + (setq regions + (list (list region))) + (setq align-props (list props))))) + ;; If any further rule matches are found + ;; before `eol', they are on the same + ;; line as this one; this can only + ;; happen if the `repeat' attribute is + ;; non-nil. + (if (listp spacing) + (setq spacing (cdr spacing))) + (if (listp tab-stop) + (setq tab-stop (cdr tab-stop))) + (setq same t)) ;; if `repeat' has not been set, move to ;; the next line; don't bother searching @@ -1598,6 +1594,11 @@ (setq case-fold-search current-case-fold))))))) (setq rules (cdr rules) rule-index (1+ rule-index))) + ;; This function can use a lot of temporary markers, so instead of + ;; waiting for the next GC we delete them immediately (Bug#10047). + (set-marker end-mark nil) + (dolist (m markers) + (set-marker m nil)) (if report (message "Aligning...done")))) ------------------------------------------------------------ revno: 109528 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-08-09 00:15:04 -0700 message: ChangeLog merge date fixes diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-08-07 03:31:53 +0000 +++ doc/emacs/ChangeLog 2012-08-09 07:15:04 +0000 @@ -9,7 +9,7 @@ * custom.texi (Face Customization): Move discussion of face inheritance here, from Faces section. -2012-07-21 Eli Zaretskii +2012-07-28 Eli Zaretskii * frames.texi (Mouse Commands): Fix the description of mouse-2. (Bug#11958) === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-08-09 04:08:29 +0000 +++ lisp/ChangeLog 2012-08-09 07:15:04 +0000 @@ -483,7 +483,7 @@ * progmodes/gdb-mi.el (gdb-place-breakpoints): Fix the call to gdb-get-location. -2012-07-25 Leo Liu +2012-07-28 Leo Liu * progmodes/cc-menus.el (cc-imenu-objc-function): Avoid leaving nil in the alist (bug#12029). ------------------------------------------------------------ revno: 109527 committer: Chong Yidong branch nick: trunk timestamp: Thu 2012-08-09 13:25:21 +0800 message: * etc/images/splash.svg, etc/images/splash.png: Tweak SVG paths to improve legibility. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-08-08 16:17:15 +0000 +++ etc/ChangeLog 2012-08-09 05:25:21 +0000 @@ -1,3 +1,8 @@ +2012-08-09 Chong Yidong + + * images/splash.svg, images/splash.png: Tweak SVG paths to improve + legibility. + 2012-08-08 Dmitry Antipov * NEWS: Mention --without-all and --enable-link-time-optimization. === modified file 'etc/images/splash.png' Binary files etc/images/splash.png 2008-07-02 01:49:03 +0000 and etc/images/splash.png 2012-08-09 05:25:21 +0000 differ === modified file 'etc/images/splash.svg' --- etc/images/splash.svg 2012-01-19 07:21:25 +0000 +++ etc/images/splash.svg 2012-08-09 05:25:21 +0000 @@ -22,7 +22,7 @@ along with GNU Emacs. If not, see . --> - + @@ -51,7 +43,7 @@ image/svg+xml - splash + 2008/06/28 @@ -76,59 +68,29 @@ - - - - - - - - - - + id="stop2552" + style="stop-color:#4c94f1;stop-opacity:0.78431374" + offset="0" /> + + id="stop7898" + style="stop-color:#fc644b;stop-opacity:0.78431374" + offset="0" /> + id="stop7900" + style="stop-color:#fc644b;stop-opacity:0.78431374" + offset="1" /> - - - - - - - - - - - - - - - + d="M -0.54734668,196.72853 C -10.238062,181.78405 5.3965305,167.92976 14.809201,161.97512 c 6.963497,-4.40524 14.224571,-9.82272 13.070957,-9.82483 -0.996579,-0.002 -3.28511,-0.79177 -5.085617,-1.75545 -6.217876,-3.328 -7.955628,-16.0503 7.055337,-28.37575 16.709358,-12.01621 42.570706,-26.817295 64.900729,-20.35237 3.972323,1.58882 2.904483,4.42259 -3.766368,9.99493 -5.675178,4.74062 -17.792772,11.85728 -18.753492,11.01391 -0.233326,-0.20481 2.490068,-2.19795 6.051979,-4.42919 3.551812,-2.45188 6.827,-5.57228 6.234589,-9.02517 -1.977492,-3.21848 -14.566202,0.87624 -19.657994,3.11812 -8.980399,3.95401 -30.419617,17.3969 -29.389287,24.77996 0.719552,5.15612 9.095912,7.16542 19.107524,2.72826 7.005023,-3.10464 12.660323,-6.60409 12.285323,-4.56715 -0.365454,1.98509 -12.574667,10.22701 -19.359801,12.99119 -10.773868,4.38916 -18.049435,9.35351 -26.510163,16.40859 -7.801376,6.50528 -6.794788,9.58593 -6.794788,14.18989 0,3.11466 2.974668,5.51843 6.829021,5.51843 7.964514,0 8.895804,0.12074 32.270578,-16.56369 5.162282,-3.68473 10.228089,-7.76323 13.653652,-9.77045 4.326017,-2.53484 9.463124,-4.13198 8.976988,-1.65526 -3.779364,7.61077 -5.74585,10.67934 -9.167556,16.15546 8.11118,-6.33235 15.840916,-14.71763 24.306604,-15.7298 2.101063,-0.25121 7.741174,-0.49516 8.636184,0.99596 0.66736,1.11183 -0.45512,5.1162 -2.21368,8.92266 -0.53908,1.16685 1.05142,0.38368 4.67533,-2.30213 7.4413,-5.51505 14.07911,-8.75072 17.95157,-8.75072 4.57712,0 4.83279,1.74832 1.24097,8.48622 -3.75741,7.04855 -6.75962,17.21422 -4.65148,19.88378 1.46622,1.85669 7.96734,-2.91147 10.3276,-4.31865 2.42293,-1.44454 6.05649,-3.67201 7.44149,-4.72955 10.37298,-7.92039 39.1617,-23.15505 40.99851,-21.53603 0.82449,0.72672 -1.6928,2.43145 -10.4509,7.07749 -14.25554,7.56231 -22.59862,14.9854 -22.60932,20.11619 -0.006,2.71011 4.1743,2.15203 7.26381,1.4275 4.40695,-1.03349 12.41622,-3.9676 -0.1736,3.14023 -13.16001,7.42973 -22.48474,6.17812 -16.63437,-3.95665 l 3.73574,-6.16441 -9.13253,6.55379 c -13.1916,9.46671 -19.35595,10.10807 -22.76505,7.11544 -2.6121,-2.29301 -1.99116,-8.56165 1.43897,-14.5266 2.74703,-4.77707 3.88176,-8.84229 2.46817,-8.84229 -2.38604,0 -7.35931,4.53611 -13.269938,10.69747 -9.974903,10.39803 -8.541011,15.10079 -10.591215,15.36937 -1.2597,0.16503 -6.977484,-1.59412 -4.555892,-8.64067 1.80805,-5.26122 4.692881,-8.68747 6.822262,-11.55279 3.866732,-5.2031 1.480467,-5.97342 -3.790272,-3.77097 -3.05613,1.27704 -5.350157,4.83814 -17.152826,15.01371 -13.804895,11.90177 -18.199091,17.31988 -20.790434,11.99663 -1.273249,-2.61557 1.017602,-5.97434 3.23361,-9.57032 4.367498,-7.21552 10.687821,-13.92473 8.632844,-16.40082 -2.050191,0.66573 -5.701417,3.94706 -7.917424,5.72051 -2.216008,1.77344 -5.216905,3.98662 -6.668674,4.91816 -1.451757,0.93154 -5.757863,3.9162 -9.569125,6.63254 -3.811251,2.71637 -10.546273,6.79489 -14.966706,9.06335 -9.584043,4.91833 -13.8359278,5.33836 -18.57838668,1.83533 z M 159.75643,187.9147 c -4.88506,-3.00364 -1.44968,-15.28517 5.948,-21.2642 3.32796,-2.68976 12.33843,-8.3073 13.32481,-8.3073 0.27463,0 -1.05354,2.61529 -2.9515,5.81174 -5.51025,9.28008 -4.30612,16.29397 2.79731,16.29397 5.95677,0 10.60291,-1.935 15.24759,-9.21089 3.95762,-6.19961 10.07679,-10.04817 15.75277,-13.07984 4.88528,-2.60934 15.49103,-5.23799 19.83723,-4.00272 6.01532,1.70966 5.07061,0.66399 -3.766,4.03459 -9.35359,3.5678 -12.15223,5.23437 -15.80579,9.41222 -4.62835,5.29254 -5.17979,8.5948 -1.91397,11.46168 2.05902,1.80749 3.56776,2.26807 7.41531,2.26374 2.65669,-0.003 5.81168,-1.7253 7.33518,-2.42296 1.52351,-0.69765 3.03519,0.21321 3.03519,0.61971 -5.88638,3.94569 -11.44839,6.45882 -14.00234,7.27145 -2.61375,0.96599 -7.35132,2.03318 -10.23523,1.93803 -5.03631,0.0339 -9.16147,-1.48631 -10.57379,-3.37846 -0.79608,-1.43217 -1.3268,-2.70381 -0.96262,-3.97903 1.0679,-3.73939 0.16517,-2.52343 -4.28527,0.23044 -13.102,8.10733 -21.40719,9.25285 -26.19688,6.30784 z m 75.29251,0.53861 c -1.38501,-0.41487 -3.99134,-0.79396 -5.79185,-0.84243 -5.99934,-0.16153 -3.6372,-2.26466 5.12716,-4.56493 2.24719,-0.58979 2.74693,-0.49039 2.32997,0.46346 -1.0714,2.45099 8.09297,3.14024 13.72804,1.0325 5.4798,-2.04969 7.70684,-5.31293 8.2153,-10.06119 0.16756,-8.34719 -12.6158,-6.31988 -18.32043,-6.36109 -12.98146,-0.0572 -14.34396,-1.01124 -7.14295,-5.00172 9.56822,-5.3023 20.88185,-11.1336 25.8426,-10.44585 5.86061,0.8125 5.42599,3.39743 -0.5575,3.43312 -3.92889,0.0234 -13.80136,5.14348 -14.97622,6.81223 -1.22979,1.74676 2.12319,2.47254 11.4854,2.48607 8.58743,0.0125 9.56792,0.19334 11.8355,2.18392 3.81332,3.3475 3.46341,8.67923 -0.80123,12.20836 -7.5132,6.21743 -19.30064,10.28748 -30.97375,8.65755 z" + style="opacity:1;fill:#000000;display:inline" /> + d="m 55.834396,197.41294 c 2.448659,-7.38073 7.446723,-16.72109 12.277833,-22.94475 5.710592,-7.35667 7.378339,-9.3856 28.689891,-34.90319 16.87202,-20.20188 19.22296,-23.17964 22.55476,-28.56842 1.5428,-2.49527 3.17766,-4.53686 3.63304,-4.53686 1.18186,0 1.10043,0.30992 -1.63307,6.21531 -1.35357,2.92423 -2.46105,5.64532 -2.46105,6.04685 0,0.40153 -2.97647,4.90375 -6.6144,10.00493 -8.98843,12.60381 -10.76025,14.97182 -13.0823,17.48445 -1.0981,1.18822 -3.8535,4.49366 -6.123108,7.34539 -2.269606,2.85173 -4.587188,5.62332 -5.150194,6.15909 -0.562997,0.53575 -2.795585,3.19769 -4.961309,5.91542 -6.691216,8.39667 -16.095209,19.83397 -17.431654,21.20066 -0.699773,0.71561 -3.044271,3.91702 -5.209995,7.11426 -4.16128,6.14322 -5.795033,7.40513 -4.488444,3.46686 z m 66.481544,-23.7645 c 0.22279,-0.5941 1.5292,-4.28446 2.90315,-8.20081 3.44555,-9.82127 13.66236,-27.15831 19.73886,-33.49506 l 2.48602,-2.59251 2.25191,2.37646 c 2.67739,2.82544 3.88298,2.92759 8.02572,0.68 3.08741,-1.67502 7.69643,-8.22076 20.10229,-28.54928 4.55053,-7.456586 5.01229,-7.939498 5.0346,-5.26516 0.0415,4.9808 -22.21528,41.2544 -29.34472,47.82522 -4.11732,3.7947 -6.18823,4.04757 -8.84718,1.0802 -1.06473,-1.18822 -2.3151,-2.15972 -2.77861,-2.15886 -1.62142,0.003 -12.08302,16.59943 -16.47702,26.13939 -0.82094,1.78235 -1.9443,3.24062 -2.49635,3.24062 -0.55207,0 -0.82147,-0.48609 -0.59867,-1.08021 z m 84.19319,-24.88787 c 0,-7.49007 7.66313,-38.06798 12.33356,-49.21415 3.04458,-7.266009 7.33463,-20.847085 8.32578,-26.356986 0.42748,-2.376449 1.49075,-7.626245 2.36285,-11.666209 0.87207,-4.039964 1.5862,-11.563 1.58694,-16.717855 0.002,-10.935036 -1.20271,-13.589976 -7.10476,-15.663026 -7.62736,-2.67905 -10.16765,-1.47291 -13.00198,6.173428 -1.74243,4.700723 -3.72352,6.856253 -5.44369,5.923006 -1.89626,-1.028794 -1.05403,-4.387566 2.90016,-11.565454 8.13973,-14.77576 14.55936,-18.45654 24.45815,-14.02345 5.65324,2.53175 9.02208,8.60392 9.02208,16.2618 0,9.333563 -7.01946,35.141105 -14.28285,52.511886 -4.47563,10.703728 -11.5668,35.30103 -14.85507,51.5282 -2.1002,10.36421 -3.15113,13.73222 -4.51891,14.48205 -1.5746,0.86323 -1.78226,0.66827 -1.78226,-1.67324 z M 110.03525,94.607887 c -7.1e-4,-8.464568 -0.25892,-9.796146 -2.81265,-14.505144 -2.66535,-4.914782 -7.28206,-9.937882 -9.13385,-9.937882 -0.4676,0 -0.85017,-0.490243 -0.85017,-1.08943 0,-1.557732 8.70129,-12.737188 9.91372,-12.737188 1.73907,0 7.4566,5.456815 9.50728,9.073719 2.60567,4.595744 3.35771,11.337596 2.2795,20.434785 -0.9601,8.100583 -4.13995,15.843563 -7.07234,17.221213 -1.73206,0.81373 -1.83075,0.3578 -1.83149,-8.460073 z m -69.268036,2.283327 c -3.977291,-2.746359 -3.44557,-6.261434 2.439644,-16.127646 4.970535,-8.33282 10.094017,-15.38029 21.43897,-29.489855 6.601357,-8.209992 8.637667,-10.20312 9.579511,-9.376336 0.799394,0.701746 -2.618999,5.390153 -11.474198,15.737111 -16.940162,19.79395 -18.734332,27.221155 -6.575701,27.221155 3.304542,0 6.058837,-0.617002 8.461092,-1.895408 6.360466,-3.38485 18.203678,-11.286415 23.507089,-15.683501 2.848527,-2.361722 5.456729,-4.05036 5.795999,-3.752528 1.04524,0.917548 -4.907057,10.147668 -7.816978,12.121655 -1.511589,1.025416 -5.874113,4.197632 -9.69449,7.049372 -3.820388,2.85174 -8.563965,6.157166 -10.541309,7.345392 -1.977334,1.188224 -4.400156,2.796969 -5.384044,3.574986 -2.248219,1.777799 -11.920783,5.066639 -14.901091,5.066639 -1.232383,0 -3.407898,-0.80597 -4.834494,-1.791036 z M 167.35901,63.639316 c -4.35468,-2.677534 -4.37646,-3.982873 -0.1931,-11.57676 l 3.90554,-7.089571 2.54785,2.658058 c 3.02363,3.154415 6.72598,3.451472 12.70923,1.019721 4.8079,-1.95406 8.30397,-5.194275 11.75211,-10.892036 l 2.61484,-4.320814 -0.49413,3.334678 c -0.73833,4.982504 -10.09007,19.207325 -14.90376,22.669936 -7.26038,5.222576 -13.78694,6.749482 -17.93858,4.196788 z m -32.7125,-5.536491 c -1.89501,-0.888629 -8.4802,-6.332726 -14.63377,-12.09799 -11.53272,-10.804983 -19.30559,-15.591501 -25.31921,-15.591501 -4.300218,0 -9.890682,3.33457 -11.790334,7.032628 -2.74495,5.343604 -3.950075,5.711001 -6.196765,1.88915 -3.156098,-5.368868 -12.746669,-12.378428 -16.936324,-12.378428 -0.628489,0 -6.188212,4.49121 -12.354949,9.980456 -11.483232,10.221671 -16.718945,13.296629 -22.701995,13.33298 -3.490867,0.0212 -7.744061,-2.699113 -10.336357,-6.611093 -1.586521,-2.394192 -1.546221,-2.69169 1.094758,-8.081731 1.508064,-3.077822 3.079193,-6.373792 3.491421,-7.324372 0.652211,-1.50398 0.990788,-1.25829 2.608443,1.8928 1.911186,3.72288 6.321032,7.180923 9.157411,7.180923 4.150835,0 11.504527,-4.724593 21.3988,-13.748293 9.555236,-8.71448 10.829873,-9.58412 14.047538,-9.58412 4.293595,0 9.556372,2.77633 14.656374,7.73182 2.069449,2.0108 3.86226,3.5242 3.984029,3.36311 0.12178,-0.16109 0.945137,-1.31084 1.829667,-2.55499 0.88453,-1.24416 3.685604,-3.3308 6.224606,-4.63699 3.686737,-1.89664 5.463317,-2.29109 8.822097,-1.95876 6.8491,0.67769 15.00978,5.73859 25.22338,15.64246 9.22954,8.949677 17.70147,14.387397 22.41549,14.387397 3.79377,0 9.50175,-3.242454 12.44138,-7.067419 2.42259,-3.152211 2.91825,-3.453173 3.17838,-1.929873 0.1695,0.992615 -1.28406,4.871896 -3.23015,8.620627 -3.35987,6.472087 -6.91202,10.130201 -12.7132,13.092455 -3.04983,1.557333 -10.43785,1.258306 -14.36072,-0.581246 z" + style="opacity:1;fill:#000000;display:inline" /> + style="display:inline"> + d="m 57.534816,196.31319 c 2.448659,-7.38073 7.446723,-16.72109 12.277833,-22.94475 5.710592,-7.35667 7.378339,-9.3856 28.689891,-34.90319 16.87202,-20.20188 19.22296,-23.17964 22.55476,-28.56842 1.5428,-2.49527 3.17766,-4.53686 3.63304,-4.53686 1.18186,0 1.10043,0.30992 -1.63307,6.21531 -1.35357,2.92423 -2.46105,5.64532 -2.46105,6.04685 0,0.40153 -2.97647,4.90375 -6.6144,10.00493 -8.98843,12.60381 -10.76025,14.97182 -13.0823,17.48445 -1.0981,1.18822 -3.8535,4.49366 -6.123108,7.34539 -2.269606,2.85173 -4.587188,5.62332 -5.150194,6.15909 -0.562997,0.53575 -2.795585,3.19769 -4.961309,5.91542 -6.691216,8.39667 -16.095209,19.83397 -17.431654,21.20066 -0.699773,0.71561 -3.044271,3.91702 -5.209995,7.11426 -4.16128,6.14322 -5.795033,7.40513 -4.488444,3.46686 z m 66.481544,-23.7645 c 0.22279,-0.5941 1.5292,-4.28446 2.90315,-8.20081 3.44555,-9.82127 13.66236,-27.15831 19.73886,-33.49506 l 2.48602,-2.59251 2.25191,2.37646 c 2.67739,2.82544 3.88298,2.92759 8.02572,0.68 3.08741,-1.67502 7.69643,-8.22076 20.10229,-28.54928 4.55053,-7.45659 5.01229,-7.939502 5.0346,-5.26516 0.0415,4.9808 -22.21528,41.2544 -29.34472,47.82522 -4.11732,3.7947 -6.18823,4.04757 -8.84718,1.0802 -1.06473,-1.18822 -2.3151,-2.15972 -2.77861,-2.15886 -1.62142,0.003 -12.08302,16.59943 -16.47702,26.13939 -0.82094,1.78235 -1.9443,3.24062 -2.49635,3.24062 -0.55207,0 -0.82147,-0.48609 -0.59867,-1.08021 z m 84.19319,-24.88787 c 0,-7.49007 7.66313,-38.06798 12.33356,-49.21415 3.04458,-7.266013 7.33463,-20.847089 8.32578,-26.35699 0.42748,-2.376449 1.49075,-7.626245 2.36285,-11.666209 0.87207,-4.039964 1.5862,-11.563 1.58694,-16.717855 0.002,-10.935036 -1.20271,-13.589976 -7.10476,-15.663026 -7.62736,-2.67905 -10.16765,-1.47291 -13.00198,6.173428 -1.74243,4.700723 -3.72352,6.856253 -5.44369,5.923006 -1.89626,-1.028794 -1.05403,-4.387566 2.90016,-11.565454 8.13973,-14.77576 14.55936,-18.45654 24.45815,-14.02345 5.65324,2.53175 9.02208,8.60392 9.02208,16.2618 0,9.333563 -7.01946,35.141105 -14.28285,52.511886 -4.47563,10.703728 -11.5668,35.301034 -14.85507,51.528204 -2.1002,10.36421 -3.15113,13.73222 -4.51891,14.48205 -1.5746,0.86323 -1.78226,0.66827 -1.78226,-1.67324 z M 111.73567,93.508133 c -7.1e-4,-8.464568 -0.25892,-9.796146 -2.81265,-14.505144 -2.66535,-4.914782 -7.28206,-9.937882 -9.13385,-9.937882 -0.4676,0 -0.85017,-0.490243 -0.85017,-1.08943 0,-1.557732 8.70129,-12.737188 9.91372,-12.737188 1.73907,0 7.4566,5.456815 9.50728,9.073719 2.60567,4.595744 3.35771,11.337596 2.2795,20.434785 -0.9601,8.100583 -4.13995,15.843567 -7.07234,17.221217 -1.73206,0.81373 -1.83075,0.3578 -1.83149,-8.460077 z M 42.467634,95.79146 c -3.977291,-2.746359 -3.44557,-6.261434 2.439644,-16.127646 4.970535,-8.33282 10.094017,-15.38029 21.43897,-29.489855 6.601357,-8.209992 8.637667,-10.20312 9.579511,-9.376336 0.799394,0.701746 -2.618999,5.390153 -11.474198,15.737111 -16.940162,19.79395 -18.734332,27.221155 -6.575701,27.221155 3.304542,0 6.058837,-0.617002 8.461092,-1.895408 6.360466,-3.38485 18.203678,-11.286415 23.507089,-15.683501 2.848527,-2.361722 5.456729,-4.05036 5.795999,-3.752528 1.04524,0.917548 -4.907057,10.147668 -7.816978,12.121655 -1.511589,1.025416 -5.874113,4.197632 -9.69449,7.049372 -3.820388,2.85174 -8.563965,6.157166 -10.541309,7.345392 -1.977334,1.188224 -4.400156,2.796969 -5.384044,3.574986 C 59.955,94.293656 50.282436,97.5825 47.302128,97.5825 c -1.232383,0 -3.407898,-0.80597 -4.834494,-1.79104 z M 169.05943,62.539562 c -4.35468,-2.677534 -4.37646,-3.982873 -0.1931,-11.57676 l 3.90554,-7.089571 2.54785,2.658058 c 3.02363,3.154415 6.72598,3.451472 12.70923,1.019721 4.8079,-1.95406 8.30397,-5.194275 11.75211,-10.892036 l 2.61484,-4.320814 -0.49413,3.334678 c -0.73833,4.982504 -10.09007,19.207325 -14.90376,22.669936 -7.26038,5.222576 -13.78694,6.749482 -17.93858,4.196788 z m -32.7125,-5.536491 c -1.89501,-0.888629 -8.4802,-6.332726 -14.63377,-12.09799 C 110.18044,34.100098 102.40757,29.31358 96.39395,29.31358 c -4.300218,0 -9.890682,3.33457 -11.790334,7.032628 -2.74495,5.343604 -3.950075,5.711001 -6.196765,1.88915 C 75.250753,32.86649 65.660182,25.85693 61.470527,25.85693 c -0.628489,0 -6.188212,4.49121 -12.354949,9.980456 -11.483232,10.221671 -16.718945,13.296629 -22.701995,13.33298 -3.490867,0.0212 -7.744061,-2.699113 -10.336357,-6.611093 -1.586521,-2.394192 -1.546221,-2.69169 1.094758,-8.081731 1.508064,-3.077822 3.079193,-6.373792 3.491421,-7.324372 0.652211,-1.50398 0.990788,-1.25829 2.608443,1.8928 1.911186,3.72288 6.321032,7.180923 9.157411,7.180923 4.150835,0 11.504527,-4.724593 21.3988,-13.748293 9.555236,-8.71448 10.829873,-9.58412 14.047538,-9.58412 4.293595,0 9.556372,2.77633 14.656374,7.73182 2.069449,2.0108 3.86226,3.5242 3.984029,3.36311 0.12178,-0.16109 0.945137,-1.31084 1.829667,-2.55499 0.88453,-1.24416 3.685604,-3.3308 6.224606,-4.63699 3.686737,-1.89664 5.463317,-2.29109 8.822097,-1.95876 6.8491,0.67769 15.00978,5.73859 25.22338,15.64246 9.22954,8.949677 17.70147,14.387397 22.41549,14.387397 3.79377,0 9.50175,-3.242454 12.44138,-7.067419 2.42259,-3.152211 2.91825,-3.453173 3.17838,-1.929873 0.1695,0.992615 -1.28406,4.871896 -3.23015,8.620627 -3.35987,6.472087 -6.91202,10.130201 -12.7132,13.092455 -3.04983,1.557333 -10.43785,1.258306 -14.36072,-0.581246 z" + style="fill:url(#linearGradient2425);fill-opacity:1;stroke:#000000;stroke-width:0.97730815" /> +