Now on revision 111971. ------------------------------------------------------------ revno: 111971 committer: Jambunathan K branch nick: trunk timestamp: Fri 2013-03-08 09:48:16 +0530 message: Provide for customizing default regexp in hi-lock commands (Bug#13892). * lisp/hi-lock.el (hi-lock-read-regexp-defaults-function): New var. (hi-lock-read-regexp-defaults): New defun. (hi-lock-line-face-buffer, hi-lock-face-buffer) (hi-lock-face-phrase-buffer): Propagate above change. Update docstring. * lisp/subr.el (find-tag-default-as-regexp): New defun. * lisp/replace.el (read-regexp): Propagate above change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-08 02:11:25 +0000 +++ lisp/ChangeLog 2013-03-08 04:18:16 +0000 @@ -1,3 +1,14 @@ +2013-03-08 Jambunathan K + + * hi-lock.el (hi-lock-read-regexp-defaults-function): New var. + (hi-lock-read-regexp-defaults): New defun. + (hi-lock-line-face-buffer, hi-lock-face-buffer) + (hi-lock-face-phrase-buffer): Propagate above change. Update + docstring (bug#13892). + + * subr.el (find-tag-default-as-regexp): New defun. + * replace.el (read-regexp): Propagate above change. + 2013-03-08 Jay Belanger * calc/calc-units.el (calc-convert-units): Fix the way that default === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2013-01-28 20:00:35 +0000 +++ lisp/hi-lock.el 2013-03-08 04:18:16 +0000 @@ -279,6 +279,26 @@ map) "Key map for hi-lock.") +(defvar hi-lock-read-regexp-defaults-function + 'hi-lock-read-regexp-defaults + "Function that provides default regexp(s) for highlighting commands. +This function should take no arguments and return one of nil, a +regexp or a list of regexps for use with highlighting commands - +`hi-lock-face-phrase-buffer', `hi-lock-line-face-buffer' and +`hi-lock-face-buffer'. The return value of this function is used +as DEFAULTS param of `read-regexp' while executing the +highlighting command. This function is called only during +interactive use. + +For example, to highlight at symbol at point use + + \(setq hi-lock-read-regexp-defaults-function + 'find-tag-default-as-regexp\) + +If you need different defaults for different highlighting +operations, use `this-command' to identify the command under +execution.") + ;; Visible Functions ;;;###autoload @@ -399,17 +419,18 @@ ;;;###autoload (defun hi-lock-line-face-buffer (regexp &optional face) "Set face of all lines containing a match of REGEXP to FACE. -Interactively, prompt for REGEXP then FACE, using a buffer-local -history list for REGEXP and a global history list for FACE. +Interactively, prompt for REGEXP then FACE. Use +`hi-lock-read-regexp-defaults-function' to retrieve default +value(s) of REGEXP. Use the global history list for FACE. -If Font Lock mode is enabled in the buffer, it is used to -highlight REGEXP. If Font Lock mode is disabled, overlays are -used for highlighting; in this case, the highlighting will not be -updated as you type." +Use Font lock mode, if enabled, to highlight REGEXP. Otherwise, +use overlays for highlighting. If overlays are used, the +highlighting will not update as you type." (interactive (list (hi-lock-regexp-okay - (read-regexp "Regexp to highlight line" (car regexp-history))) + (read-regexp "Regexp to highlight line" + (funcall hi-lock-read-regexp-defaults-function))) (hi-lock-read-face-name))) (or (facep face) (setq face 'hi-yellow)) (unless hi-lock-mode (hi-lock-mode 1)) @@ -424,17 +445,18 @@ ;;;###autoload (defun hi-lock-face-buffer (regexp &optional face) "Set face of each match of REGEXP to FACE. -Interactively, prompt for REGEXP then FACE, using a buffer-local -history list for REGEXP and a global history list for FACE. +Interactively, prompt for REGEXP then FACE. Use +`hi-lock-read-regexp-defaults-function' to retrieve default +value(s) REGEXP. Use the global history list for FACE. -If Font Lock mode is enabled in the buffer, it is used to -highlight REGEXP. If Font Lock mode is disabled, overlays are -used for highlighting; in this case, the highlighting will not be -updated as you type." +Use Font lock mode, if enabled, to highlight REGEXP. Otherwise, +use overlays for highlighting. If overlays are used, the +highlighting will not update as you type." (interactive (list (hi-lock-regexp-okay - (read-regexp "Regexp to highlight" (car regexp-history))) + (read-regexp "Regexp to highlight" + (funcall hi-lock-read-regexp-defaults-function))) (hi-lock-read-face-name))) (or (facep face) (setq face 'hi-yellow)) (unless hi-lock-mode (hi-lock-mode 1)) @@ -445,18 +467,22 @@ ;;;###autoload (defun hi-lock-face-phrase-buffer (regexp &optional face) "Set face of each match of phrase REGEXP to FACE. -If called interactively, replaces whitespace in REGEXP with -arbitrary whitespace and makes initial lower-case letters case-insensitive. +Interactively, prompt for REGEXP then FACE. Use +`hi-lock-read-regexp-defaults-function' to retrieve default +value(s) of REGEXP. Use the global history list for FACE. When +called interactively, replace whitespace in user provided regexp +with arbitrary whitespace and make initial lower-case letters +case-insensitive before highlighting with `hi-lock-set-pattern'. -If Font Lock mode is enabled in the buffer, it is used to -highlight REGEXP. If Font Lock mode is disabled, overlays are -used for highlighting; in this case, the highlighting will not be -updated as you type." +Use Font lock mode, if enabled, to highlight REGEXP. Otherwise, +use overlays for highlighting. If overlays are used, the +highlighting will not update as you type." (interactive (list (hi-lock-regexp-okay (hi-lock-process-phrase - (read-regexp "Phrase to highlight" (car regexp-history)))) + (read-regexp "Phrase to highlight" + (funcall hi-lock-read-regexp-defaults-function)))) (hi-lock-read-face-name))) (or (facep face) (setq face 'hi-yellow)) (unless hi-lock-mode (hi-lock-mode 1)) @@ -622,6 +648,11 @@ (error "Regexp cannot match an empty string") regexp)) +(defun hi-lock-read-regexp-defaults () + "Return the latest regexp from `regexp-history'. +See `hi-lock-read-regexp-defaults-function' for details." + (car regexp-history)) + (defun hi-lock-read-face-name () "Return face for interactive highlighting. When `hi-lock-auto-select-face' is non-nil, just return the next face. === modified file 'lisp/replace.el' --- lisp/replace.el 2013-02-25 20:57:44 +0000 +++ lisp/replace.el 2013-03-08 04:18:16 +0000 @@ -603,15 +603,7 @@ (append suggestions (list - ;; Regexp for tag at point. - (let* ((tagf (or find-tag-default-function - (get major-mode 'find-tag-default-function) - 'find-tag-default)) - (tag (funcall tagf))) - (cond ((not tag) "") - ((eq tagf 'find-tag-default) - (format "\\_<%s\\_>" (regexp-quote tag))) - (t (regexp-quote tag)))) + (find-tag-default-as-regexp) (car regexp-search-ring) (regexp-quote (or (car search-ring) "")) (car (symbol-value query-replace-from-history-variable))))) === modified file 'lisp/subr.el' --- lisp/subr.el 2013-02-09 16:20:29 +0000 +++ lisp/subr.el 2013-03-08 04:18:16 +0000 @@ -2697,6 +2697,22 @@ (setq to (point))))) (buffer-substring-no-properties from to)))) +(defun find-tag-default-as-regexp () + "Return regexp that matches the default tag at point. +If there is no tag at point, return nil. + +When in a major mode that does not provide it's own +`find-tag-default-function', return a regexp that matches the +symbol at point exactly." + (let* ((tagf (or find-tag-default-function + (get major-mode 'find-tag-default-function) + 'find-tag-default)) + (tag (funcall tagf))) + (cond ((not tag)) + ((eq tagf 'find-tag-default) + (format "\\_<%s\\_>" (regexp-quote tag))) + (t (regexp-quote tag))))) + (defun play-sound (sound) "SOUND is a list of the form `(sound KEYWORD VALUE...)'. The following keywords are recognized: ------------------------------------------------------------ revno: 111970 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-03-07 18:32:21 -0800 message: print.c, process.c: Use bool for booleans. * lisp.h (wait_reading_process_output): * print.c (print_output_debug_flag, PRINTDECLARE, printchar) (strout, debug_output_compilation_hack, float_to_string, print) (print_object): * process.c (kbd_is_on_hold, inhibit_sentinels, process_output_skip) (decode_status, status_message, create_process, create_pty) (Fmake_network_process, Fnetwork_interface_info) (wait_reading_process_output, read_process_output) (write_queue_push, write_queue_pop, process_send_signal) (handle_child_signal, keyboard_bit_set, kbd_on_hold_p): * process.h (struct Lisp_Process, inhibit_sentinels, kbd_on_hold_p): Use bool for booleans. * process.c (Fnetwork_interface_list): Remove unused local. (connect_counter): Now EMACS_INT, not int. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-07 23:37:36 +0000 +++ src/ChangeLog 2013-03-08 02:32:21 +0000 @@ -1,3 +1,21 @@ +2013-03-08 Paul Eggert + + print.c, process.c: Use bool for booleans. + * lisp.h (wait_reading_process_output): + * print.c (print_output_debug_flag, PRINTDECLARE, printchar) + (strout, debug_output_compilation_hack, float_to_string, print) + (print_object): + * process.c (kbd_is_on_hold, inhibit_sentinels, process_output_skip) + (decode_status, status_message, create_process, create_pty) + (Fmake_network_process, Fnetwork_interface_info) + (wait_reading_process_output, read_process_output) + (write_queue_push, write_queue_pop, process_send_signal) + (handle_child_signal, keyboard_bit_set, kbd_on_hold_p): + * process.h (struct Lisp_Process, inhibit_sentinels, kbd_on_hold_p): + Use bool for booleans. + * process.c (Fnetwork_interface_list): Remove unused local. + (connect_counter): Now EMACS_INT, not int. + 2013-03-08 Dmitry Antipov * bidi.c (bidi_fetch_char): Swap first and second arguments === modified file 'src/lisp.h' --- src/lisp.h 2013-03-07 03:01:17 +0000 +++ src/lisp.h 2013-03-08 02:32:21 +0000 @@ -3498,10 +3498,10 @@ extern Lisp_Object QCtype, Qlocal; extern Lisp_Object Qprocessp; extern void kill_buffer_processes (Lisp_Object); -extern int wait_reading_process_output (intmax_t, int, int, bool, - Lisp_Object, - struct Lisp_Process *, - int); +extern bool wait_reading_process_output (intmax_t, int, int, bool, + Lisp_Object, + struct Lisp_Process *, + int); /* Max value for the first argument of wait_reading_process_output. */ #if __GNUC__ == 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5) /* Work around a bug in GCC 3.4.2, known to be fixed in GCC 4.6.3. === modified file 'src/print.c' --- src/print.c 2013-02-15 12:26:42 +0000 +++ src/print.c 2013-03-08 02:32:21 +0000 @@ -84,7 +84,7 @@ static void print_interval (INTERVAL interval, Lisp_Object printcharfun); /* GDB resets this to zero on W32 to disable OutputDebugString calls. */ -int print_output_debug_flag EXTERNALLY_VISIBLE = 1; +bool print_output_debug_flag EXTERNALLY_VISIBLE = 1; /* Low level output routines for characters and strings. */ @@ -101,7 +101,7 @@ ptrdiff_t old_point = -1, start_point = -1; \ ptrdiff_t old_point_byte = -1, start_point_byte = -1; \ ptrdiff_t specpdl_count = SPECPDL_INDEX (); \ - int free_print_buffer = 0; \ + bool free_print_buffer = 0; \ bool multibyte \ = !NILP (BVAR (current_buffer, enable_multibyte_characters)); \ Lisp_Object original @@ -241,7 +241,7 @@ } else { - int multibyte_p + bool multibyte_p = !NILP (BVAR (current_buffer, enable_multibyte_characters)); setup_echo_area_for_printing (multibyte_p); @@ -290,7 +290,7 @@ here, that's the reason we don't call printchar to do the job. */ int i; - int multibyte_p + bool multibyte_p = !NILP (BVAR (current_buffer, enable_multibyte_characters)); setup_echo_area_for_printing (multibyte_p); @@ -508,10 +508,10 @@ specbind (Qstandard_output, buf); } -static void print (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag); -static void print_preprocess (Lisp_Object obj); -static void print_preprocess_string (INTERVAL interval, Lisp_Object arg); -static void print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag); +static void print (Lisp_Object, Lisp_Object, bool); +static void print_preprocess (Lisp_Object); +static void print_preprocess_string (INTERVAL, Lisp_Object); +static void print_object (Lisp_Object, Lisp_Object, bool); DEFUN ("terpri", Fterpri, Sterpri, 0, 1, 0, doc: /* Output a newline to stream PRINTCHARFUN. @@ -727,9 +727,9 @@ /* This function is never called. Its purpose is to prevent print_output_debug_flag from being optimized away. */ -extern void debug_output_compilation_hack (int) EXTERNALLY_VISIBLE; +extern void debug_output_compilation_hack (bool) EXTERNALLY_VISIBLE; void -debug_output_compilation_hack (int x) +debug_output_compilation_hack (bool x) { print_output_debug_flag = x; } @@ -967,7 +967,7 @@ static char const NaN_string[] = "0.0e+NaN"; int i; union { double d; char c[sizeof (double)]; } u_data, u_minus_zero; - int negative = 0; + bool negative = 0; u_data.d = data; u_minus_zero.d = - 0.0; for (i = 0; i < sizeof (double); i++) @@ -1064,7 +1064,7 @@ static void -print (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag) +print (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) { new_backquote_output = 0; @@ -1314,7 +1314,7 @@ } static void -print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag) +print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag) { char buf[max (sizeof "from..to..in " + 2 * INT_STRLEN_BOUND (EMACS_INT), max (sizeof " . #" + INT_STRLEN_BOUND (printmax_t), @@ -1396,7 +1396,7 @@ ptrdiff_t size_byte; /* 1 means we must ensure that the next character we output cannot be taken as part of a hex character escape. */ - int need_nonhex = 0; + bool need_nonhex = 0; bool multibyte = STRING_MULTIBYTE (obj); GCPRO1 (obj); @@ -1508,10 +1508,10 @@ case Lisp_Symbol: { - register int confusing; - register unsigned char *p = SDATA (SYMBOL_NAME (obj)); - register unsigned char *end = p + SBYTES (SYMBOL_NAME (obj)); - register int c; + bool confusing; + unsigned char *p = SDATA (SYMBOL_NAME (obj)); + unsigned char *end = p + SBYTES (SYMBOL_NAME (obj)); + int c; ptrdiff_t i, i_byte; ptrdiff_t size_byte; Lisp_Object name; === modified file 'src/process.c' --- src/process.c 2013-02-17 16:49:27 +0000 +++ src/process.c 2013-03-08 02:32:21 +0000 @@ -146,13 +146,13 @@ Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtime, Qctime; Lisp_Object QCname, QCtype; -/* Non-zero if keyboard input is on hold, zero otherwise. */ +/* True if keyboard input is on hold, zero otherwise. */ -static int kbd_is_on_hold; +static bool kbd_is_on_hold; /* Nonzero means don't run process sentinels. This is used when exiting. */ -int inhibit_sentinels; +bool inhibit_sentinels; #ifdef subprocesses @@ -234,9 +234,9 @@ static int process_output_delay_count; -/* Non-zero if any process has non-nil read_output_skip. */ +/* True if any process has non-nil read_output_skip. */ -static int process_output_skip; +static bool process_output_skip; #else #define process_output_delay_count 0 @@ -244,7 +244,7 @@ static void create_process (Lisp_Object, char **, Lisp_Object); #ifdef USABLE_SIGIO -static int keyboard_bit_set (SELECT_TYPE *); +static bool keyboard_bit_set (SELECT_TYPE *); #endif static void deactivate_process (Lisp_Object); static void status_notify (struct Lisp_Process *); @@ -527,7 +527,7 @@ and store them individually through the three pointers. */ static void -decode_status (Lisp_Object l, Lisp_Object *symbol, int *code, int *coredump) +decode_status (Lisp_Object l, Lisp_Object *symbol, int *code, bool *coredump) { Lisp_Object tem; @@ -554,7 +554,8 @@ { Lisp_Object status = p->status; Lisp_Object symbol; - int code, coredump; + int code; + bool coredump; Lisp_Object string, string2; decode_status (status, &symbol, &code, &coredump); @@ -1579,7 +1580,7 @@ sigset_t blocked; /* Use volatile to protect variables from being clobbered by vfork. */ volatile int forkin, forkout; - volatile int pty_flag = 0; + volatile bool pty_flag = 0; volatile Lisp_Object lisp_pty_name = Qnil; volatile Lisp_Object encoded_current_dir; @@ -1871,7 +1872,7 @@ create_pty (Lisp_Object process) { int inchannel, outchannel; - int pty_flag = 0; + bool pty_flag = 0; inchannel = outchannel = -1; @@ -2819,8 +2820,9 @@ Lisp_Object tem; Lisp_Object name, buffer, host, service, address; Lisp_Object filter, sentinel; - int is_non_blocking_client = 0; - int is_server = 0, backlog = 5; + bool is_non_blocking_client = 0; + bool is_server = 0; + int backlog = 5; int socktype; int family = -1; @@ -3497,7 +3499,7 @@ struct ifreq *ifreq; void *buf = NULL; ptrdiff_t buf_size = 512; - int s, i; + int s; Lisp_Object res; s = socket (AF_INET, SOCK_STREAM, 0); @@ -3535,7 +3537,6 @@ int len = sizeof (*ifreq); #endif char namebuf[sizeof (ifq->ifr_name) + 1]; - i += len; ifreq = (struct ifreq *) ((char *) ifreq + len); if (ifq->ifr_addr.sa_family != AF_INET) @@ -3645,7 +3646,7 @@ Lisp_Object res = Qnil; Lisp_Object elt; int s; - int any = 0; + bool any = 0; #if (! (defined SIOCGIFHWADDR && defined HAVE_STRUCT_IFREQ_IFR_HWADDR) \ && defined HAVE_GETIFADDRS && defined LLADDR) struct ifaddrs *ifap; @@ -3931,7 +3932,7 @@ /* Accept a connection for server process SERVER on CHANNEL. */ -static int connect_counter = 0; +static EMACS_INT connect_counter = 0; static void server_accept_connection (Lisp_Object server, int channel) @@ -4186,7 +4187,7 @@ process. The return value is true if we read some input from that process. - If JUST_WAIT_PROC is non-nil, handle only output from WAIT_PROC + If JUST_WAIT_PROC is nonzero, handle only output from WAIT_PROC (suspending output from other processes). A negative value means don't run any timers either. @@ -4194,22 +4195,23 @@ received input from that process before the timeout elapsed. Otherwise, return true if we received input from any process. */ -int +bool wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, bool do_display, Lisp_Object wait_for_cell, struct Lisp_Process *wait_proc, int just_wait_proc) { - register int channel, nfds; + int channel, nfds; SELECT_TYPE Available; SELECT_TYPE Writeok; - int check_write; - int check_delay, no_avail; + bool check_write; + int check_delay; + bool no_avail; int xerrno; Lisp_Object proc; EMACS_TIME timeout, end_time; int wait_channel = -1; - int got_some_input = 0; + bool got_some_input = 0; ptrdiff_t count = SPECPDL_INDEX (); FD_ZERO (&Available); @@ -4246,7 +4248,7 @@ while (1) { - int timeout_reduced_for_timers = 0; + bool timeout_reduced_for_timers = 0; /* If calling from keyboard input, do not quit since we want to return C-g as an input character. @@ -4624,7 +4626,7 @@ unsigned old_timers_run = timers_run; struct buffer *old_buffer = current_buffer; Lisp_Object old_window = selected_window; - int leave = 0; + bool leave = 0; if (detect_input_pending_run_timers (do_display)) { @@ -4945,7 +4947,7 @@ else #endif { - int buffered = 0 <= proc_buffered_char[channel]; + bool buffered = 0 <= proc_buffered_char[channel]; if (buffered) { chars[carryover] = proc_buffered_char[channel]; @@ -5261,7 +5263,7 @@ static void write_queue_push (struct Lisp_Process *p, Lisp_Object input_obj, - const char *buf, ptrdiff_t len, int front) + const char *buf, ptrdiff_t len, bool front) { ptrdiff_t offset; Lisp_Object entry, obj; @@ -5286,10 +5288,10 @@ } /* Remove the first element in the write_queue of process P, put its - contents in OBJ, BUF and LEN, and return non-zero. If the - write_queue is empty, return zero. */ + contents in OBJ, BUF and LEN, and return true. If the + write_queue is empty, return false. */ -static int +static bool write_queue_pop (struct Lisp_Process *p, Lisp_Object *obj, const char **buf, ptrdiff_t *len) { @@ -5650,7 +5652,7 @@ If CURRENT_GROUP is lambda, that means send to the process group that currently owns the terminal, but only if it is NOT the shell itself. - If NOMSG is zero, insert signal-announcements into process's buffers + If NOMSG is false, insert signal-announcements into process's buffers right away. If we can, we try to signal PROCESS by sending control characters @@ -5659,12 +5661,12 @@ static void process_send_signal (Lisp_Object process, int signo, Lisp_Object current_group, - int nomsg) + bool nomsg) { Lisp_Object proc; - register struct Lisp_Process *p; + struct Lisp_Process *p; pid_t gid; - int no_pgrp = 0; + bool no_pgrp = 0; proc = get_process (process); p = XPROCESS (proc); @@ -6161,7 +6163,7 @@ /* If process has terminated, stop waiting for its output. */ if (WIFSIGNALED (status) || WIFEXITED (status)) { - int clear_desc_flag = 0; + bool clear_desc_flag = 0; p->alive = 0; if (p->infd >= 0) clear_desc_flag = 1; @@ -6504,10 +6506,10 @@ # ifdef USABLE_SIGIO -/* Return nonzero if *MASK has a bit set +/* Return true if *MASK has a bit set that corresponds to one of the keyboard input descriptors. */ -static int +static bool keyboard_bit_set (fd_set *mask) { int fd; @@ -6557,7 +6559,7 @@ Return true if we received input from any process. */ -int +bool wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, bool do_display, Lisp_Object wait_for_cell, @@ -6589,7 +6591,7 @@ while (1) { - int timeout_reduced_for_timers = 0; + bool timeout_reduced_for_timers = 0; SELECT_TYPE waitchannels; int xerrno; @@ -6940,9 +6942,9 @@ kbd_is_on_hold = 0; } -/* Return non-zero if keyboard input is on hold, zero otherwise. */ +/* Return true if keyboard input is on hold, zero otherwise. */ -int +bool kbd_on_hold_p (void) { return kbd_is_on_hold; === modified file 'src/process.h' --- src/process.h 2013-01-02 16:13:04 +0000 +++ src/process.h 2013-03-08 02:32:21 +0000 @@ -159,7 +159,7 @@ gnutls_anon_client_credentials_t gnutls_anon_cred; int gnutls_log_level; int gnutls_handshakes_tried; - int gnutls_p; + unsigned int gnutls_p : 1; #endif }; @@ -185,9 +185,9 @@ } #endif -/* Nonzero means don't run process sentinels. This is used +/* True means don't run process sentinels. This is used when exiting. */ -extern int inhibit_sentinels; +extern bool inhibit_sentinels; extern Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname; extern Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime; @@ -209,7 +209,7 @@ extern void hold_keyboard_input (void); extern void unhold_keyboard_input (void); -extern int kbd_on_hold_p (void); +extern bool kbd_on_hold_p (void); typedef void (*fd_callback) (int fd, void *data); ------------------------------------------------------------ revno: 111969 committer: Jay Belanger branch nick: trunk timestamp: Thu 2013-03-07 20:11:25 -0600 message: * doc/misc/calc.texi (Basic Operations on Units): Fix cross-reference. * calc/calc-units.el (calc-convert-units): Fix the way that default new units are stored. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-03-07 10:24:23 +0000 +++ doc/misc/ChangeLog 2013-03-08 02:11:25 +0000 @@ -1,3 +1,8 @@ +2013-03-08 Jay Belanger + + * calc.texi (Basic Operations on Units): Fix + cross-reference. + 2013-03-07 Katsumi Yamaoka * gnus-faq.texi (FAQ 3-11): Now Gnus supports POP3 UIDL. === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2013-02-13 04:31:09 +0000 +++ doc/misc/calc.texi 2013-03-08 02:11:25 +0000 @@ -27918,8 +27918,8 @@ be simplified to 12, then @kbd{u c} will still prompt for both old units and new units. You can ignore the prompt for old units with @key{RET}, or turn off the prompt by setting the customizable variable -@code{calc-allow-units-as-numbers} to @code{nil}. -@pxref{Customizing Calc}) Assuming the old and new units you give are +@code{calc-allow-units-as-numbers} to @code{nil}; +@pxref{Customizing Calc}.) Assuming the old and new units you give are consistent with each other, the result also will not contain any units. For example, @kbd{@w{u c} cm @key{RET} in @key{RET}} converts the number 2 on the stack to 5.08. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-07 22:35:47 +0000 +++ lisp/ChangeLog 2013-03-08 02:11:25 +0000 @@ -1,3 +1,8 @@ +2013-03-08 Jay Belanger + + * calc/calc-units.el (calc-convert-units): Fix the way that default + new units are stored. + 2013-03-07 Karl Fogel * bookmark.el: Define a face to highlight bookmark names in === modified file 'lisp/calc/calc-units.el' --- lisp/calc/calc-units.el 2013-02-09 23:17:05 +0000 +++ lisp/calc/calc-units.el 2013-03-08 02:11:25 +0000 @@ -503,11 +503,13 @@ (comp (eq (car-safe units) '+))) (unless (or unew std) (error "No units specified")) - (let ((res - (if std - (math-simplify-units (math-to-standard-units expr (nth 1 std))) - (math-convert-units expr units (and uoldname (not (equal uoldname "1"))))))) - (math-put-default-units res (if comp units)) + (let* ((noold (and uoldname (not (equal uoldname "1")))) + (res + (if std + (math-simplify-units (math-to-standard-units expr (nth 1 std))) + (math-convert-units expr units noold)))) + (unless std + (math-put-default-units (if noold units res) (if comp units))) (calc-enter-result 1 "cvun" res)))))) (defun calc-autorange-units (arg) ------------------------------------------------------------ revno: 111968 committer: Dmitry Antipov branch nick: trunk timestamp: Fri 2013-03-08 03:37:36 +0400 message: * bidi.c (bidi_fetch_char): Swap first and second arguments to match other functions accepting character and byte positions. Adjust comment. (bidi_resolve_explicit_1, bidi_level_of_next_char): Adjust users. (bidi_paragraph_init): Likewise. Use DEC_BOTH which is faster when you need just to move to the previous buffer position. * xdisp.c (Fcurrent_bidi_paragraph_direction): Use DEC_BOTH. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-07 11:31:07 +0000 +++ src/ChangeLog 2013-03-07 23:37:36 +0000 @@ -1,3 +1,13 @@ +2013-03-08 Dmitry Antipov + + * bidi.c (bidi_fetch_char): Swap first and second arguments + to match other functions accepting character and byte positions. + Adjust comment. + (bidi_resolve_explicit_1, bidi_level_of_next_char): Adjust users. + (bidi_paragraph_init): Likewise. Use DEC_BOTH which is faster + when you need just to move to the previous buffer position. + * xdisp.c (Fcurrent_bidi_paragraph_direction): Use DEC_BOTH. + 2013-03-07 Eli Zaretskii * .gdbinit (prowlims): Display the enabled_p flag of the row. === modified file 'src/bidi.c' --- src/bidi.c 2013-03-06 16:35:23 +0000 +++ src/bidi.c 2013-03-07 23:37:36 +0000 @@ -910,7 +910,7 @@ return STRING_CHAR (s); } -/* Fetch and return the character at BYTEPOS/CHARPOS. If that +/* Fetch and return the character at CHARPOS/BYTEPOS. If that character is covered by a display string, treat the entire run of covered characters as a single character, either u+2029 or u+FFFC, and return their combined length in CH_LEN and NCHARS. DISP_POS @@ -925,7 +925,7 @@ string to iterate, or NULL if iterating over a buffer or a Lisp string; in the latter case, STRING->lstring is the Lisp string. */ static int -bidi_fetch_char (ptrdiff_t bytepos, ptrdiff_t charpos, ptrdiff_t *disp_pos, +bidi_fetch_char (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t *disp_pos, int *disp_prop, struct bidi_string_data *string, bool frame_window_p, ptrdiff_t *ch_len, ptrdiff_t *nchars) { @@ -1220,7 +1220,7 @@ bytepos = pstartbyte; if (!string_p) pos = BYTE_TO_CHAR (bytepos); - ch = bidi_fetch_char (bytepos, pos, &disp_pos, &disp_prop, + ch = bidi_fetch_char (pos, bytepos, &disp_pos, &disp_prop, &bidi_it->string, bidi_it->frame_window_p, &ch_len, &nchars); type = bidi_get_type (ch, NEUTRAL_DIR); @@ -1248,7 +1248,7 @@ && bidi_at_paragraph_end (pos, bytepos) >= -1) break; /* Fetch next character and advance to get past it. */ - ch = bidi_fetch_char (bytepos, pos, &disp_pos, + ch = bidi_fetch_char (pos, bytepos, &disp_pos, &disp_prop, &bidi_it->string, bidi_it->frame_window_p, &ch_len, &nchars); pos += nchars; @@ -1279,8 +1279,7 @@ /* FXIME: What if p is covered by a display string? See also a FIXME inside bidi_find_paragraph_start. */ - p--; - pbyte = CHAR_TO_BYTE (p); + DEC_BOTH (p, pbyte); prevpbyte = bidi_find_paragraph_start (p, pbyte); } pstartbyte = prevpbyte; @@ -1398,7 +1397,7 @@ /* Fetch the character at BYTEPOS. If it is covered by a display string, treat the entire run of covered characters as a single character u+FFFC. */ - curchar = bidi_fetch_char (bidi_it->bytepos, bidi_it->charpos, + curchar = bidi_fetch_char (bidi_it->charpos, bidi_it->bytepos, &bidi_it->disp_pos, &bidi_it->disp_prop, &bidi_it->string, bidi_it->frame_window_p, &bidi_it->ch_len, &bidi_it->nchars); @@ -2191,7 +2190,7 @@ if (bidi_it->nchars <= 0) emacs_abort (); do { - ch = bidi_fetch_char (bpos += clen, cpos += nc, &disp_pos, &dpp, &bs, + ch = bidi_fetch_char (cpos += nc, bpos += clen, &disp_pos, &dpp, &bs, fwp, &clen, &nc); if (ch == '\n' || ch == BIDI_EOB) chtype = NEUTRAL_B; === modified file 'src/xdisp.c' --- src/xdisp.c 2013-03-06 16:35:23 +0000 +++ src/xdisp.c 2013-03-07 23:37:36 +0000 @@ -19910,10 +19910,7 @@ to make sure we are within that paragraph. To that end, find the previous non-empty line. */ if (pos >= ZV && pos > BEGV) - { - pos--; - bytepos = CHAR_TO_BYTE (pos); - } + DEC_BOTH (pos, bytepos); if (fast_looking_at (build_string ("[\f\t ]*\n"), pos, bytepos, ZV, ZV_BYTE, Qnil) > 0) { ------------------------------------------------------------ revno: 111967 committer: Karl Fogel branch nick: trunk timestamp: Thu 2013-03-07 16:35:47 -0600 message: * bookmark.el: Define a face to highlight bookmark names in bookmark menu buffers, where the default is a bold face similarly to buffer names in buffer menu buffers. Patch by Matthias Meulien . (bookmark-menu-bookmark): New face to highlight bookmark names. (bookmark-insert-location): Removes dupplicated text property to conform to buffer list (see `list-buffers') (bookmark-bmenu-list, bookmark-bmenu-hide-filenames): Apply face `bookmark-menu-bookmark' to bookmark names. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-07 22:33:22 +0000 +++ lisp/ChangeLog 2013-03-07 22:35:47 +0000 @@ -1,5 +1,18 @@ 2013-03-07 Karl Fogel + * bookmark.el: Define a face to highlight bookmark names in + bookmark menu buffers, where the default is a bold face similarly + to buffer names in buffer menu buffers. Patch by Matthias Meulien + . + + (bookmark-menu-bookmark): New face to highlight bookmark names. + (bookmark-insert-location): Remove duplicated text property to + conform to buffer list (see `list-buffers'). + (bookmark-bmenu-list, bookmark-bmenu-hide-filenames): Apply face + `bookmark-menu-bookmark' to bookmark names. + +2013-03-07 Karl Fogel + * bookmark.el: Display the bookmark list header similarly to the buffer list header (see `list-buffers'), where the default is now an immovable/immutable header line. Patch by Matthias Meulien === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2013-03-07 22:33:22 +0000 +++ lisp/bookmark.el 2013-03-07 22:35:47 +0000 @@ -156,6 +156,10 @@ :type 'boolean :group 'bookmark) +(defface bookmark-menu-bookmark + '((t (:weight bold))) + "Face used to highlight bookmark names in bookmark menu buffers." + :group 'bookmark) (defcustom bookmark-menu-length 70 "Maximum length of a bookmark name displayed on a popup menu." @@ -1182,18 +1186,7 @@ minibuffer history list `bookmark-history'." (interactive (list (bookmark-completing-read "Insert bookmark location"))) (or no-history (bookmark-maybe-historicize-string bookmark-name)) - (let ((start (point))) - (prog1 - (insert (bookmark-location bookmark-name)) - (if (display-mouse-p) - (add-text-properties - start - (save-excursion (re-search-backward - "[^ \t]") - (1+ (point))) - '(mouse-face highlight - follow-link t - help-echo "mouse-2: go to this bookmark in other window")))))) + (insert (bookmark-location bookmark-name))) ;;;###autoload (defalias 'bookmark-locate 'bookmark-insert-location) @@ -1578,7 +1571,8 @@ (when (display-mouse-p) (add-text-properties (+ bookmark-bmenu-marks-width start) end - '(mouse-face highlight + '(font-lock-face bookmark-menu-bookmark + mouse-face highlight follow-link t help-echo "mouse-2: go to this bookmark in other window"))) (insert "\n"))) @@ -1726,8 +1720,9 @@ (if (display-mouse-p) (add-text-properties start (point) - '(mouse-face - highlight follow-link t help-echo + '(font-lock-face bookmark-menu-bookmark + mouse-face highlight + follow-link t help-echo "mouse-2: go to this bookmark in other window")))) (forward-line 1))))))) ------------------------------------------------------------ revno: 111966 committer: Karl Fogel branch nick: trunk timestamp: Thu 2013-03-07 16:33:22 -0600 message: * bookmark.el: Display the bookmark list header similarly to the buffer list header (see `list-buffers'), where the default is now an immovable/immutable header line. Patch by Matthias Meulien with a few tweaks by me. (bookmark-bmenu-use-header-line): New variable. (bookmark-bmenu-inline-header-height): New name for `bookmark-bmenu-header-height', to avoid confusion with the code for the new immovable header. All references changed. (bookmark-bmenu-set-header): New function. (bookmark-bmenu-list, bookmark-bmenu-toggle-filenames): Conditionalize header construction accordingly. (bookmark-bmenu-ensure-position): Conditionalize the skipping of the inline header height. (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames): Conditionalize the skipping of the inline header height. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-07 16:08:33 +0000 +++ lisp/ChangeLog 2013-03-07 22:33:22 +0000 @@ -1,3 +1,22 @@ +2013-03-07 Karl Fogel + + * bookmark.el: Display the bookmark list header similarly to the + buffer list header (see `list-buffers'), where the default is now + an immovable/immutable header line. Patch by Matthias Meulien + with a few tweaks by me. + + (bookmark-bmenu-use-header-line): New variable. + (bookmark-bmenu-inline-header-height): New name for + `bookmark-bmenu-header-height', to avoid confusion with the code + for the new immovable header. All references changed. + (bookmark-bmenu-set-header): New function. + (bookmark-bmenu-list, bookmark-bmenu-toggle-filenames): + Conditionalize header construction accordingly. + (bookmark-bmenu-ensure-position): Conditionalize the skipping of + the inline header height. + (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames): + Conditionalize the skipping of the inline header height. + 2013-03-07 Dmitry Gutov * progmodes/js.el (js--multi-line-declaration-indentation): Merge === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2013-01-02 16:13:04 +0000 +++ lisp/bookmark.el 2013-03-07 22:33:22 +0000 @@ -129,9 +129,15 @@ :type 'boolean :group 'bookmark) +(defcustom bookmark-bmenu-use-header-line t + "Non-nil means to use an immovable header line, as opposed to inline +text at the top of the buffer." + :type 'boolean + :group 'bookmark) -(defconst bookmark-bmenu-header-height 2 - "Number of lines used for the *Bookmark List* header.") +(defconst bookmark-bmenu-inline-header-height 2 + "Number of lines used for the *Bookmark List* header +\(only significant when `bookmark-bmenu-use-header-line' is nil\).") (defconst bookmark-bmenu-marks-width 2 "Number of columns (chars) used for the *Bookmark List* marks column, @@ -1552,7 +1558,8 @@ (set-buffer buf))) (let ((inhibit-read-only t)) (erase-buffer) - (insert "% Bookmark\n- --------\n") + (if (not bookmark-bmenu-use-header-line) + (insert "% Bookmark\n- --------\n")) (add-text-properties (point-min) (point) '(font-lock-face bookmark-menu-heading)) (dolist (full-record (bookmark-maybe-sort-alist)) @@ -1577,8 +1584,10 @@ (insert "\n"))) (set-buffer-modified-p (not (= bookmark-alist-modification-count 0))) (goto-char (point-min)) - (forward-line 2) (bookmark-bmenu-mode) + (if bookmark-bmenu-use-header-line + (bookmark-bmenu-set-header) + (forward-line bookmark-bmenu-inline-header-height)) (if bookmark-bmenu-toggle-filenames (bookmark-bmenu-toggle-filenames t)))) @@ -1587,7 +1596,25 @@ ;;;###autoload (defalias 'edit-bookmarks 'bookmark-bmenu-list) - +(defun bookmark-bmenu-set-header () + "Sets the immutable header line." + (let ((header (concat "%% " "Bookmark"))) + (when bookmark-bmenu-toggle-filenames + (setq header (concat header + (make-string (- bookmark-bmenu-file-column + (- (length header) 3)) ?\s) + "File"))) + (let ((pos 0)) + (while (string-match "[ \t\n]+" header pos) + (setq pos (match-end 0)) + (put-text-property (match-beginning 0) pos 'display + (list 'space :align-to (- pos 1)) + header))) + (put-text-property 0 2 'face 'fixed-pitch header) + (setq header (concat (propertize " " 'display '(space :align-to 0)) + header)) + ;; Code derived from `buff-menu.el'. + (setq header-line-format header))) (define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu" "Major mode for editing a list of bookmarks. @@ -1640,7 +1667,9 @@ (setq bookmark-bmenu-toggle-filenames nil)) (t (bookmark-bmenu-show-filenames) - (setq bookmark-bmenu-toggle-filenames t)))) + (setq bookmark-bmenu-toggle-filenames t))) + (when bookmark-bmenu-use-header-line + (bookmark-bmenu-set-header))) (defun bookmark-bmenu-show-filenames (&optional force) @@ -1653,7 +1682,8 @@ (save-excursion (save-window-excursion (goto-char (point-min)) - (forward-line 2) + (if (not bookmark-bmenu-use-header-line) + (forward-line bookmark-bmenu-inline-header-height)) (setq bookmark-bmenu-hidden-bookmarks ()) (let ((inhibit-read-only t)) (while (< (point) (point-max)) @@ -1681,7 +1711,8 @@ (with-buffer-modified-unmodified (save-excursion (goto-char (point-min)) - (forward-line 2) + (if (not bookmark-bmenu-use-header-line) + (forward-line bookmark-bmenu-inline-header-height)) (setq bookmark-bmenu-hidden-bookmarks (nreverse bookmark-bmenu-hidden-bookmarks)) (let ((inhibit-read-only t)) @@ -1705,9 +1736,11 @@ "If point is not on a bookmark line, move it to one. If before the first bookmark line, move to the first; if after the last full line, move to the last full line. The return value is undefined." - (cond ((< (count-lines (point-min) (point)) bookmark-bmenu-header-height) + (cond ((and (not bookmark-bmenu-use-header-line) + (< (count-lines (point-min) (point)) + bookmark-bmenu-inline-header-height)) (goto-char (point-min)) - (forward-line bookmark-bmenu-header-height)) + (forward-line bookmark-bmenu-inline-header-height)) ((and (bolp) (eobp)) (beginning-of-line 0)))) ------------------------------------------------------------ revno: 111965 committer: Dmitry Gutov branch nick: trunk timestamp: Thu 2013-03-07 20:08:33 +0400 message: * lisp/progmodes/js.el (js--multi-line-declaration-indentation): Merge from js2-mode (https://github.com/mooz/js2-mode/issues/89). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-06 18:56:29 +0000 +++ lisp/ChangeLog 2013-03-07 16:08:33 +0000 @@ -1,3 +1,8 @@ +2013-03-07 Dmitry Gutov + + * progmodes/js.el (js--multi-line-declaration-indentation): Merge + from js2-mode (https://github.com/mooz/js2-mode/issues/89). + 2013-03-06 Dmitry Gutov * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Only === modified file 'lisp/progmodes/js.el' --- lisp/progmodes/js.el 2013-02-13 00:53:07 +0000 +++ lisp/progmodes/js.el 2013-03-07 16:08:33 +0000 @@ -1785,7 +1785,7 @@ (or (eq (char-before) ?,) (and (not (eq (char-before) ?\;)) (prog2 - (skip-chars-backward "[[:punct:]]") + (skip-syntax-backward ".") (looking-at js--indent-operator-re) (js--backward-syntactic-ws)) (not (eq (char-before) ?\;))) ------------------------------------------------------------ revno: 111964 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2013-03-07 13:31:07 +0200 message: src/.gdbinit (prowlims): Display the enabled_p flag of the row. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2013-02-01 07:23:18 +0000 +++ src/.gdbinit 2013-03-07 11:31:07 +0000 @@ -606,7 +606,7 @@ end define prowlims - printf "edges=(%d,%d),r2l=%d,cont=%d,trunc=(%d,%d),at_zv=%d\n", $arg0->minpos.charpos, $arg0->maxpos.charpos, $arg0->reversed_p, $arg0->continued_p, $arg0->truncated_on_left_p, $arg0->truncated_on_right_p, $arg0->ends_at_zv_p + printf "edges=(%d,%d),enb=%d,r2l=%d,cont=%d,trunc=(%d,%d),at_zv=%d\n", $arg0->minpos.charpos, $arg0->maxpos.charpos, $arg0->enabled_p, $arg0->reversed_p, $arg0->continued_p, $arg0->truncated_on_left_p, $arg0->truncated_on_right_p, $arg0->ends_at_zv_p end document prowlims Print important attributes of a glyph_row structure. === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-07 04:42:59 +0000 +++ src/ChangeLog 2013-03-07 11:31:07 +0000 @@ -1,3 +1,7 @@ +2013-03-07 Eli Zaretskii + + * .gdbinit (prowlims): Display the enabled_p flag of the row. + 2013-03-07 Dmitry Antipov Avoid character to byte conversions in motion subroutines. ------------------------------------------------------------ revno: 111963 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2013-03-07 10:24:23 +0000 message: doc/misc/gnus-faq.texi (FAQ 3-11): Now Gnus supports POP3 UIDL diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-03-06 14:24:39 +0000 +++ doc/misc/ChangeLog 2013-03-07 10:24:23 +0000 @@ -1,3 +1,7 @@ +2013-03-07 Katsumi Yamaoka + + * gnus-faq.texi (FAQ 3-11): Now Gnus supports POP3 UIDL. + 2013-03-06 Alan Mackenzie * cc-mode.texi (Custom Line-Up): Clarify position of point on === modified file 'doc/misc/gnus-faq.texi' --- doc/misc/gnus-faq.texi 2013-02-22 17:13:05 +0000 +++ doc/misc/gnus-faq.texi 2013-03-07 10:24:23 +0000 @@ -705,32 +705,9 @@ @subsubheading Answer -First of all, that's not the way POP3 is intended to work, -if you have the possibility, you should use the IMAP -Protocol if you want your messages to stay on the -server. Nevertheless there might be situations where you -need the feature, but sadly Gnus itself has no predefined -functionality to do so. - -However this is Gnus county so there are possibilities to -achieve what you want. The easiest way is to get an external -program which retrieves copies of the mail and stores them -on disk, so Gnus can read it from there. On Unix systems you -could use, e.g., fetchmail for this, on MS Windows you can use -Hamster, an excellent local news and mail server. - -The other solution would be, to replace the method Gnus -uses to get mail from POP3 servers by one which is capable -of leaving the mail on the server. If you use XEmacs, get -the package mail-lib, it includes an enhanced pop3.el, -look in the file, there's documentation on how to tell -Gnus to use it and not to delete the retrieved mail. For -GNU Emacs look for the file epop3.el which can do the same -(If you know the home of this file, please send me an -e-mail). You can also tell Gnus to use an external program -(e.g., fetchmail) to fetch your mail, see the info node -"Mail Source Specifiers" in the Gnus manual on how to do -it. +Yes, if the POP3 server supports the UIDL control (maybe almost servers +do it nowadays). To do that, add a @code{:leave VALUE} pair to each +POP3 mail source. See @pxref{Mail Source Specifiers} for VALUE. @node FAQ 4 - Reading messages @subsection Reading messages ------------------------------------------------------------ revno: 111962 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-03-06 23:28:51 -0800 message: Specify utf-8, not iso-8859-1, for ASCII files. diff: === modified file 'doc/misc/emacs-mime.texi' --- doc/misc/emacs-mime.texi 2013-03-04 08:45:03 +0000 +++ doc/misc/emacs-mime.texi 2013-03-07 07:28:51 +0000 @@ -1890,5 +1890,5 @@ @c Local Variables: @c mode: texinfo -@c coding: iso-8859-1 +@c coding: utf-8 @c End: === modified file 'doc/misc/gnus-coding.texi' --- doc/misc/gnus-coding.texi 2013-01-01 09:11:05 +0000 +++ doc/misc/gnus-coding.texi 2013-03-07 07:28:51 +0000 @@ -387,5 +387,5 @@ @c Local Variables: @c mode: texinfo -@c coding: iso-8859-1 +@c coding: utf-8 @c End: === modified file 'lisp/gnus/gnus-cite.el' --- lisp/gnus/gnus-cite.el 2013-01-02 16:13:04 +0000 +++ lisp/gnus/gnus-cite.el 2013-03-07 07:28:51 +0000 @@ -1250,7 +1250,7 @@ (provide 'gnus-cite) ;; Local Variables: -;; coding: iso-8859-1 +;; coding: utf-8 ;; End: ;;; gnus-cite.el ends here === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2013-01-02 16:13:04 +0000 +++ lisp/ibuffer.el 2013-03-07 07:28:51 +0000 @@ -3030,7 +3030,7 @@ (run-hooks 'ibuffer-load-hook) ;; Local Variables: -;; coding: iso-8859-1 +;; coding: utf-8 ;; End: ;;; ibuffer.el ends here