Now on revision 110516. ------------------------------------------------------------ revno: 110516 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-10-11 21:47:40 -0400 message: * src/buffer.c (Fset_buffer): Doc fix. (Bug#12624) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-11 20:32:11 +0000 +++ src/ChangeLog 2012-10-12 01:47:40 +0000 @@ -1,3 +1,7 @@ +2012-10-12 Glenn Morris + + * buffer.c (Fset_buffer): Doc fix. (Bug#12624) + 2012-10-11 Stefan Monnier * buffer.c (Fkill_buffer): Null out the overlay list(s) as well. === modified file 'src/buffer.c' --- src/buffer.c 2012-10-11 20:32:11 +0000 +++ src/buffer.c 2012-10-12 01:47:40 +0000 @@ -2185,7 +2185,7 @@ DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, doc: /* Make buffer BUFFER-OR-NAME current for editing operations. BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See -also `save-excursion' when you want to make a buffer current +also `with-current-buffer' when you want to make a buffer current temporarily. This function does not display the buffer, so its effect ends when the current command terminates. Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently. */) ------------------------------------------------------------ revno: 110515 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-10-11 21:01:50 -0400 message: rmail-header-summary fix for bug#12625 * lisp/mail/rmailsum.el (rmail-header-summary): Fix 2010-11-26 test for multiline Subject: field. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-12 00:07:25 +0000 +++ lisp/ChangeLog 2012-10-12 01:01:50 +0000 @@ -1,3 +1,8 @@ +2012-10-12 Glenn Morris + + * mail/rmailsum.el (rmail-header-summary): + Fix 2010-11-26 test for multiline Subject: field. (Bug#12625) + 2012-10-12 Fabián Ezequiel Gallina * progmodes/python.el (python-mode-map): Replace === modified file 'lisp/mail/rmailsum.el' --- lisp/mail/rmailsum.el 2012-01-19 07:21:25 +0000 +++ lisp/mail/rmailsum.el 2012-10-12 01:01:50 +0000 @@ -785,7 +785,7 @@ (setq pos (point)) (forward-line 1) (setq str (buffer-substring pos (1- (point)))) - (while (looking-at "\\s ") + (while (looking-at "[ \t]") (setq str (concat str " " (buffer-substring (match-end 0) (line-end-position)))) ------------------------------------------------------------ revno: 110514 committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Thu 2012-10-11 21:07:25 -0300 message: * progmodes/python.el (python-mode-map): Replace subtitute-key-definition with proper command remapping. (python-nav--up-list): Fix behavior for blocks on the same level. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-11 20:36:23 +0000 +++ lisp/ChangeLog 2012-10-12 00:07:25 +0000 @@ -1,3 +1,9 @@ +2012-10-12 Fabián Ezequiel Gallina + + * progmodes/python.el (python-mode-map): Replace + subtitute-key-definition with proper command remapping. + (python-nav--up-list): Fix behavior for blocks on the same level. + 2012-10-11 Stefan Monnier * help-fns.el (describe-function-1): Handle autoloads w/o docstrings. === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2012-10-09 02:07:26 +0000 +++ lisp/progmodes/python.el 2012-10-12 00:07:25 +0000 @@ -229,15 +229,9 @@ (defvar python-mode-map (let ((map (make-sparse-keymap))) ;; Movement - (substitute-key-definition 'backward-sentence - 'python-nav-backward-block - map global-map) - (substitute-key-definition 'forward-sentence - 'python-nav-forward-block - map global-map) - (substitute-key-definition 'backward-up-list - 'python-nav-backward-up-list - map global-map) + (define-key map [remap backward-sentence] 'python-nav-backward-block) + (define-key map [remap forward-sentence] 'python-nav-forward-block) + (define-key map [remap backward-up-list] 'python-nav-backward-up-list) (define-key map "\C-c\C-j" 'imenu) ;; Indent specific (define-key map "\177" 'python-indent-dedent-line-backspace) @@ -1444,7 +1438,7 @@ (save-excursion (let ((indentation (current-indentation))) (while (and (python-nav-backward-block) - (> (current-indentation) indentation)))) + (>= (current-indentation) indentation)))) (point)))) (and (> (point) prev-block-pos) (goto-char prev-block-pos)))) ------------------------------------------------------------ revno: 110513 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-11 16:36:23 -0400 message: * lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Undo last change. * lisp/emacs-lisp/cl-macs.el (cl--defsubst-expand): Idem. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-11 20:11:23 +0000 +++ lisp/ChangeLog 2012-10-11 20:36:23 +0000 @@ -1,8 +1,6 @@ 2012-10-11 Stefan Monnier * help-fns.el (describe-function-1): Handle autoloads w/o docstrings. - * emacs-lisp/cl-lib.el (cl--defsubst-expand): Move autoload... - * emacs-lisp/cl-macs.el (cl--defsubst-expand): ...here. * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago changes to the format of load-history. === modified file 'lisp/emacs-lisp/cl-lib.el' --- lisp/emacs-lisp/cl-lib.el 2012-10-11 20:11:23 +0000 +++ lisp/emacs-lisp/cl-lib.el 2012-10-11 20:36:23 +0000 @@ -727,6 +727,10 @@ ;;;###autoload (progn + ;; Make sure functions defined with cl-defsubst can be inlined even in + ;; packages which do not require CL. We don't put an autoload cookie + ;; directly on that function, since those cookies only go to cl-loaddefs. + (autoload 'cl--defsubst-expand "cl-macs") ;; Autoload, so autoload.el and font-lock can use it even when CL ;; is not loaded. (put 'cl-defun 'doc-string-elt 3) === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2012-10-11 20:11:23 +0000 +++ lisp/emacs-lisp/cl-macs.el 2012-10-11 20:36:23 +0000 @@ -2595,9 +2595,6 @@ ,(and (memq '&key args) 'cl-whole) ,unsafe ,@argns))) (cl-defun ,name ,args ,@body)))) -;; Make sure functions defined with cl-defsubst can be inlined even in -;; packages which do not require CL. -;;;###autoload (defun cl--defsubst-expand (argns body simple whole unsafe &rest argvs) (if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole (if (cl--simple-exprs-p argvs) (setq simple t)) ------------------------------------------------------------ revno: 110512 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-11 16:32:11 -0400 message: * src/buffer.c (Fkill_buffer): Null out the overlay list(s) as well. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-11 20:08:38 +0000 +++ src/ChangeLog 2012-10-11 20:32:11 +0000 @@ -1,5 +1,7 @@ 2012-10-11 Stefan Monnier + * buffer.c (Fkill_buffer): Null out the overlay list(s) as well. + * eval.c (Fautoload): Remember previous autoload status in load-history. 2012-10-11 Paul Eggert === modified file 'src/buffer.c' --- src/buffer.c 2012-10-02 02:43:53 +0000 +++ src/buffer.c 2012-10-11 20:32:11 +0000 @@ -897,6 +897,8 @@ { struct Lisp_Overlay *ov, *next; + /* FIXME: Since each drop_overlay will scan BUF_MARKERS to unlink its + markers, we have an unneeded O(N^2) behavior here. */ for (ov = b->overlays_before; ov; ov = next) { drop_overlay (b, ov); @@ -1886,16 +1888,19 @@ if (b->base_buffer) { - /* Unchain all markers that belong to this indirect buffer. - Don't unchain the markers that belong to the base buffer - or its other indirect buffers. */ - for (m = BUF_MARKERS (b); m; ) - { - struct Lisp_Marker *next = m->next; - if (m->buffer == b) - unchain_marker (m); - m = next; - } + { /* Unchain all markers that belong to this indirect buffer. + Don't unchain the markers that belong to the base buffer + or its other indirect buffers. */ + struct Lisp_Marker **mp; + for (mp = &BUF_MARKERS (b); *mp; ) + { + struct Lisp_Marker *m = *mp; + if (m->buffer == b) + *mp = m->next; + else + mp = &m->next; + } + } } else { @@ -1911,8 +1916,12 @@ BUF_MARKERS (b) = NULL; set_buffer_intervals (b, NULL); - /* Perhaps we should explicitly free the interval tree here... */ + /* Perhaps we should explicitly free the interval tree here... */ } + /* Since we've unlinked the markers, the overlays can't be here any more + either. */ + b->overlays_before = NULL; + b->overlays_after = NULL; /* Reset the local variables, so that this buffer's local values won't be protected from GC. They would be protected ------------------------------------------------------------ revno: 110511 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-11 16:11:23 -0400 message: * lisp/help-fns.el (describe-function-1): Handle autoloads w/o docstrings. * lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Move autoload... * lisp/emacs-lisp/cl-macs.el (cl--defsubst-expand): ...here. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-11 20:08:38 +0000 +++ lisp/ChangeLog 2012-10-11 20:11:23 +0000 @@ -1,5 +1,9 @@ 2012-10-11 Stefan Monnier + * help-fns.el (describe-function-1): Handle autoloads w/o docstrings. + * emacs-lisp/cl-lib.el (cl--defsubst-expand): Move autoload... + * emacs-lisp/cl-macs.el (cl--defsubst-expand): ...here. + * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago changes to the format of load-history. === modified file 'lisp/emacs-lisp/cl-lib.el' --- lisp/emacs-lisp/cl-lib.el 2012-09-28 23:30:52 +0000 +++ lisp/emacs-lisp/cl-lib.el 2012-10-11 20:11:23 +0000 @@ -727,9 +727,6 @@ ;;;###autoload (progn - ;; Make sure functions defined with cl-defsubst can be inlined even in - ;; packages which do not require CL. - (autoload 'cl--defsubst-expand "cl-macs") ;; Autoload, so autoload.el and font-lock can use it even when CL ;; is not loaded. (put 'cl-defun 'doc-string-elt 3) === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2012-10-09 06:01:10 +0000 +++ lisp/emacs-lisp/cl-macs.el 2012-10-11 20:11:23 +0000 @@ -2595,6 +2595,9 @@ ,(and (memq '&key args) 'cl-whole) ,unsafe ,@argns))) (cl-defun ,name ,args ,@body)))) +;; Make sure functions defined with cl-defsubst can be inlined even in +;; packages which do not require CL. +;;;###autoload (defun cl--defsubst-expand (argns body simple whole unsafe &rest argvs) (if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole (if (cl--simple-exprs-p argvs) (setq simple t)) === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2012-09-30 08:24:56 +0000 +++ lisp/help-fns.el 2012-10-11 20:11:23 +0000 @@ -621,7 +621,7 @@ ;; If the function is autoloaded, and its docstring has ;; key substitution constructs, load the library. (doc (progn - (and (autoloadp real-def) + (and (autoloadp real-def) doc-raw help-enable-auto-load (string-match "\\([^\\]=\\|[^=]\\|\\`\\)\\\\[[{<]" doc-raw) ------------------------------------------------------------ revno: 110510 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-11 16:08:38 -0400 message: Fix spurious "cl--defsubst-expand might not be defined at runtime" * lisp/emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago changes to the format of load-history. * src/eval.c (Fautoload): Remember previous autoload status in load-history. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-11 20:05:47 +0000 +++ lisp/ChangeLog 2012-10-11 20:08:38 +0000 @@ -1,5 +1,8 @@ 2012-10-11 Stefan Monnier + * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago + changes to the format of load-history. + * international/mule-cmds.el (read-char-by-name): Move let-binding of completion-ignore-case in case that var is buffer-local (bug#12615). === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2012-10-01 04:45:32 +0000 +++ lisp/emacs-lisp/bytecomp.el 2012-10-11 20:08:38 +0000 @@ -875,13 +875,11 @@ (byte-compile-cl-file-p (car xs)))) (dolist (s xs) (cond - ((symbolp s) - (unless (memq s old-autoloads) - (push s byte-compile-noruntime-functions))) ((and (consp s) (eq t (car s))) (push (cdr s) old-autoloads)) - ((and (consp s) (eq 'autoload (car s))) - (push (cdr s) byte-compile-noruntime-functions))))))) + ((and (consp s) (memq (car s) '(autoload defun))) + (unless (memq (cdr s) old-autoloads) + (push (cdr s) byte-compile-noruntime-functions)))))))) ;; Go through current-load-list for the locally defined funs. (let (old-autoloads) (while (and hist-nil-new (not (eq hist-nil-new hist-nil-orig))) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-11 16:23:37 +0000 +++ src/ChangeLog 2012-10-11 20:08:38 +0000 @@ -1,3 +1,7 @@ +2012-10-11 Stefan Monnier + + * eval.c (Fautoload): Remember previous autoload status in load-history. + 2012-10-11 Paul Eggert lread.c, macros.c, marker.c, menu.c, minibuf.c: Use bool for booleans. === modified file 'src/eval.c' --- src/eval.c 2012-10-01 06:36:54 +0000 +++ src/eval.c 2012-10-11 20:08:38 +0000 @@ -1876,9 +1876,11 @@ CHECK_STRING (file); /* If function is defined and not as an autoload, don't override. */ - if (!EQ (XSYMBOL (function)->function, Qunbound) - && !(CONSP (XSYMBOL (function)->function) - && EQ (XCAR (XSYMBOL (function)->function), Qautoload))) + if ((CONSP (XSYMBOL (function)->function) + && EQ (XCAR (XSYMBOL (function)->function), Qautoload))) + /* Remember that the function was already an autoload. */ + LOADHIST_ATTACH (Fcons (Qt, function)); + else if (!EQ (XSYMBOL (function)->function, Qunbound)) return Qnil; if (NILP (Vpurify_flag)) ------------------------------------------------------------ revno: 110509 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12615 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-11 16:05:47 -0400 message: * lisp/international/mule-cmds.el (read-char-by-name): Move let-binding of completion-ignore-case in case that var is buffer-local. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-11 11:29:47 +0000 +++ lisp/ChangeLog 2012-10-11 20:05:47 +0000 @@ -1,3 +1,8 @@ +2012-10-11 Stefan Monnier + + * international/mule-cmds.el (read-char-by-name): Move let-binding of + completion-ignore-case in case that var is buffer-local (bug#12615). + 2012-10-11 Kenichi Handa * international/eucjp-ms.el: Re-generated. @@ -10,8 +15,8 @@ 2012-10-10 Martin Rudalics * window.el (switch-to-buffer-preserve-window-point): New option. - (switch-to-buffer): Obey - `switch-to-buffer-preserve-window-point' (Bug#4041). + (switch-to-buffer): + Obey `switch-to-buffer-preserve-window-point' (Bug#4041). 2012-10-09 Stefan Monnier === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2012-10-07 22:31:58 +0000 +++ lisp/international/mule-cmds.el 2012-10-11 20:05:47 +0000 @@ -2945,13 +2945,14 @@ This function also accepts a hexadecimal number of Unicode code point or a number in hash notation, e.g. #o21430 for octal, #x2318 for hex, or #10r8984 for decimal." - (let* ((completion-ignore-case t) - (input (completing-read - prompt - (lambda (string pred action) - (if (eq action 'metadata) - '(metadata (category . unicode-name)) - (complete-with-action action (ucs-names) string pred)))))) + (let ((input + (completing-read + prompt + (lambda (string pred action) + (let ((completion-ignore-case t)) + (if (eq action 'metadata) + '(metadata (category . unicode-name)) + (complete-with-action action (ucs-names) string pred))))))) (cond ((string-match-p "\\`[0-9a-fA-F]+\\'" input) (string-to-number input 16)) ------------------------------------------------------------ revno: 110508 committer: Paul Eggert branch nick: trunk timestamp: Thu 2012-10-11 09:23:37 -0700 message: lread.c, macros.c, marker.c, menu.c, minibuf.c: Use bool for booleans. * lread.c (load_each_byte, new_backquote_flag, readchar) (read_filtered_event, lisp_file_lexically_bound_p) (safe_to_load_version, Fload, complete_filename_p, openp) (build_load_history, readevalloop, read_escape, read1) (string_to_number, read_vector, read_list): * macros.c (Fstart_kbd_macro): * marker.c (CONSIDER): * menu.c (parse_single_submenu, digest_single_submenu) (find_and_return_menu_selection, Fx_popup_menu): * minibuf.c (read_minibuf_noninteractive, read_minibuf) (Ftry_completion): * nsmenu.m (ns_update_menubar, runMenuAt:forFrame:keymaps:): (ns_menu_show): * xmenu.c (set_frame_menubar, create_and_show_popup_menu) (xmenu_show, xdialog_show): Use bool for booleans. * lread.c (safe_to_load_version): Rename from safe_to_load_p, as it's not a predicate. All uses changed. Omit unnecessary buffer termination. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-11 13:23:12 +0000 +++ src/ChangeLog 2012-10-11 16:23:37 +0000 @@ -1,3 +1,26 @@ +2012-10-11 Paul Eggert + + lread.c, macros.c, marker.c, menu.c, minibuf.c: Use bool for booleans. + * lread.c (load_each_byte, new_backquote_flag, readchar) + (read_filtered_event, lisp_file_lexically_bound_p) + (safe_to_load_version, Fload, complete_filename_p, openp) + (build_load_history, readevalloop, read_escape, read1) + (string_to_number, read_vector, read_list): + * macros.c (Fstart_kbd_macro): + * marker.c (CONSIDER): + * menu.c (parse_single_submenu, digest_single_submenu) + (find_and_return_menu_selection, Fx_popup_menu): + * minibuf.c (read_minibuf_noninteractive, read_minibuf) + (Ftry_completion): + * nsmenu.m (ns_update_menubar, runMenuAt:forFrame:keymaps:): + (ns_menu_show): + * xmenu.c (set_frame_menubar, create_and_show_popup_menu) + (xmenu_show, xdialog_show): + Use bool for booleans. + * lread.c (safe_to_load_version): Rename from safe_to_load_p, + as it's not a predicate. All uses changed. Omit unnecessary + buffer termination. + 2012-10-11 Dmitry Antipov * editfns.c (save_excursion_save): Use nil if mark points to nowhere. === modified file 'src/lisp.h' --- src/lisp.h 2012-10-10 20:09:47 +0000 +++ src/lisp.h 2012-10-11 16:23:37 +0000 @@ -3027,7 +3027,7 @@ } while (0) extern int openp (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object *, Lisp_Object); -Lisp_Object string_to_number (char const *, int, int); +extern Lisp_Object string_to_number (char const *, int, bool); extern void map_obarray (Lisp_Object, void (*) (Lisp_Object, Lisp_Object), Lisp_Object); extern void dir_warning (const char *, Lisp_Object); === modified file 'src/lread.c' --- src/lread.c 2012-10-05 05:57:24 +0000 +++ src/lread.c 2012-10-11 16:23:37 +0000 @@ -95,10 +95,10 @@ It must be set to nil before all top-level calls to read0. */ static Lisp_Object read_objects; -/* Nonzero means READCHAR should read bytes one by one (not character) +/* True means READCHAR should read bytes one by one (not character) when READCHARFUN is Qget_file_char or Qget_emacs_mule_file_char. - This is set to 1 by read1 temporarily while handling #@NUMBER. */ -static int load_each_byte; + This is set by read1 temporarily while handling #@NUMBER. */ +static bool load_each_byte; /* List of descriptors now open for Fload. */ static Lisp_Object load_descriptor_list; @@ -135,11 +135,11 @@ /* This is the file position that string came from. */ static file_offset prev_saved_doc_string_position; -/* Nonzero means inside a new-style backquote +/* True means inside a new-style backquote with no surrounding parentheses. - Fread initializes this to zero, so we need not specbind it + Fread initializes this to false, so we need not specbind it or worry about what happens to it when there is an error. */ -static int new_backquote_flag; +static bool new_backquote_flag; static Lisp_Object Qold_style_backquotes; /* A list of file names for files being loaded in Fload. Used to @@ -150,7 +150,7 @@ static int read_emacs_mule_char (int, int (*) (int, Lisp_Object), Lisp_Object); -static void readevalloop (Lisp_Object, FILE*, Lisp_Object, int, +static void readevalloop (Lisp_Object, FILE *, Lisp_Object, bool, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); static Lisp_Object load_unwind (Lisp_Object); @@ -192,7 +192,7 @@ int (*readbyte) (int, Lisp_Object); unsigned char buf[MAX_MULTIBYTE_LENGTH]; int i, len; - int emacs_mule_encoding = 0; + bool emacs_mule_encoding = 0; if (multibyte) *multibyte = 0; @@ -546,10 +546,10 @@ static Lisp_Object read_internal_start (Lisp_Object, Lisp_Object, Lisp_Object); static Lisp_Object read0 (Lisp_Object); -static Lisp_Object read1 (Lisp_Object, int *, int); +static Lisp_Object read1 (Lisp_Object, int *, bool); -static Lisp_Object read_list (int, Lisp_Object); -static Lisp_Object read_vector (Lisp_Object, int); +static Lisp_Object read_list (bool, Lisp_Object); +static Lisp_Object read_vector (Lisp_Object, bool); static Lisp_Object substitute_object_recurse (Lisp_Object, Lisp_Object, Lisp_Object); @@ -562,28 +562,28 @@ /* Read input events until we get one that's acceptable for our purposes. - If NO_SWITCH_FRAME is non-zero, switch-frame events are stashed + If NO_SWITCH_FRAME, switch-frame events are stashed until we get a character we like, and then stuffed into unread_switch_frame. - If ASCII_REQUIRED is non-zero, we check function key events to see + If ASCII_REQUIRED, check function key events to see if the unmodified version of the symbol has a Qascii_character property, and use that character, if present. - If ERROR_NONASCII is non-zero, we signal an error if the input we - get isn't an ASCII character with modifiers. If it's zero but - ASCII_REQUIRED is non-zero, we just re-read until we get an ASCII + If ERROR_NONASCII, signal an error if the input we + get isn't an ASCII character with modifiers. If it's false but + ASCII_REQUIRED is true, just re-read until we get an ASCII character. - If INPUT_METHOD is nonzero, we invoke the current input method + If INPUT_METHOD, invoke the current input method if the character warrants that. - If SECONDS is a number, we wait that many seconds for input, and + If SECONDS is a number, wait that many seconds for input, and return Qnil if no input arrives within that time. */ static Lisp_Object -read_filtered_event (int no_switch_frame, int ascii_required, - int error_nonascii, int input_method, Lisp_Object seconds) +read_filtered_event (bool no_switch_frame, bool ascii_required, + bool error_nonascii, bool input_method, Lisp_Object seconds) { Lisp_Object val, delayed_switch_frame; EMACS_TIME end_time; @@ -767,7 +767,7 @@ positioned following the first line, if it is a comment or #! line, otherwise nothing is read. */ -static int +static bool lisp_file_lexically_bound_p (Lisp_Object readcharfun) { int ch = READCHAR; @@ -797,11 +797,11 @@ else /* Look for an appropriate file-variable in the first line. */ { - int rv = 0; + bool rv = 0; enum { NOMINAL, AFTER_FIRST_DASH, AFTER_ASTERIX, } beg_end_state = NOMINAL; - int in_file_vars = 0; + bool in_file_vars = 0; #define UPDATE_BEG_END_STATE(ch) \ if (beg_end_state == NOMINAL) \ @@ -897,20 +897,17 @@ because of an incompatible change in the byte compiler. */ static int -safe_to_load_p (int fd) +safe_to_load_version (int fd) { char buf[512]; int nbytes, i; - int safe_p = 1; int version = 1; /* Read the first few bytes from the file, and look for a line specifying the byte compiler version used. */ - nbytes = emacs_read (fd, buf, sizeof buf - 1); + nbytes = emacs_read (fd, buf, sizeof buf); if (nbytes > 0) { - buf[nbytes] = '\0'; - /* Skip to the next newline, skipping over the initial `ELC' with NUL bytes following it, but note the version. */ for (i = 0; i < nbytes && buf[i] != '\n'; ++i) @@ -920,13 +917,11 @@ if (i >= nbytes || fast_c_string_match_ignore_case (Vbytecomp_version_regexp, buf + i, nbytes - i) < 0) - safe_p = 0; + version = 0; } - if (safe_p) - safe_p = version; lseek (fd, 0, SEEK_SET); - return safe_p; + return version; } @@ -1030,12 +1025,12 @@ ptrdiff_t count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3; Lisp_Object found, efound, hist_file_name; - /* 1 means we printed the ".el is newer" message. */ - int newer = 0; - /* 1 means we are loading a compiled file. */ - int compiled = 0; + /* True means we printed the ".el is newer" message. */ + bool newer = 0; + /* True means we are loading a compiled file. */ + bool compiled = 0; Lisp_Object handler; - int safe_p = 1; + bool safe_p = 1; const char *fmode = "r"; Lisp_Object tmp[2]; int version; @@ -1190,7 +1185,7 @@ record_unwind_protect (load_warn_old_style_backquotes, file); if (!memcmp (SDATA (found) + SBYTES (found) - 4, ".elc", 4) - || (fd >= 0 && (version = safe_to_load_p (fd)) > 0)) + || (fd >= 0 && (version = safe_to_load_version (fd)) > 0)) /* Load .elc files directly, but not when they are remote and have no handler! */ { @@ -1202,7 +1197,7 @@ GCPRO3 (file, found, hist_file_name); if (version < 0 - && ! (version = safe_to_load_p (fd))) + && ! (version = safe_to_load_version (fd))) { safe_p = 0; if (!load_dangerous_libraries) @@ -1394,10 +1389,10 @@ #endif } -static int +static bool complete_filename_p (Lisp_Object pathname) { - register const unsigned char *s = SDATA (pathname); + const unsigned char *s = SDATA (pathname); return (IS_DIRECTORY_SEP (s[0]) || (SCHARS (pathname) > 2 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))); @@ -1447,11 +1442,11 @@ int openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *storeptr, Lisp_Object predicate) { - register int fd; + int fd; ptrdiff_t fn_size = 100; char buf[100]; - register char *fn = buf; - int absolute = 0; + char *fn = buf; + bool absolute = 0; ptrdiff_t want_length; Lisp_Object filename; struct stat st; @@ -1503,7 +1498,7 @@ { ptrdiff_t fnlen, lsuffix = SBYTES (XCAR (tail)); Lisp_Object handler; - int exists; + bool exists; /* Concatenate path element/specified name with the suffix. If the directory starts with /:, remove that. */ @@ -1588,14 +1583,16 @@ the source has an associated file name or not. FILENAME is the file name that we are loading from. - ENTIRE is 1 if loading that entire file, 0 if evaluating part of it. */ + + ENTIRE is true if loading that entire file, false if evaluating + part of it. */ static void -build_load_history (Lisp_Object filename, int entire) +build_load_history (Lisp_Object filename, bool entire) { - register Lisp_Object tail, prev, newelt; - register Lisp_Object tem, tem2; - register int foundit = 0; + Lisp_Object tail, prev, newelt; + Lisp_Object tem, tem2; + bool foundit = 0; tail = Vload_history; prev = Qnil; @@ -1680,7 +1677,7 @@ readevalloop (Lisp_Object readcharfun, FILE *stream, Lisp_Object sourcename, - int printflag, + bool printflag, Lisp_Object unibyte, Lisp_Object readfun, Lisp_Object start, Lisp_Object end) { @@ -1689,12 +1686,12 @@ ptrdiff_t count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct buffer *b = 0; - int continue_reading_p; + bool continue_reading_p; Lisp_Object lex_bound; - /* Nonzero if reading an entire buffer. */ - int whole_buffer = 0; - /* 1 on the first time around. */ - int first_sexp = 1; + /* True if reading an entire buffer. */ + bool whole_buffer = 0; + /* True on the first time around. */ + bool first_sexp = 1; Lisp_Object macroexpand = intern ("internal-macroexpand-for-load"); if (NILP (Ffboundp (macroexpand)) @@ -2072,9 +2069,9 @@ If the escape sequence forces unibyte, return eight-bit char. */ static int -read_escape (Lisp_Object readcharfun, int stringp) +read_escape (Lisp_Object readcharfun, bool stringp) { - register int c = READCHAR; + int c = READCHAR; /* \u allows up to four hex digits, \U up to eight. Default to the behavior for \u, and change this value in the case that \U is seen. */ int unicode_hex_count = 4; @@ -2375,10 +2372,10 @@ in *PCH and the return value is not interesting. Else, we store zero in *PCH and we read and return one lisp object. - FIRST_IN_LIST is nonzero if this is the first element of a list. */ + FIRST_IN_LIST is true if this is the first element of a list. */ static Lisp_Object -read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) +read1 (Lisp_Object readcharfun, int *pch, bool first_in_list) { int c; bool uninterned_symbol = 0; @@ -2803,10 +2800,11 @@ else { Lisp_Object value; + bool saved_new_backquote_flag = new_backquote_flag; - new_backquote_flag++; + new_backquote_flag = 1; value = read0 (readcharfun); - new_backquote_flag--; + new_backquote_flag = saved_new_backquote_flag; return Fcons (Qbackquote, Fcons (value, Qnil)); } @@ -2858,7 +2856,7 @@ { int modifiers; int next_char; - int ok; + bool ok; c = READCHAR; if (c < 0) @@ -2894,14 +2892,14 @@ { char *p = read_buffer; char *end = read_buffer + read_buffer_size; - register int ch; - /* Nonzero if we saw an escape sequence specifying + int ch; + /* True if we saw an escape sequence specifying a multibyte character. */ - int force_multibyte = 0; - /* Nonzero if we saw an escape sequence specifying + bool force_multibyte = 0; + /* True if we saw an escape sequence specifying a single-byte character. */ - int force_singlebyte = 0; - int cancel = 0; + bool force_singlebyte = 0; + bool cancel = 0; ptrdiff_t nchars = 0; while ((ch = READCHAR) >= 0 @@ -3033,7 +3031,7 @@ read_symbol: { char *p = read_buffer; - int quoted = 0; + bool quoted = 0; EMACS_INT start_position = readchar_count - 1; { @@ -3250,17 +3248,17 @@ /* Convert STRING to a number, assuming base BASE. Return a fixnum if CP has integer syntax and fits in a fixnum, else return the nearest float if CP has either floating point or integer syntax and BASE is 10, else return nil. If - IGNORE_TRAILING is nonzero, consider just the longest prefix of CP that has + IGNORE_TRAILING, consider just the longest prefix of CP that has valid floating point syntax. Signal an overflow if BASE is not 10 and the number has integer syntax but does not fit. */ Lisp_Object -string_to_number (char const *string, int base, int ignore_trailing) +string_to_number (char const *string, int base, bool ignore_trailing) { int state; char const *cp = string; int leading_digit; - int float_syntax = 0; + bool float_syntax = 0; double value = 0; /* Compute NaN and infinities using a variable, to cope with compilers that @@ -3270,9 +3268,9 @@ /* Negate the value ourselves. This treats 0, NaNs, and infinity properly on IEEE floating point hosts, and works around a formerly-common bug where atof ("-0.0") drops the sign. */ - int negative = *cp == '-'; + bool negative = *cp == '-'; - int signedp = negative || *cp == '+'; + bool signedp = negative || *cp == '+'; cp += signedp; state = 0; @@ -3365,7 +3363,7 @@ uintmax_t n; /* Fast special case for single-digit integers. This also avoids a - glitch when BASE is 16 and IGNORE_TRAILING is nonzero, because in that + glitch when BASE is 16 and IGNORE_TRAILING, because in that case some versions of strtoumax accept numbers like "0x1" that Emacs does not allow. */ if (digit_to_number (string[signedp + 1], base) < 0) @@ -3401,12 +3399,12 @@ static Lisp_Object -read_vector (Lisp_Object readcharfun, int bytecodeflag) +read_vector (Lisp_Object readcharfun, bool bytecodeflag) { ptrdiff_t i, size; - register Lisp_Object *ptr; - register Lisp_Object tem, item, vector; - register struct Lisp_Cons *otem; + Lisp_Object *ptr; + Lisp_Object tem, item, vector; + struct Lisp_Cons *otem; Lisp_Object len; tem = read_list (1, readcharfun); @@ -3478,13 +3476,13 @@ return vector; } -/* FLAG = 1 means check for ] to terminate rather than ) and . */ +/* FLAG means check for ] to terminate rather than ) and . */ static Lisp_Object -read_list (int flag, register Lisp_Object readcharfun) +read_list (bool flag, Lisp_Object readcharfun) { Lisp_Object val, tail; - register Lisp_Object elt, tem; + Lisp_Object elt, tem; struct gcpro gcpro1, gcpro2; /* 0 is the normal case. 1 means this list is a doc reference; replace it with the number 0. @@ -3492,7 +3490,7 @@ int doc_reference = 0; /* Initialize this to 1 if we are reading a list. */ - int first_in_list = flag <= 0; + bool first_in_list = flag <= 0; val = Qnil; tail = Qnil; === modified file 'src/macros.c' --- src/macros.c 2012-09-15 07:06:56 +0000 +++ src/macros.c 2012-10-11 16:23:37 +0000 @@ -84,7 +84,7 @@ { ptrdiff_t i; EMACS_INT len; - int cvt; + bool cvt; /* Check the type of last-kbd-macro in case Lisp code changed it. */ CHECK_VECTOR_OR_STRING (KVAR (current_kboard, Vlast_kbd_macro)); === modified file 'src/marker.c' --- src/marker.c 2012-10-11 04:33:12 +0000 +++ src/marker.c 2012-10-11 16:23:37 +0000 @@ -91,7 +91,7 @@ #define CONSIDER(CHARPOS, BYTEPOS) \ { \ ptrdiff_t this_charpos = (CHARPOS); \ - int changed = 0; \ + bool changed = 0; \ \ if (this_charpos == charpos) \ { \ @@ -190,7 +190,7 @@ if (charpos - best_below < best_above - charpos) { - int record = charpos - best_below > 5000; + bool record = charpos - best_below > 5000; while (best_below != charpos) { @@ -215,7 +215,7 @@ } else { - int record = best_above - charpos > 5000; + bool record = best_above - charpos > 5000; while (best_above != charpos) { @@ -335,7 +335,7 @@ if (bytepos - best_below_byte < best_above_byte - bytepos) { - int record = bytepos - best_below_byte > 5000; + bool record = bytepos - best_below_byte > 5000; while (best_below_byte < bytepos) { @@ -362,7 +362,7 @@ } else { - int record = best_above_byte - bytepos > 5000; + bool record = best_above_byte - bytepos > 5000; while (best_above_byte > bytepos) { @@ -479,10 +479,10 @@ static Lisp_Object set_marker_internal (Lisp_Object marker, Lisp_Object position, - Lisp_Object buffer, int restricted) + Lisp_Object buffer, bool restricted) { - register struct Lisp_Marker *m; - register struct buffer *b = live_buffer (buffer); + struct Lisp_Marker *m; + struct buffer *b = live_buffer (buffer); CHECK_MARKER (marker); m = XMARKER (marker); === modified file 'src/menu.c' --- src/menu.c 2012-10-10 20:09:47 +0000 +++ src/menu.c 2012-10-11 16:23:37 +0000 @@ -519,14 +519,15 @@ /* Set up data in menu_items for a menu bar item whose event type is ITEM_KEY (with string ITEM_NAME) and whose contents come from the list of keymaps MAPS. */ -int -parse_single_submenu (Lisp_Object item_key, Lisp_Object item_name, Lisp_Object maps) +bool +parse_single_submenu (Lisp_Object item_key, Lisp_Object item_name, + Lisp_Object maps) { Lisp_Object length; EMACS_INT len; Lisp_Object *mapvec; ptrdiff_t i; - int top_level_items = 0; + bool top_level_items = 0; USE_SAFE_ALLOCA; length = Flength (maps); @@ -616,13 +617,13 @@ in menu_items starting at index START, up to index END. */ widget_value * -digest_single_submenu (int start, int end, int top_level_items) +digest_single_submenu (int start, int end, bool top_level_items) { widget_value *wv, *prev_wv, *save_wv, *first_wv; int i; int submenu_depth = 0; widget_value **submenu_stack; - int panes_seen = 0; + bool panes_seen = 0; submenu_stack = alloca (menu_items_used * sizeof *submenu_stack); wv = xmalloc_widget_value (); @@ -668,7 +669,7 @@ Lisp_Object pane_name; const char *pane_string; - panes_seen++; + panes_seen = 1; pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); @@ -735,7 +736,7 @@ Lisp_Object help; /* All items should be contained in panes. */ - if (panes_seen == 0) + if (! panes_seen) emacs_abort (); item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME); @@ -957,9 +958,9 @@ #ifdef HAVE_NS /* As above, but return the menu selection instead of storing in kb buffer. - If keymaps==1, return full prefixes to selection. */ + If KEYMAPS, return full prefixes to selection. */ Lisp_Object -find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data) +find_and_return_menu_selection (FRAME_PTR f, bool keymaps, void *client_data) { Lisp_Object prefix, entry; int i; @@ -999,7 +1000,7 @@ = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE); if (aref_addr (menu_items, i) == client_data) { - if (keymaps != 0) + if (keymaps) { int j; @@ -1071,8 +1072,8 @@ Lisp_Object selection = Qnil; FRAME_PTR f = NULL; Lisp_Object x, y, window; - int keymaps = 0; - int for_click = 0; + bool keymaps = 0; + bool for_click = 0; ptrdiff_t specpdl_count = SPECPDL_INDEX (); struct gcpro gcpro1; @@ -1083,7 +1084,7 @@ #ifdef HAVE_MENUS { - int get_current_pos_p = 0; + bool get_current_pos_p = 0; /* FIXME!! check_w32 (); or check_x (); or check_ns (); */ /* Decode the first argument: find the window and the coordinates. */ === modified file 'src/menu.h' --- src/menu.h 2012-07-09 16:38:45 +0000 +++ src/menu.h 2012-10-11 16:23:37 +0000 @@ -29,7 +29,7 @@ extern void finish_menu_items (void) ATTRIBUTE_CONST; extern void discard_menu_items (void); extern void save_menu_items (void); -extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); +extern bool parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); extern void list_of_panes (Lisp_Object); #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) \ || defined (HAVE_NS) @@ -38,7 +38,7 @@ extern void find_and_call_menu_selection (FRAME_PTR, int, Lisp_Object, void *); extern widget_value *xmalloc_widget_value (void); -extern widget_value *digest_single_submenu (int, int, int); +extern widget_value *digest_single_submenu (int, int, bool); #endif #ifdef HAVE_X_WINDOWS @@ -47,8 +47,8 @@ extern Lisp_Object w32_menu_show (FRAME_PTR, int, int, int, int, Lisp_Object, const char **); -extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, int, int, +extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, bool, bool, Lisp_Object, const char **); -extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int, +extern Lisp_Object xmenu_show (FRAME_PTR, int, int, bool, bool, Lisp_Object, const char **, Time); #endif /* MENU_H */ === modified file 'src/minibuf.c' --- src/minibuf.c 2012-10-05 07:38:05 +0000 +++ src/minibuf.c 2012-10-11 16:23:37 +0000 @@ -173,17 +173,6 @@ static Lisp_Object read_minibuf_unwind (Lisp_Object); static Lisp_Object run_exit_minibuf_hook (Lisp_Object); -static Lisp_Object read_minibuf (Lisp_Object, Lisp_Object, - Lisp_Object, - int, Lisp_Object, - Lisp_Object, Lisp_Object, - int, int); -static Lisp_Object read_minibuf_noninteractive (Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, - int, Lisp_Object, - Lisp_Object, Lisp_Object, - int, int); -static Lisp_Object string_to_object (Lisp_Object, Lisp_Object); /* Read a Lisp object from VAL and return it. If VAL is an empty @@ -233,10 +222,10 @@ static Lisp_Object read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, Lisp_Object backup_n, - int expflag, + bool expflag, Lisp_Object histvar, Lisp_Object histpos, Lisp_Object defalt, - int allow_props, int inherit_input_method) + bool allow_props, bool inherit_input_method) { ptrdiff_t size, len; char *line; @@ -376,23 +365,23 @@ beginning of INITIAL if N <= 0. Normally return the result as a string (the text that was read), - but if EXPFLAG is nonzero, read it and return the object read. + but if EXPFLAG, read it and return the object read. If HISTVAR is given, save the value read on that history only if it doesn't match the front of that history list exactly. The value is pushed onto the list as the string that was read. DEFALT specifies the default value for the sake of history commands. - If ALLOW_PROPS is nonzero, we do not throw away text properties. + If ALLOW_PROPS, do not throw away text properties. - if INHERIT_INPUT_METHOD is nonzero, the minibuffer inherits the + if INHERIT_INPUT_METHOD, the minibuffer inherits the current input method. */ static Lisp_Object read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, - int expflag, + bool expflag, Lisp_Object histvar, Lisp_Object histpos, Lisp_Object defalt, - int allow_props, int inherit_input_method) + bool allow_props, bool inherit_input_method) { Lisp_Object val; ptrdiff_t count = SPECPDL_INDEX (); @@ -1447,7 +1436,7 @@ if (bestmatchsize != SCHARS (eltstring) || bestmatchsize != matchsize) /* Don't count the same string multiple times. */ - matchcount++; + matchcount += matchcount <= 1; bestmatchsize = matchsize; if (matchsize <= SCHARS (string) /* If completion-ignore-case is non-nil, don't === modified file 'src/nsmenu.m' --- src/nsmenu.m 2012-10-11 00:26:58 +0000 +++ src/nsmenu.m 2012-10-11 16:23:37 +0000 @@ -181,7 +181,8 @@ /* Fully parse one or more of the submenus. */ int n = 0; int *submenu_start, *submenu_end; - int *submenu_top_level_items, *submenu_n_panes; + bool *submenu_top_level_items; + int *submenu_n_panes; struct buffer *prev = current_buffer; Lisp_Object buffer; ptrdiff_t specpdl_count = SPECPDL_INDEX (); @@ -740,7 +741,7 @@ /* run a menu in popup mode */ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f - keymaps: (int)keymaps + keymaps: (bool)keymaps { EmacsView *view = FRAME_NS_VIEW (f); NSEvent *e, *event; @@ -779,7 +780,7 @@ ========================================================================== */ Lisp_Object -ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, +ns_menu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps, Lisp_Object title, const char **error) { EmacsMenu *pmenu; @@ -801,7 +802,7 @@ #if 0 /* FIXME: a couple of one-line differences prevent reuse */ - wv = digest_single_submenu (0, menu_items_used, Qnil); + wv = digest_single_submenu (0, menu_items_used, 0); #else { widget_value *save_wv = 0, *prev_wv = 0; === modified file 'src/nsterm.h' --- src/nsterm.h 2012-10-07 10:07:23 +0000 +++ src/nsterm.h 2012-10-11 16:23:37 +0000 @@ -161,7 +161,7 @@ - (EmacsMenu *)addSubmenuWithTitle: (const char *)title forFrame: (struct frame *)f; - (void) clear; - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f - keymaps: (int)keymaps; + keymaps: (bool)keymaps; @end @@ -792,7 +792,7 @@ extern void find_and_call_menu_selection (FRAME_PTR f, int menu_bar_items_used, Lisp_Object vector, void *client_data); extern Lisp_Object find_and_return_menu_selection (FRAME_PTR f, - int keymaps, + bool keymaps, void *client_data); extern Lisp_Object ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header); === modified file 'src/xmenu.c' --- src/xmenu.c 2012-09-23 19:36:31 +0000 +++ src/xmenu.c 2012-10-11 16:23:37 +0000 @@ -111,7 +111,7 @@ static Lisp_Object Qdebug_on_next_call; #if defined (USE_X_TOOLKIT) || defined (USE_GTK) -static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, +static Lisp_Object xdialog_show (FRAME_PTR, bool, Lisp_Object, Lisp_Object, const char **); #endif @@ -930,7 +930,8 @@ widget_value *wv, *first_wv, *prev_wv = 0; int i; int *submenu_start, *submenu_end; - int *submenu_top_level_items, *submenu_n_panes; + bool *submenu_top_level_items; + int *submenu_n_panes; if (! FRAME_X_P (f)) emacs_abort (); @@ -1346,8 +1347,8 @@ /* F is the frame the menu is for. X and Y are the frame-relative specified position, relative to the inside upper left corner of the frame F. - FOR_CLICK is nonzero if this menu was invoked for a mouse click. - KEYMAPS is 1 if this menu was specified with keymaps; + FOR_CLICK is true if this menu was invoked for a mouse click. + KEYMAPS is true if this menu was specified with keymaps; in that case, we return a list containing the chosen item's value and perhaps also the pane's prefix. TITLE is the specified menu title. @@ -1427,14 +1428,14 @@ menu_item_selection will be set to the selection. */ static void create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, - int for_click, Time timestamp) + bool for_click, Time timestamp) { int i; GtkWidget *menu; GtkMenuPositionFunc pos_func = 0; /* Pop up at pointer. */ struct next_popup_x_y popup_x_y; ptrdiff_t specpdl_count = SPECPDL_INDEX (); - int use_pos_func = ! for_click; + bool use_pos_func = ! for_click; #ifdef HAVE_GTK3 /* Always use position function for Gtk3. Otherwise menus may become @@ -1539,7 +1540,7 @@ menu_item_selection will be set to the selection. */ static void create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, - int x, int y, int for_click, Time timestamp) + int x, int y, bool for_click, Time timestamp) { int i; Arg av[2]; @@ -1623,7 +1624,7 @@ } Lisp_Object -xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, +xmenu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps, Lisp_Object title, const char **error_name, Time timestamp) { int i; @@ -1878,7 +1879,7 @@ = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE); if (menu_item_selection == aref_addr (menu_items, i)) { - if (keymaps != 0) + if (keymaps) { int j; @@ -2011,7 +2012,7 @@ static Lisp_Object xdialog_show (FRAME_PTR f, - int keymaps, + bool keymaps, Lisp_Object title, Lisp_Object header, const char **error_name) @@ -2277,7 +2278,7 @@ Lisp_Object -xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, +xmenu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps, Lisp_Object title, const char **error_name, Time timestamp) { Window root; @@ -2528,7 +2529,7 @@ { entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE); - if (keymaps != 0) + if (keymaps) { entry = Fcons (entry, Qnil); if (!NILP (pane_prefix)) ------------------------------------------------------------ revno: 110507 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2012-10-11 17:23:12 +0400 message: * editfns.c (save_excursion_save): Use nil if mark points to nowhere. (save_excursion_restore): Do not restore mark if it was not saved. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-11 04:33:12 +0000 +++ src/ChangeLog 2012-10-11 13:23:12 +0000 @@ -1,3 +1,8 @@ +2012-10-11 Dmitry Antipov + + * editfns.c (save_excursion_save): Use nil if mark points to nowhere. + (save_excursion_restore): Do not restore mark if it was not saved. + 2012-10-11 Paul Eggert * marker.c (cached_modiff): EMACS_INT, not int. === modified file 'src/editfns.c' --- src/editfns.c 2012-09-23 08:44:20 +0000 +++ src/editfns.c 2012-10-11 13:23:12 +0000 @@ -819,9 +819,13 @@ { bool visible = (XBUFFER (XWINDOW (selected_window)->buffer) == current_buffer); + /* Do not copy the mark if it points to nowhere. */ + Lisp_Object mark = (XMARKER (BVAR (current_buffer, mark))->buffer + ? Fcopy_marker (BVAR (current_buffer, mark), Qnil) + : Qnil); return Fcons (Fpoint_marker (), - Fcons (Fcopy_marker (BVAR (current_buffer, mark), Qnil), + Fcons (mark, Fcons (visible ? Qt : Qnil, Fcons (BVAR (current_buffer, mark_active), selected_window)))); @@ -856,9 +860,14 @@ info = XCDR (info); tem = XCAR (info); omark = Fmarker_position (BVAR (current_buffer, mark)); - Fset_marker (BVAR (current_buffer, mark), tem, Fcurrent_buffer ()); - nmark = Fmarker_position (tem); - unchain_marker (XMARKER (tem)); + if (NILP (tem)) + unchain_marker (XMARKER (BVAR (current_buffer, mark))); + else + { + Fset_marker (BVAR (current_buffer, mark), tem, Fcurrent_buffer ()); + nmark = Fmarker_position (tem); + unchain_marker (XMARKER (tem)); + } /* visible */ info = XCDR (info); ------------------------------------------------------------ revno: 110506 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2012-10-11 20:30:17 +0900 message: Re-generate charsets. Adjust for the change of admin/charset/mapfiles/*.gz diff: === modified file '.bzrignore' --- .bzrignore 2012-09-17 07:22:17 +0000 +++ .bzrignore 2012-10-11 11:26:26 +0000 @@ -159,3 +159,7 @@ lisp/mh-e/mh-autoloads.el lisp/mh-e/mh-cus-load.el lib/stdalign.h +admin/charsets/*.map +admin/charsets/cp51932.el +admin/charsets/eucjp-ms.el +admin/charsets/jisx2131-filter === modified file 'ChangeLog' --- ChangeLog 2012-10-08 07:58:40 +0000 +++ ChangeLog 2012-10-11 11:29:47 +0000 @@ -1,3 +1,7 @@ +2012-10-11 Kenichi Handa + + * .bzrignore: Add several files under admin/charsets. + 2012-10-08 Daniel Colascione * configure.ac: Add --with-w32 as a window system option. Limit === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-10-09 07:00:23 +0000 +++ admin/ChangeLog 2012-10-11 11:29:47 +0000 @@ -1,3 +1,27 @@ +2012-10-11 Kenichi Handa + + * charsets/mapconv: Adjusted for the change of mapfiles/*.gz to + mapfiles/*. + + * charsets/gb180302.awk: Handle 4-byte sequences in the input file. + + * charsets/Makefile: Be sure to call mapconv script of the current + directory. Adjusted for the change of mapfiles/*.gz to + mapfiles/*. + (SED_SCRIPT): New variable. + (jisx2131-filter): New target. + (JISX2131.map): Use jisx2131-filter to filter out characters added + for the 2004 year version. + (clear): Remove ${SED_SCRIPT} too. + + * charsets/mapfiles/MULE-ethiopic.map, + charsets/mapfiles/MULE-ipa.map, + charsets/mapfiles/MULE-is13194.map, + charsets/mapfiles/MULE-lviscii.map, + charsets/mapfiles/MULE-sisheng.map, + charsets/mapfiles/MULE-tibetan.map, + charsets/mapfiles/MULE-uviscii.map: Fix typo. + 2012-10-09 Glenn Morris * admin.el (cusver-scan-cus-start): New function. === modified file 'admin/charsets/Makefile' --- admin/charsets/Makefile 2011-01-15 23:16:57 +0000 +++ admin/charsets/Makefile 2012-10-11 11:26:26 +0000 @@ -77,6 +77,7 @@ MULE-lviscii.map MULE-uviscii.map TRANS_TABLE = cp51932.el eucjp-ms.el +SED_SCRIPT = jisx2131-filter all: ${CHARSETS} ${TRANS_TABLE} @@ -86,11 +87,11 @@ VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[0-9a-f].[ ]/' GLIBC-1 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[0-9a-f].[ ]/' GLIBC-1 compact.awk > $@ VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[2-7a-f].[ ]/' GLIBC-1 compact.awk \ + @./mapconv $< '/^<.*[ ]\/x[2-7a-f].[ ]/' GLIBC-1 compact.awk \ | sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@ ALTERNATIVNYJ.map: IBM866.map @@ -110,45 +111,45 @@ -e '/0xFA/ s/ .*/ 0x00B1/' \ -e '/0xFB/ s/ .*/ 0x00F7/' < $< >> $@ -MIK.map: mapfiles/bulgarian-mik.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '1,$$' CZYBORRA compact.awk > $@ - -PTCP154.map: mapfiles/PTCP154.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^0x/' IANA compact.awk > $@ - -stdenc.map: mapfiles/stdenc.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@ - -symbol.map: mapfiles/symbol.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@ - -CP720.map: mapfiles/CP720.map.gz - # Generating $@... - @zcat $< > $@ - -CP858.map: mapfiles/CP858.map.gz - # Generating $@... - @zcat $< > $@ +MIK.map: mapfiles/bulgarian-mik.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '1,$$' CZYBORRA compact.awk > $@ + +PTCP154.map: mapfiles/PTCP154 mapconv compact.awk + # Generating $@... + @./mapconv $< '/^0x/' IANA compact.awk > $@ + +stdenc.map: mapfiles/stdenc.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@ + +symbol.map: mapfiles/symbol.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@ + +CP720.map: mapfiles/CP720.map + # Generating $@... + @cp $< $@ + +CP858.map: mapfiles/CP858.map + # Generating $@... + @cp $< $@ CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@ GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@ GBK.map: ${GLIBC_CHARMAPS}/GBK.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@ GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz mapconv gb180302.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x..\/x..[ ]/' GLIBC-2 gb180302.awk > $@ + @./mapconv $< '/^<.*[ ]\/x..\/x..[ ]/' GLIBC-2 gb180302.awk > $@ GB180304.map: GB180302.map gb180304.awk # Generating $@... @@ -156,35 +157,39 @@ JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[0-9]/' GLIBC-1 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[0-9]/' GLIBC-1 compact.awk > $@ @echo "# Generated by hand" >> $@ @echo "0xA1-0xDF 0xFF61" >> $@ JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv # Generating $@... - @mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \ + @./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \ | sed 's/0x2015/0x2014/' > $@ JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@ - -JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv + @./mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@ + +jisx2131-filter: mapfiles/JISX213A.map + @sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@ + +JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv jisx2131-filter # Generating $@... - @mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \ + @./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \ + | sed -f jisx2131-filter \ | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@ JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv # Generating $@... - @mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@ + @./mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@ -JISX213A.map: mapfiles/JISX213A.map.gz +JISX213A.map: mapfiles/JISX213A.map # Generating $@ - @zcat $< > $@ + @cp $< $@ -CP932-2BYTE.map: mapfiles/CP932.TXT.gz mapconv cp932.awk +CP932-2BYTE.map: mapfiles/CP932.TXT mapconv cp932.awk # Generating $@... - @mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@ + @./mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@ cp51932.el: CP932-2BYTE.map cp51932.awk @$(AWK) -f cp51932.awk < CP932-2BYTE.map > $@ @@ -192,17 +197,17 @@ eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz eucjp-ms.awk @zcat $< | $(AWK) -f eucjp-ms.awk > $@ -JISC6226.map : mapfiles/Uni2JIS.gz mapconv kuten.awk +JISC6226.map : mapfiles/Uni2JIS mapconv kuten.awk # Generating $@... - @mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk > $@ + @./mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk > $@ KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@ BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2 > $@ + @./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2 > $@ BIG5-1.map: BIG5.map mapconv big5.awk # Generating $@... @@ -216,52 +221,52 @@ BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[89a-f].\//' GLIBC-2 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[89a-f].\//' GLIBC-2 compact.awk > $@ JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@ CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@ # CNS-1.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk # # Generating $@... -# @mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@ - -CNS-2.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@ - -CNS-3.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@ - -CNS-4.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@ - -CNS-5.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@ - -CNS-6.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@ - -CNS-7.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk - # Generating $@... - @mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@ +# @./mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@ + +CNS-2.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@ + +CNS-3.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@ + +CNS-4.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@ + +CNS-5.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@ + +CNS-6.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@ + +CNS-7.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk + # Generating $@... + @./mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@ CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@ + @./mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@ # General target to produce map files for mule charsets. -MULE-%.map: mapfiles/MULE-%.map.gz +MULE-%.map: mapfiles/MULE-%.map # Generating $@... - @zcat $< > $@ + @cp $< $@ # General target to produce map files for ISO-8859, GEORGIAN, and # EBCDIC charsets. We can not use the original file name because of @@ -269,21 +274,21 @@ 8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ # General target to produce map files for single-byte charsets. %.map: ${GLIBC_CHARMAPS}/%.gz mapconv compact.awk # Generating $@... - @mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ + @./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@ install: @for f in ${CHARSETS}; do \ @@ -305,5 +310,5 @@ # Clear files that are automatically generated. clean: - rm -f ${CHARSETS} ${TRANS_TABLE} + rm -f ${CHARSETS} ${TRANS_TABLE} ${SED_SCRIPT} === modified file 'admin/charsets/gb180302.awk' --- admin/charsets/gb180302.awk 2011-01-15 23:16:57 +0000 +++ admin/charsets/gb180302.awk 2012-10-11 11:26:26 +0000 @@ -74,19 +74,30 @@ { gb = gb_to_index(decode_hex(substr($1, 3, 4))); - unicode = decode_hex(substr($2, 3, 4)); + unicode = decode_hex(substr($2, 3)); if ((gb == to_gb + 1) && (unicode == to_unicode + 1)) { to_gb++; to_unicode++; } - else + else if (gb > to_gb) # ignore the case gb == to_gb that is a duplication { if (from_gb == to_gb) - printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode; + { + if (from_unicode <= 65535) + printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode; + else + printf "0x%04X 0x%08X\n", index_to_gb(from_gb), from_unicode; + } else if (from_gb < to_gb) - printf "0x%04X-0x%04X 0x%04X\n", - index_to_gb(from_gb), index_to_gb(to_gb), from_unicode; + { + if (from_unicode <= 65535) + printf "0x%04X-0x%04X 0x%04X\n", + index_to_gb(from_gb), index_to_gb(to_gb), from_unicode; + else + printf "0x%04X-0x%04X 0x%08X\n", + index_to_gb(from_gb), index_to_gb(to_gb), from_unicode; + } from_gb = to_gb = gb; from_unicode = to_unicode = unicode; } === modified file 'admin/charsets/mapconv' --- admin/charsets/mapconv 2011-01-15 23:16:57 +0000 +++ admin/charsets/mapconv 2012-10-11 11:26:26 +0000 @@ -98,18 +98,17 @@ | sed -e 's/xa/x2/g' -e 's/xb/x3/g' -e 's/xc/x4/g' \ -e 's/xd/x5/g' -e 's/xe/x6/g' -e 's/xf/x7/g' \ -e 's,]*\)>[ ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \ - | tee temp \ | sort | ${AWKPROG} elif [ "$3" = "CZYBORRA" ] ; then # Source format is: # =XX U+YYYY - zcat $1 | sed -n -e "$2 p" \ + sed -n -e "$2 p" < $1 \ | sed -e 's/=\(..\)[^U]*U+\([0-9A-F]*\).*/0x\1 0x\2/' \ | sort | ${AWKPROG} elif [ "$3" = "IANA" ] ; then # Source format is: # 0xXX 0xYYYY - zcat $1 | sed -n -e "$2 p" \ + sed -n -e "$2 p" < $1 \ | sed -e 's/\(0x[0-9A-Fa-f]*\)[^0]*\(0x[0-9A-Fa-f]*\).*/\1 \2/' \ | sort | ${AWKPROG} elif [ "$3" = "UNICODE" ] ; then @@ -117,25 +116,25 @@ # YYYY XX # We perform reverse sort to prefer the first one in the # duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0). - zcat $1 | sed -n -e "$2 p" \ + sed -n -e "$2 p" < $1 \ | sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \ | sort -r elif [ "$3" = "UNICODE2" ] ; then # Source format is: # 0xXXXX 0xYYYY # ... - zcat $1 | sed -n -e "$2 p" \ + sed -n -e "$2 p" < $1 \ | sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \ | ${AWKPROG} | sort -n -k 4,4 elif [ "$3" = "YASUOKA" ] ; then # Source format is: # YYYY 0-XXXX (XXXX is a Kuten code) - zcat $1 | sed -n -e "$2 p" \ + sed -n -e "$2 p" < $1 \ | sed -e 's/\([0-9A-F]*\)[^0]*0-\([0-9]*\).*/0x\2 0x\1/' \ | sort | ${AWKPROG} elif [ "$3" = "KANJI-DATABASE" ] ; then # Source format is: # C?-XXXX U+YYYYY ..... - zcat $1 | sed -n -e "$2 p" \ + sed -n -e "$2 p" < $1 \ | sed -e 's/...\(....\) U+\([0-9A-F]*\).*/0x\1 0x\2/' \ | sort | ${AWKPROG} else === modified file 'admin/charsets/mapfiles/MULE-ethiopic.map' --- admin/charsets/mapfiles/MULE-ethiopic.map 2011-08-12 16:24:44 +0000 +++ admin/charsets/mapfiles/MULE-ethiopic.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3. +# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3. 0x2121 0x1200 0x2122 0x1201 0x2123 0x1202 === modified file 'admin/charsets/mapfiles/MULE-ipa.map' --- admin/charsets/mapfiles/MULE-ipa.map 2011-08-12 16:24:44 +0000 +++ admin/charsets/mapfiles/MULE-ipa.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3. +# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3. 0x20 0x0069 0x21 0x026A 0x22 0x0065 === modified file 'admin/charsets/mapfiles/MULE-is13194.map' --- admin/charsets/mapfiles/MULE-is13194.map 2011-08-12 16:24:44 +0000 +++ admin/charsets/mapfiles/MULE-is13194.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3. +# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3. 0x21 0x0901 0x22 0x0902 0x23 0x0903 === modified file 'admin/charsets/mapfiles/MULE-lviscii.map' --- admin/charsets/mapfiles/MULE-lviscii.map 2011-08-12 16:24:44 +0000 +++ admin/charsets/mapfiles/MULE-lviscii.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3. +# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3. 0x21 0x1EAF 0x22 0x1EB1 0x23 0x1EB7 === modified file 'admin/charsets/mapfiles/MULE-sisheng.map' --- admin/charsets/mapfiles/MULE-sisheng.map 2011-08-12 16:24:44 +0000 +++ admin/charsets/mapfiles/MULE-sisheng.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3. +# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3. 0x21 0x0101 0x22 0x00E1 0x23 0x01CE === modified file 'admin/charsets/mapfiles/MULE-tibetan.map' --- admin/charsets/mapfiles/MULE-tibetan.map 2011-08-12 16:24:44 +0000 +++ admin/charsets/mapfiles/MULE-tibetan.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3. +# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3. 0x2130 0x0F00 0x2131 0x0F01 0x2132 0x0F02 === modified file 'admin/charsets/mapfiles/MULE-uviscii.map' --- admin/charsets/mapfiles/MULE-uviscii.map 2011-08-12 16:24:44 +0000 +++ admin/charsets/mapfiles/MULE-uviscii.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3. +# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3. 0x21 0x1EAE 0x22 0x1EB0 0x23 0x1EB6 === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-10-07 10:07:23 +0000 +++ etc/ChangeLog 2012-10-11 11:26:26 +0000 @@ -1,3 +1,12 @@ +2012-10-11 Kenichi Handa + + * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map, + charsets/CNS-5.map, charsets/CNS-6.map, charsets/CNS-7.map, + charsets/CP932-2BYTE.map, charsets/GB180302.map, + charsets/GB180304.map, charsets/JISC6226.map, + charsets/JISX2131.map, charsets/MIK.map, charsets/PTCP154.map, + charsets/stdenc.map, charsets/symbol.map: Re-generated. + 2012-10-07 Jan Djärv * NEWS (NextStep/OSX port changes): OSX 10.4 or newer is required. === modified file 'etc/charsets/CNS-2.map' --- etc/charsets/CNS-2.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/CNS-2.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4 0x2121 0x4E42 0x2122 0x4E5C === modified file 'etc/charsets/CNS-3.map' --- etc/charsets/CNS-3.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/CNS-3.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4 0x2121 0x4E28 0x2122 0x4E36 === modified file 'etc/charsets/CNS-4.map' --- etc/charsets/CNS-4.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/CNS-4.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4 0x2121 0x20086 0x2122-0x2123 0x4E40 === modified file 'etc/charsets/CNS-5.map' --- etc/charsets/CNS-5.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/CNS-5.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4 0x2121 0x200D1 0x2122 0x200CB === modified file 'etc/charsets/CNS-6.map' --- etc/charsets/CNS-6.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/CNS-6.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4 0x2121 0x2F802 0x2122 0x20062 === modified file 'etc/charsets/CNS-7.map' --- etc/charsets/CNS-7.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/CNS-7.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of # http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4 0x2121 0x20055 0x2122 0x20182 === modified file 'etc/charsets/CP932-2BYTE.map' --- etc/charsets/CP932-2BYTE.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/CP932-2BYTE.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/CP932.TXT.gz which is a copy of +# Generated from admin/charsets/mapfiles/CP932.TXT which is a copy of # http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT 0x8140 0x3000 # 0 2121 0x8141 0x3001 # 0 2122 === modified file 'etc/charsets/GB180302.map' --- etc/charsets/GB180302.map 2011-07-18 15:05:46 +0000 +++ etc/charsets/GB180302.map 2012-10-11 11:26:26 +0000 @@ -2048,20 +2048,17 @@ 0xA6B9-0xA6C0 0xE785 0xA6C1-0xA6D1 0x03B1 0xA6D2-0xA6D8 0x03C3 -0xA6D9 0xFE10 -0xA6DA 0xFE12 -0xA6DB 0xFE11 -0xA6DC-0xA6DF 0xFE13 +0xA6D9-0xA6DF 0xE78D 0xA6E0-0xA6E1 0xFE35 0xA6E2-0xA6E3 0xFE39 0xA6E4-0xA6E5 0xFE3F 0xA6E6-0xA6E7 0xFE3D 0xA6E8-0xA6EB 0xFE41 -0xA6EC-0xA6ED 0xFE17 +0xA6EC-0xA6ED 0xE794 0xA6EE-0xA6EF 0xFE3B 0xA6F0-0xA6F1 0xFE37 0xA6F2 0xFE31 -0xA6F3 0xFE19 +0xA6F3 0xE796 0xA6F4-0xA6F5 0xFE33 0xA6F6-0xA6FE 0xE797 0xA740-0xA77E 0xE706 @@ -10396,7 +10393,7 @@ 0xFE56 0x3447 0xFE57 0x2E88 0xFE58 0x2E8B -0xFE59 0x9FB4 +0xFE59 0xE81E 0xFE5A 0x359E 0xFE5B 0x361A 0xFE5C 0x360E @@ -10404,18 +10401,18 @@ 0xFE5E 0x2E97 0xFE5F 0x396E 0xFE60 0x3918 -0xFE61 0x9FB5 +0xFE61 0xE826 0xFE62 0x39CF 0xFE63 0x39DF 0xFE64 0x3A73 0xFE65 0x39D0 -0xFE66-0xFE67 0x9FB6 +0xFE66-0xFE67 0xE82B 0xFE68 0x3B4E 0xFE69 0x3C6E 0xFE6A 0x3CE0 0xFE6B 0x2EA7 0xFE6C 0x000215D7 -0xFE6D 0x9FB8 +0xFE6D 0xE832 0xFE6E 0x2EAA 0xFE6F 0x4056 0xFE70 0x415F @@ -10431,7 +10428,7 @@ 0xFE7B 0x44D6 0xFE7C 0x4661 0xFE7D 0x464C -0xFE7E 0x9FB9 +0xFE7E 0xE843 0xFE80 0x4723 0xFE81 0x4729 0xFE82 0x477C @@ -10446,7 +10443,7 @@ 0xFE8D 0x499B 0xFE8E 0x49B7 0xFE8F 0x49B6 -0xFE90 0x9FBA +0xFE90 0xE854 0xFE91 0x000241FE 0xFE92 0x4CA3 0xFE93-0xFE95 0x4C9F @@ -10454,5 +10451,5 @@ 0xFE97 0x4CA2 0xFE98-0xFE9E 0x4D13 0xFE9F 0x4DAE -0xFEA0 0x9FBB +0xFEA0 0xE864 0xFEA1-0xFEFE 0xE468 === modified file 'etc/charsets/GB180304.map' --- etc/charsets/GB180304.map 2011-07-18 15:05:46 +0000 +++ etc/charsets/GB180304.map 2012-10-11 11:26:26 +0000 @@ -41,171 +41,166 @@ 0x8130D135-0x8130D238 0x0402 0x8130D239 0x0450 0x8130D330-0x8135F436 0x0452 -0x8135F438-0x8136A531 0x1E40 -0x8136A532-0x8136A533 0x2011 -0x8136A534 0x2017 -0x8136A535-0x8136A536 0x201A -0x8136A537-0x8136A633 0x201E -0x8136A634-0x8136A732 0x2027 -0x8136A733 0x2031 -0x8136A734 0x2034 -0x8136A735-0x8136A739 0x2036 -0x8136A830-0x8136B331 0x203C -0x8136B332-0x8136BB37 0x20AD -0x8136BB38 0x2104 -0x8136BB39-0x8136BC31 0x2106 -0x8136BC32-0x8136BD33 0x210A -0x8136BD34-0x8136BE33 0x2117 -0x8136BE34-0x8136C435 0x2122 -0x8136C436-0x8136C439 0x216C -0x8136C530-0x8136C731 0x217A -0x8136C732-0x8136C733 0x2194 -0x8136C734-0x8136D233 0x219A -0x8136D234-0x8136D239 0x2209 -0x8136D330 0x2210 -0x8136D331-0x8136D333 0x2212 -0x8136D334-0x8136D337 0x2216 -0x8136D338-0x8136D339 0x221B -0x8136D430-0x8136D431 0x2221 -0x8136D432 0x2224 -0x8136D433 0x2226 -0x8136D434-0x8136D435 0x222C -0x8136D436-0x8136D530 0x222F -0x8136D531-0x8136D535 0x2238 -0x8136D536-0x8136D635 0x223E -0x8136D636-0x8136D638 0x2249 -0x8136D639-0x8136D733 0x224D -0x8136D734-0x8136D836 0x2253 -0x8136D837-0x8136D838 0x2262 -0x8136D839-0x8136D934 0x2268 -0x8136D935-0x8136DD31 0x2270 -0x8136DD32-0x8136DD34 0x2296 -0x8136DD35-0x8136DE35 0x229A -0x8136DE36-0x8136E130 0x22A6 -0x8136E131-0x8136E932 0x22C0 -0x8136E933-0x81378C35 0x2313 -0x81378C36-0x81378D35 0x246A -0x81378D36-0x81379735 0x249C -0x81379736-0x81379739 0x254C -0x81379830-0x81379932 0x2574 -0x81379933-0x81379935 0x2590 -0x81379936-0x81379A35 0x2596 -0x81379A36-0x81379C31 0x25A2 -0x81379C32-0x81379C39 0x25B4 -0x81379D30-0x81379D37 0x25BE -0x81379D38-0x81379E30 0x25C8 -0x81379E31-0x81379E32 0x25CC -0x81379E33-0x8137A030 0x25D0 -0x8137A031-0x8137A331 0x25E6 -0x8137A332-0x8137A333 0x2607 -0x8137A334-0x8137A837 0x260A -0x8137A838 0x2641 -0x8137A839-0x8138FD38 0x2643 -0x8138FD39-0x8138FE30 0x2E82 -0x8138FE31-0x8138FE33 0x2E85 -0x8138FE34-0x8138FE35 0x2E89 -0x8138FE36-0x81398135 0x2E8D -0x81398136-0x81398330 0x2E98 -0x81398331-0x81398332 0x2EA8 -0x81398333-0x81398335 0x2EAB -0x81398336-0x81398339 0x2EAF -0x81398430-0x81398431 0x2EB4 -0x81398432-0x81398434 0x2EB8 -0x81398435-0x81398538 0x2EBC -0x81398539-0x8139A331 0x2ECB -0x8139A332-0x8139A335 0x2FFC -0x8139A336 0x3004 -0x8139A337-0x8139A431 0x3018 -0x8139A432-0x8139A433 0x301F -0x8139A434-0x8139A633 0x302A -0x8139A634-0x8139A635 0x303F -0x8139A636-0x8139A732 0x3094 -0x8139A733-0x8139A734 0x309F -0x8139A735-0x8139A739 0x30F7 -0x8139A830-0x8139A835 0x30FF -0x8139A836-0x8139C131 0x312A -0x8139C132-0x8139C138 0x322A -0x8139C139-0x8139CD31 0x3232 -0x8139CD32-0x8139E435 0x32A4 -0x8139E436-0x8139E537 0x3390 -0x8139E538-0x8139E539 0x339F -0x8139E630-0x8139E933 0x33A2 -0x8139E934-0x8139EA32 0x33C5 -0x8139EA33-0x8139EA34 0x33CF -0x8139EA35-0x8139EA36 0x33D3 -0x8139EA37-0x8139F539 0x33D6 -0x8139F630-0x8139FA32 0x3448 -0x8139FA33-0x82309A30 0x3474 -0x82309A31-0x8230A531 0x359F -0x8230A532-0x8230A632 0x360F -0x8230A633-0x8230F237 0x361B -0x8230F238-0x8230FB32 0x3919 -0x8230FB33-0x82318638 0x396F -0x82318639-0x82318832 0x39D1 -0x82318833-0x82319639 0x39E0 -0x82319730-0x8231AC37 0x3A74 -0x8231AC38-0x8231C934 0x3B4F -0x8231C935-0x8231D437 0x3C6F -0x8231D438-0x8232AF32 0x3CE1 -0x8232AF33-0x8232C936 0x4057 -0x8232C937-0x8232F837 0x4160 -0x8232F838-0x82338633 0x4338 -0x82338634-0x82338637 0x43AD -0x82338638-0x82338B30 0x43B2 -0x82338B31-0x8233A338 0x43DE -0x8233A339-0x8233C931 0x44D7 -0x8233C932-0x8233CB31 0x464D -0x8233CB32-0x8233DE34 0x4662 -0x8233DE35-0x8233DE39 0x4724 -0x8233DF30-0x8233E731 0x472A -0x8233E732-0x8233E837 0x477D -0x8233E838-0x82349638 0x478E -0x82349639-0x82349B38 0x4948 -0x82349B39-0x82349C30 0x497B -0x82349C31-0x82349C34 0x497E -0x82349C35 0x4984 -0x82349C36-0x82349E35 0x4987 -0x82349E36-0x82349E38 0x499C -0x82349E39-0x8234A130 0x49A0 -0x8234A131-0x8234E733 0x49B8 -0x8234E734-0x8234EB32 0x4C78 -0x8234EB33-0x8234F633 0x4CA4 -0x8234F634-0x82358731 0x4D1A -0x82358732-0x82358F32 0x4DAF -0x82358F33-0x82359036 0x9FA6 -0x82359135-0x8336C738 0x9FBC -0x8336C739 0xE76C -0x8135F437 0xE7C7 -0x8336C830 0xE7C8 +0x8135F437-0x8136A530 0x1E40 +0x8136A531-0x8136A532 0x2011 +0x8136A533 0x2017 +0x8136A534-0x8136A535 0x201A +0x8136A536-0x8136A632 0x201E +0x8136A633-0x8136A731 0x2027 +0x8136A732 0x2031 +0x8136A733 0x2034 +0x8136A734-0x8136A738 0x2036 +0x8136A739-0x8136B330 0x203C +0x8136B331-0x8136BB36 0x20AD +0x8136BB37 0x2104 +0x8136BB38-0x8136BC30 0x2106 +0x8136BC31-0x8136BD32 0x210A +0x8136BD33-0x8136BE32 0x2117 +0x8136BE33-0x8136C434 0x2122 +0x8136C435-0x8136C438 0x216C +0x8136C439-0x8136C730 0x217A +0x8136C731-0x8136C732 0x2194 +0x8136C733-0x8136D232 0x219A +0x8136D233-0x8136D238 0x2209 +0x8136D239 0x2210 +0x8136D330-0x8136D332 0x2212 +0x8136D333-0x8136D336 0x2216 +0x8136D337-0x8136D338 0x221B +0x8136D339-0x8136D430 0x2221 +0x8136D431 0x2224 +0x8136D432 0x2226 +0x8136D433-0x8136D434 0x222C +0x8136D435-0x8136D439 0x222F +0x8136D530-0x8136D534 0x2238 +0x8136D535-0x8136D634 0x223E +0x8136D635-0x8136D637 0x2249 +0x8136D638-0x8136D732 0x224D +0x8136D733-0x8136D835 0x2253 +0x8136D836-0x8136D837 0x2262 +0x8136D838-0x8136D933 0x2268 +0x8136D934-0x8136DD30 0x2270 +0x8136DD31-0x8136DD33 0x2296 +0x8136DD34-0x8136DE34 0x229A +0x8136DE35-0x8136E039 0x22A6 +0x8136E130-0x8136E931 0x22C0 +0x8136E932-0x81378C34 0x2313 +0x81378C35-0x81378D34 0x246A +0x81378D35-0x81379734 0x249C +0x81379735-0x81379738 0x254C +0x81379739-0x81379931 0x2574 +0x81379932-0x81379934 0x2590 +0x81379935-0x81379A34 0x2596 +0x81379A35-0x81379C30 0x25A2 +0x81379C31-0x81379C38 0x25B4 +0x81379C39-0x81379D36 0x25BE +0x81379D37-0x81379D39 0x25C8 +0x81379E30-0x81379E31 0x25CC +0x81379E32-0x81379F39 0x25D0 +0x8137A030-0x8137A330 0x25E6 +0x8137A331-0x8137A332 0x2607 +0x8137A333-0x8137A836 0x260A +0x8137A837 0x2641 +0x8137A838-0x8138FD37 0x2643 +0x8138FD38-0x8138FD39 0x2E82 +0x8138FE30-0x8138FE32 0x2E85 +0x8138FE33-0x8138FE34 0x2E89 +0x8138FE35-0x81398134 0x2E8D +0x81398135-0x81398239 0x2E98 +0x81398330-0x81398331 0x2EA8 +0x81398332-0x81398334 0x2EAB +0x81398335-0x81398338 0x2EAF +0x81398339-0x81398430 0x2EB4 +0x81398431-0x81398433 0x2EB8 +0x81398434-0x81398537 0x2EBC +0x81398538-0x8139A330 0x2ECB +0x8139A331-0x8139A334 0x2FFC +0x8139A335 0x3004 +0x8139A336-0x8139A430 0x3018 +0x8139A431-0x8139A432 0x301F +0x8139A433-0x8139A632 0x302A +0x8139A633-0x8139A634 0x303F +0x8139A635-0x8139A731 0x3094 +0x8139A732-0x8139A733 0x309F +0x8139A734-0x8139A738 0x30F7 +0x8139A739-0x8139A834 0x30FF +0x8139A835-0x8139C130 0x312A +0x8139C131-0x8139C137 0x322A +0x8139C138-0x8139CD30 0x3232 +0x8139CD31-0x8139E434 0x32A4 +0x8139E435-0x8139E536 0x3390 +0x8139E537-0x8139E538 0x339F +0x8139E539-0x8139E932 0x33A2 +0x8139E933-0x8139EA31 0x33C5 +0x8139EA32-0x8139EA33 0x33CF +0x8139EA34-0x8139EA35 0x33D3 +0x8139EA36-0x8139F538 0x33D6 +0x8139F539-0x8139FA31 0x3448 +0x8139FA32-0x82309939 0x3474 +0x82309A30-0x8230A530 0x359F +0x8230A531-0x8230A631 0x360F +0x8230A632-0x8230F236 0x361B +0x8230F237-0x8230FB31 0x3919 +0x8230FB32-0x82318637 0x396F +0x82318638-0x82318831 0x39D1 +0x82318832-0x82319638 0x39E0 +0x82319639-0x8231AC36 0x3A74 +0x8231AC37-0x8231C933 0x3B4F +0x8231C934-0x8231D436 0x3C6F +0x8231D437-0x8232AF31 0x3CE1 +0x8232AF32-0x8232C935 0x4057 +0x8232C936-0x8232F836 0x4160 +0x8232F837-0x82338632 0x4338 +0x82338633-0x82338636 0x43AD +0x82338637-0x82338A39 0x43B2 +0x82338B30-0x8233A337 0x43DE +0x8233A338-0x8233C930 0x44D7 +0x8233C931-0x8233CB30 0x464D +0x8233CB31-0x8233DE33 0x4662 +0x8233DE34-0x8233DE38 0x4724 +0x8233DE39-0x8233E730 0x472A +0x8233E731-0x8233E836 0x477D +0x8233E837-0x82349637 0x478E +0x82349638-0x82349B37 0x4948 +0x82349B38-0x82349B39 0x497B +0x82349C30-0x82349C33 0x497E +0x82349C34 0x4984 +0x82349C35-0x82349E34 0x4987 +0x82349E35-0x82349E37 0x499C +0x82349E38-0x8234A039 0x49A0 +0x8234A130-0x8234E732 0x49B8 +0x8234E733-0x8234EB31 0x4C78 +0x8234EB32-0x8234F632 0x4CA4 +0x8234F633-0x82358730 0x4D1A +0x82358731-0x82358F31 0x4DAF +0x82358F32-0x8336C737 0x9FA6 +0x8336C738 0xE76C +0x8336C739-0x8336C830 0xE7C7 0x8336C831-0x8336C933 0xE7E7 -0x8336C934 0xE815 -0x8336C935-0x8336C939 0xE819 -0x8336CA30-0x8336CA36 0xE81F -0x8336CA37-0x8336CB30 0xE827 -0x8336CB31-0x8336CB34 0xE82D -0x8336CB35-0x8336CC32 0xE833 -0x8336CC33-0x8336CC39 0xE83C -0x8336CD30-0x8336CE35 0xE844 -0x8336CE36-0x8336CF39 0xE856 -0x8336D030-0x84308534 0xE865 -0x84308535-0x84308D30 0xF92D -0x84308D31-0x84308F37 0xF97A -0x84308F38-0x84309738 0xF996 -0x84309739-0x84309837 0xF9E8 -0x84309838-0x84309B33 0xF9F2 -0x84309B34 0xFA10 -0x84309B35 0xFA12 -0x84309B36-0x84309B38 0xFA15 -0x84309B39-0x84309C34 0xFA19 -0x84309C35 0xFA22 -0x84309C36-0x84309C37 0xFA25 -0x84309C38-0x84318235 0xFA2A -0x84318336-0x84318537 0xFE1A -0x84318538 0xFE32 -0x84318539-0x84318632 0xFE45 -0x84318633 0xFE53 -0x84318634 0xFE58 -0x84318635 0xFE67 -0x84318636-0x84319534 0xFE6C -0x84319535-0x8431A233 0xFF5F -0x8431A234-0x8431A439 0xFFE6 +0x8336C934-0x8336CA32 0xE815 +0x8336CA33-0x8336CA39 0xE81F +0x8336CB30-0x8336CB33 0xE827 +0x8336CB34-0x8336CB38 0xE82D +0x8336CB39-0x8336CD34 0xE833 +0x8336CD35-0x8336CF30 0xE844 +0x8336CF31-0x8336D035 0xE855 +0x8336D036-0x84308630 0xE865 +0x84308631-0x84308D36 0xF92D +0x84308D37-0x84309033 0xF97A +0x84309034-0x84309834 0xF996 +0x84309835-0x84309933 0xF9E8 +0x84309934-0x84309B39 0xF9F2 +0x84309C30 0xFA10 +0x84309C31 0xFA12 +0x84309C32-0x84309C34 0xFA15 +0x84309C35-0x84309D30 0xFA19 +0x84309D31 0xFA22 +0x84309D32-0x84309D33 0xFA25 +0x84309D34-0x84318633 0xFA2A +0x84318634 0xFE32 +0x84318635-0x84318638 0xFE45 +0x84318639 0xFE53 +0x84318730 0xFE58 +0x84318731 0xFE67 +0x84318732-0x84319630 0xFE6C +0x84319631-0x8431A239 0xFF5F +0x8431A330-0x8431A535 0xFFE6 === modified file 'etc/charsets/JISC6226.map' --- etc/charsets/JISC6226.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/JISC6226.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/Uni2JIS.gz which is a copy of +# Generated from admin/charsets/mapfiles/Uni2JIS which is a copy of # http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/Uni2JIS.Z 0x2121 0x3000 0x2122 0x3001 === modified file 'etc/charsets/JISX2131.map' --- etc/charsets/JISX2131.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/JISX2131.map 2012-10-11 11:26:26 +0000 @@ -1157,7 +1157,6 @@ 0x2d79 0x22BF 0x2d7d 0x2756 0x2d7e 0x261E -0x2e21 0x4FF1 0x2e22 0x0002000B 0x2e23 0x3402 0x2e24 0x4E28 @@ -1344,7 +1343,6 @@ 0x2f7b 0x000218BD 0x2f7c 0x5B19 0x2f7d 0x5B25 -0x2f7e 0x525D 0x3021 0x4E9C 0x3022 0x5516 0x3023 0x5A03 @@ -4310,7 +4308,6 @@ 0x4f51 0x6E7E 0x4f52 0x7897 0x4f53 0x8155 -0x4f54 0x00020B9F 0x4f55 0x5B41 0x4f56 0x5B56 0x4f57 0x5B7D @@ -4352,7 +4349,6 @@ 0x4f7b 0x5DA7 0x4f7c 0x5DB8 0x4f7d 0x5DCB -0x4f7e 0x541E 0x5021 0x5F0C 0x5022 0x4E10 0x5023 0x4E15 @@ -7743,7 +7739,6 @@ 0x7424 0x7464 0x7425 0x51DC 0x7426 0x7199 -0x7427 0x5653 0x7428 0x5DE2 0x7429 0x5E14 0x742a 0x5E18 @@ -8766,8 +8761,3 @@ 0x7e77 0x9F94 0x7e78 0x9F97 0x7e79 0x9FA2 -0x7e7a 0x59F8 -0x7e7b 0x5C5B -0x7e7c 0x5E77 -0x7e7d 0x7626 -0x7e7e 0x7E6B === modified file 'etc/charsets/MIK.map' --- etc/charsets/MIK.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/MIK.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/bulgarian-mik.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/bulgarian-mik.txt which is a copy of # http://czyborra.com/charsets/bulgarian-mik.txt.gz 0x20-0x7E 0x0020 0x80-0xBF 0x0410 === modified file 'etc/charsets/PTCP154.map' --- etc/charsets/PTCP154.map 2009-06-12 12:34:00 +0000 +++ etc/charsets/PTCP154.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/PTCP154.gz which is a copy of +# Generated from admin/charsets/mapfiles/PTCP154 which is a copy of # http://www.iana.org/assignments/charset-reg/PTCP154 0x00-0x7F 0x0000 0x80 0x0496 === modified file 'etc/charsets/stdenc.map' --- etc/charsets/stdenc.map 2009-06-24 13:03:59 +0000 +++ etc/charsets/stdenc.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/stdenc.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/stdenc.txt which is a copy of # http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt 0xFB 0x00DF 0xFA 0x0153 === modified file 'etc/charsets/symbol.map' --- etc/charsets/symbol.map 2009-06-24 13:03:44 +0000 +++ etc/charsets/symbol.map 2012-10-11 11:26:26 +0000 @@ -1,4 +1,4 @@ -# Generated from admin/charsets/mapfiles/symbol.txt.gz which is a copy of +# Generated from admin/charsets/mapfiles/symbol.txt which is a copy of # http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt 0xFE 0xF8FE 0xFD 0xF8FD === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-10 14:45:26 +0000 +++ lisp/ChangeLog 2012-10-11 11:29:47 +0000 @@ -1,3 +1,7 @@ +2012-10-11 Kenichi Handa + + * international/eucjp-ms.el: Re-generated. + 2012-10-10 Kenichi Handa * select.el (xselect--encode-string): If a coding is specified for === modified file 'lisp/international/eucjp-ms.el' --- lisp/international/eucjp-ms.el 2011-01-15 23:16:57 +0000 +++ lisp/international/eucjp-ms.el 2012-10-11 11:26:26 +0000 @@ -2085,4 +2085,3 @@ (setcar x (cdr x)) (setcdr x tmp))) map) (define-translation-table 'eucjp-ms-encode map)) - ------------------------------------------------------------ revno: 110505 committer: Paul Eggert branch nick: trunk timestamp: Wed 2012-10-10 21:33:12 -0700 message: * marker.c (cached_modiff): EMACS_INT, not int. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-11 00:32:25 +0000 +++ src/ChangeLog 2012-10-11 04:33:12 +0000 @@ -1,5 +1,7 @@ 2012-10-11 Paul Eggert + * marker.c (cached_modiff): EMACS_INT, not int. + * w32select.c (waiting_for_input): Declare by including "keyboard.h" instead of having a wrong decl. * nsmenu.m (waiting_for_input): Remove wrong decl. === modified file 'src/marker.c' --- src/marker.c 2012-10-01 06:36:54 +0000 +++ src/marker.c 2012-10-11 04:33:12 +0000 @@ -29,7 +29,7 @@ static ptrdiff_t cached_charpos; static ptrdiff_t cached_bytepos; static struct buffer *cached_buffer; -static int cached_modiff; +static EMACS_INT cached_modiff; /* Juanma Barranquero reported ~3x increased bootstrap time when byte_char_debug_check is enabled; so this ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.