Now on revision 110230. ------------------------------------------------------------ revno: 110230 committer: Chong Yidong branch nick: trunk timestamp: Fri 2012-09-28 13:19:55 +0800 message: * verilog-mode.el (verilog-auto-inst-interfaced-ports): Add :version tag. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 22:55:03 +0000 +++ lisp/ChangeLog 2012-09-28 05:19:55 +0000 @@ -1,3 +1,8 @@ +2012-09-28 Chong Yidong + + * progmodes/verilog-mode.el (verilog-auto-inst-interfaced-ports): + Add :version tag. + 2012-09-27 Stefan Monnier * json.el (json-encode-char): Codes 127-160 aren't "ASCII printable". === modified file 'lisp/progmodes/verilog-mode.el' --- lisp/progmodes/verilog-mode.el 2012-09-27 03:30:46 +0000 +++ lisp/progmodes/verilog-mode.el 2012-09-28 05:19:55 +0000 @@ -1130,7 +1130,8 @@ (defcustom verilog-auto-inst-interfaced-ports nil "Non-nil means include interfaced ports in AUTOINST expansions." :group 'verilog-mode-auto - :type 'boolean) + :type 'boolean + :version "24.3") (put 'verilog-auto-inst-interfaced-ports 'safe-local-variable 'verilog-booleanp) (defcustom verilog-auto-input-ignore-regexp nil ------------------------------------------------------------ revno: 110229 committer: Paul Eggert branch nick: trunk timestamp: Thu 2012-09-27 16:02:23 -0700 message: Link with LIB_TIMER_TIME as needed. diff: === modified file 'ChangeLog' --- ChangeLog 2012-09-27 01:06:23 +0000 +++ ChangeLog 2012-09-27 23:02:23 +0000 @@ -5,6 +5,7 @@ . * configure.ac (gl_THREADLIB): Define to empty, since Emacs does threads its own way. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. 2012-09-23 Paul Eggert === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-08-28 16:01:59 +0000 +++ msdos/ChangeLog 2012-09-27 23:02:23 +0000 @@ -1,3 +1,8 @@ +2012-09-27 Paul Eggert + + Check more robustly for timer_settime. + * sed1v2.inp, sed3v2.inp (LIB_TIMER_TIME): New macro. + 2012-08-04 Eli Zaretskii * sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2012-08-01 15:19:51 +0000 +++ msdos/sed1v2.inp 2012-09-27 23:02:23 +0000 @@ -106,6 +106,7 @@ /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// /^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g +/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// === modified file 'msdos/sed3v2.inp' --- msdos/sed3v2.inp 2012-06-30 15:32:51 +0000 +++ msdos/sed3v2.inp 2012-09-27 23:02:23 +0000 @@ -36,6 +36,7 @@ /^LIBS_MAIL *=/s/@[^@\n]*@//g /^LIBS_SYSTEM *=/s/@[^@\n]*@//g /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g +/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos! /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// === modified file 'src/ChangeLog' --- src/ChangeLog 2012-09-27 01:06:23 +0000 +++ src/ChangeLog 2012-09-27 23:02:23 +0000 @@ -1,6 +1,8 @@ 2012-09-27 Paul Eggert Check more robustly for timer_settime. + * Makefile.in (LIB_TIMER_TIME): New macro. + (LIBES): Add it. * atimer.c (alarm_timer, alarm_timer_ok, set_alarm, init_atimer): Use HAVE_TIMER_SETTIME, not SIGEV_SIGNAL, to decide whether to call timer_settime. === modified file 'src/Makefile.in' --- src/Makefile.in 2012-09-26 15:19:10 +0000 +++ src/Makefile.in 2012-09-27 23:02:23 +0000 @@ -153,6 +153,7 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@ LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ +LIB_TIMER_TIME=@LIB_TIMER_TIME@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ @@ -385,8 +386,8 @@ ## duplicated symbols. If the standard libraries were compiled ## with GCC, we might need LIB_GCC again after them. LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ - $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) \ - $(LIB_EXECINFO) \ + $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_TIMER_TIME) \ + $(DBUS_LIBS) $(LIB_EXECINFO) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ ------------------------------------------------------------ revno: 110228 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-09-27 18:55:03 -0400 message: * lisp/json.el (json-encode-char): Codes 127 isn't "ASCII printable" either. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 13:10:54 +0000 +++ lisp/ChangeLog 2012-09-27 22:55:03 +0000 @@ -1,6 +1,6 @@ 2012-09-27 Stefan Monnier - * json.el (json-encode-char): Codes 128-160 aren't "ASCII printable". + * json.el (json-encode-char): Codes 127-160 aren't "ASCII printable". 2012-09-27 Glenn Morris === modified file 'lisp/json.el' --- lisp/json.el 2012-09-27 13:10:54 +0000 +++ lisp/json.el 2012-09-27 22:55:03 +0000 @@ -315,7 +315,7 @@ (control-char (format "\\%c" control-char)) ;; ASCIIish printable character. - ((and (> char 31) (< char 128)) + ((and (> char 31) (< char 127)) (format "%c" char)) ;; Fallback: UCS code point in \uNNNN form. (t ------------------------------------------------------------ revno: 110227 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-09-27 09:10:54 -0400 message: * lisp/json.el (json-encode-char): Codes 128-160 aren't "ASCII printable". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 07:28:48 +0000 +++ lisp/ChangeLog 2012-09-27 13:10:54 +0000 @@ -1,3 +1,7 @@ +2012-09-27 Stefan Monnier + + * json.el (json-encode-char): Codes 128-160 aren't "ASCII printable". + 2012-09-27 Glenn Morris * faces.el (x-display-name): Declare (for without-x builds). === modified file 'lisp/json.el' --- lisp/json.el 2012-08-22 01:29:22 +0000 +++ lisp/json.el 2012-09-27 13:10:54 +0000 @@ -311,13 +311,13 @@ (setq char (json-encode-char0 char 'ucs)) (let ((control-char (car (rassoc char json-special-chars)))) (cond - ;; Special JSON character (\n, \r, etc.) + ;; Special JSON character (\n, \r, etc.). (control-char (format "\\%c" control-char)) - ;; ASCIIish printable character - ((and (> char 31) (< char 161)) + ;; ASCIIish printable character. + ((and (> char 31) (< char 128)) (format "%c" char)) - ;; Fallback: UCS code point in \uNNNN form + ;; Fallback: UCS code point in \uNNNN form. (t (format "\\u%04x" char))))) ------------------------------------------------------------ revno: 110226 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-09-27 06:17:43 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-09-17 10:17:50 +0000 +++ autogen/Makefile.in 2012-09-27 10:17:43 +0000 @@ -36,7 +36,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timespec-add timespec-sub utimens warnings +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub utimens warnings VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -95,11 +95,11 @@ $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ - $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/utimbuf.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_t.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/timer_time.m4 $(top_srcdir)/m4/timespec.m4 \ + $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/warnings.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -566,6 +566,7 @@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ LIB_STANDARD = @LIB_STANDARD@ +LIB_TIMER_TIME = @LIB_TIMER_TIME@ LN_S = @LN_S@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ === modified file 'autogen/aclocal.m4' --- autogen/aclocal.m4 2012-08-25 10:17:28 +0000 +++ autogen/aclocal.m4 2012-09-27 10:17:43 +0000 @@ -1043,6 +1043,7 @@ m4_include([m4/sys_time_h.m4]) m4_include([m4/time_h.m4]) m4_include([m4/time_r.m4]) +m4_include([m4/timer_time.m4]) m4_include([m4/timespec.m4]) m4_include([m4/tm_gmtoff.m4]) m4_include([m4/unistd_h.m4]) === modified file 'autogen/config.in' --- autogen/config.in 2012-09-17 10:17:50 +0000 +++ autogen/config.in 2012-09-27 10:17:43 +0000 @@ -958,6 +958,9 @@ /* Define to 1 if you have the tiff library (-ltiff). */ #undef HAVE_TIFF +/* Define to 1 if you have the `timer_settime' function. */ +#undef HAVE_TIMER_SETTIME + /* Define if struct tm has the tm_gmtoff member. */ #undef HAVE_TM_GMTOFF === modified file 'autogen/configure' --- autogen/configure 2012-09-22 10:17:30 +0000 +++ autogen/configure 2012-09-27 10:17:43 +0000 @@ -631,6 +631,7 @@ HAVE_UNISTD_H NEXT_AS_FIRST_DIRECTIVE_UNISTD_H NEXT_UNISTD_H +LIB_TIMER_TIME PTHREAD_H_DEFINES_STRUCT_TIMESPEC SYS_TIME_H_DEFINES_STRUCT_TIMESPEC TIME_H_DEFINES_STRUCT_TIMESPEC @@ -5723,6 +5724,9 @@ test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi +# Avoid gnulib's threadlib module, as we do threads our own way. + + # Initialize gnulib right after choosing the compiler. ac_ext=c @@ -7006,6 +7010,7 @@ # Code from module sys_time: # Code from module time: # Code from module time_r: + # Code from module timer-time: # Code from module timespec: # Code from module timespec-add: # Code from module timespec-sub: @@ -19229,6 +19234,7 @@ + ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" " #include /* Mingw defines sigset_t not in , but in . */ @@ -21655,11 +21661,61 @@ LIB_PTHREAD_SIGMASK= - if test $ac_cv_func_pthread_sigmask = yes; then - : + + + if test "$gl_threads_api" = posix; then + if test $ac_cv_func_pthread_sigmask = yes; then + : + else + if test -n "$LIBMULTITHREAD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_sigmask in $LIBMULTITHREAD" >&5 +$as_echo_n "checking for pthread_sigmask in $LIBMULTITHREAD... " >&6; } +if test "${gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + gl_save_LIBS="$LIBS" + LIBS="$LIBS $LIBMULTITHREAD" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main () +{ +return pthread_sigmask (0, (sigset_t *) 0, (sigset_t *) 0); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes +else + gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gl_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&5 +$as_echo "$gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&6; } + if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then + LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD" + else + HAVE_PTHREAD_SIGMASK=0 + fi + else + HAVE_PTHREAD_SIGMASK=0 + fi + fi else - HAVE_PTHREAD_SIGMASK=0 - REPLACE_PTHREAD_SIGMASK=1 + if test $ac_cv_func_pthread_sigmask = yes; then + REPLACE_PTHREAD_SIGMASK=1 + else + HAVE_PTHREAD_SIGMASK=0 + fi fi @@ -23576,6 +23632,102 @@ + + + + + + LIB_TIMER_TIME= + + gl_saved_libs=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing timer_settime" >&5 +$as_echo_n "checking for library containing timer_settime... " >&6; } +if test "${ac_cv_search_timer_settime+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char timer_settime (); +int +main () +{ +return timer_settime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt posix4; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_timer_settime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_timer_settime+set}" = set; then : + break +fi +done +if test "${ac_cv_search_timer_settime+set}" = set; then : + +else + ac_cv_search_timer_settime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_timer_settime" >&5 +$as_echo "$ac_cv_search_timer_settime" >&6; } +ac_res=$ac_cv_search_timer_settime +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + test "$ac_cv_search_timer_settime" = "none required" || + LIB_TIMER_TIME=$ac_cv_search_timer_settime +fi + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef __GNU_LIBRARY__ + #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \ + && !defined __UCLIBC__ + Thread emulation available + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Thread" >/dev/null 2>&1; then : + LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBMULTITHREAD" +fi +rm -f conftest* + + for ac_func in timer_settime +do : + ac_fn_c_check_func "$LINENO" "timer_settime" "ac_cv_func_timer_settime" +if test "x$ac_cv_func_timer_settime" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TIMER_SETTIME 1 +_ACEOF + +fi +done + + LIBS=$gl_saved_libs + : ------------------------------------------------------------ revno: 110225 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-09-27 00:28:48 -0700 message: * lisp/faces.el (x-display-name): Declare (for without-x builds). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 07:26:22 +0000 +++ lisp/ChangeLog 2012-09-27 07:28:48 +0000 @@ -1,5 +1,7 @@ 2012-09-27 Glenn Morris + * faces.el (x-display-name): Declare (for without-x builds). + * linum.el (linum-format): Don't autoload it. Improve :type. * progmodes/tcl.el: Don't require outline when compiling. === modified file 'lisp/faces.el' --- lisp/faces.el 2012-08-26 02:57:07 +0000 +++ lisp/faces.el 2012-09-27 07:28:48 +0000 @@ -1867,6 +1867,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (declare-function x-parse-geometry "frame.c" (string)) +(defvar x-display-name) (defun x-handle-named-frame-geometry (parameters) "Add geometry parameters for a named frame to parameter list PARAMETERS. ------------------------------------------------------------ revno: 110224 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-09-27 00:26:22 -0700 message: * lisp/linum.el (linum-format): Don't autoload it. Improve :type. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 07:23:10 +0000 +++ lisp/ChangeLog 2012-09-27 07:26:22 +0000 @@ -1,5 +1,7 @@ 2012-09-27 Glenn Morris + * linum.el (linum-format): Don't autoload it. Improve :type. + * progmodes/tcl.el: Don't require outline when compiling. (outline-regexp, outline-level): Declare. * textmodes/sgml-mode.el: Don't require outline when compiling. === modified file 'lisp/linum.el' --- lisp/linum.el 2012-01-19 07:21:25 +0000 +++ lisp/linum.el 2012-09-27 07:26:22 +0000 @@ -44,7 +44,6 @@ "Show line numbers in the left margin." :group 'convenience) -;;;###autoload (defcustom linum-format 'dynamic "Format used to display line numbers. Either a format string like \"%7d\", `dynamic' to adapt the width @@ -52,7 +51,9 @@ argument and should evaluate to a string to be shown on that line. See also `linum-before-numbering-hook'." :group 'linum - :type 'sexp) + :type '(choice (string :tag "Format string") + (const :tag "Dynamic width" dynamic) + (function :tag "Function"))) (defface linum '((t :inherit (shadow default))) ------------------------------------------------------------ revno: 110223 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-09-27 00:23:10 -0700 message: Remove unnecessary require when compiling tcl.el * lisp/progmodes/tcl.el: Don't require outline when compiling. (outline-regexp, outline-level): Declare. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 07:21:51 +0000 +++ lisp/ChangeLog 2012-09-27 07:23:10 +0000 @@ -1,5 +1,7 @@ 2012-09-27 Glenn Morris + * progmodes/tcl.el: Don't require outline when compiling. + (outline-regexp, outline-level): Declare. * textmodes/sgml-mode.el: Don't require outline when compiling. (outline-regexp, outline-heading-end-regexp, outline-level): Declare. === modified file 'lisp/progmodes/tcl.el' --- lisp/progmodes/tcl.el 2012-04-09 13:05:48 +0000 +++ lisp/progmodes/tcl.el 2012-09-27 07:23:10 +0000 @@ -104,7 +104,6 @@ (eval-when-compile (require 'imenu) - (require 'outline) (require 'dabbrev) (require 'add-log)) @@ -544,6 +543,9 @@ ;; The mode itself. ;; +(defvar outline-regexp) +(defvar outline-level) + ;;;###autoload (define-derived-mode tcl-mode prog-mode "Tcl" "Major mode for editing Tcl code. ------------------------------------------------------------ revno: 110222 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-09-27 00:21:51 -0700 message: Remove unnecessary require when compiling sgml-mode.el * lisp/textmodes/sgml-mode.el: Don't require outline when compiling. (outline-regexp, outline-heading-end-regexp, outline-level): Declare. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 07:05:37 +0000 +++ lisp/ChangeLog 2012-09-27 07:21:51 +0000 @@ -1,5 +1,8 @@ 2012-09-27 Glenn Morris + * textmodes/sgml-mode.el: Don't require outline when compiling. + (outline-regexp, outline-heading-end-regexp, outline-level): Declare. + * term.el (term-ansi-reset): Try setting term-ansi-face-already-done to nil. (Bug#11785) === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2012-09-17 05:41:04 +0000 +++ lisp/textmodes/sgml-mode.el 2012-09-27 07:21:51 +0000 @@ -34,7 +34,6 @@ (eval-when-compile (require 'skeleton) - (require 'outline) (require 'cl-lib)) (defgroup sgml nil @@ -1938,6 +1937,10 @@ ("wbr" . "Enable
within ")) "Value of `sgml-tag-help' for HTML mode.") +(defvar outline-regexp) +(defvar outline-heading-end-regexp) +(defvar outline-level) + ;;;###autoload (define-derived-mode html-mode sgml-mode '(sgml-xml-mode "XHTML" "HTML") ------------------------------------------------------------ revno: 110221 fixes bug: http://debbugs.gnu.org/11785 committer: Glenn Morris branch nick: trunk timestamp: Thu 2012-09-27 00:05:37 -0700 message: * term.el (term-ansi-reset): Try setting term-ansi-face-already-done to nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 06:59:21 +0000 +++ lisp/ChangeLog 2012-09-27 07:05:37 +0000 @@ -1,5 +1,8 @@ 2012-09-27 Glenn Morris + * term.el (term-ansi-reset): + Try setting term-ansi-face-already-done to nil. (Bug#11785) + * vc/vc.el (vc-next-action): Only gripe about committing read-only files for RCS and SCCS. (Bug#9781) === modified file 'lisp/term.el' --- lisp/term.el 2012-09-25 04:13:02 +0000 +++ lisp/term.el 2012-09-27 07:05:37 +0000 @@ -994,7 +994,10 @@ (setq term-ansi-current-reverse nil) (setq term-ansi-current-color 0) (setq term-ansi-current-invisible nil) - (setq term-ansi-face-already-done t) + ;; Stefan thought this should be t, but could not remember why. + ;; Setting it to t seems to cause bug#11785. Setting it to nil + ;; again to see if there are other consequences... + (setq term-ansi-face-already-done nil) (setq term-ansi-current-bg-color 0)) (define-derived-mode term-mode fundamental-mode "Term" ------------------------------------------------------------ revno: 110220 fixes bug: http://debbugs.gnu.org/9781 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-09-26 23:59:21 -0700 message: Don't bother making files writable for commit with modern VCS * lisp/vc/vc.el (vc-next-action): Only gripe about committing read-only files for RCS and SCCS. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-09-27 03:31:58 +0000 +++ lisp/ChangeLog 2012-09-27 06:59:21 +0000 @@ -1,3 +1,8 @@ +2012-09-27 Glenn Morris + + * vc/vc.el (vc-next-action): Only gripe about committing read-only + files for RCS and SCCS. (Bug#9781) + 2012-09-27 Chong Yidong * progmodes/verilog-mode.el (verilog-mode-release-emacs): Fix last === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2012-09-25 04:13:02 +0000 +++ lisp/vc/vc.el 2012-09-27 06:59:21 +0000 @@ -1105,24 +1105,27 @@ ;; Files have local changes ((vc-compatible-state state 'edited) (let ((ready-for-commit files)) - ;; If files are edited but read-only, give user a chance to correct. - (dolist (file files) - ;; If committing a mix of removed and edited files, the - ;; fileset has state = 'edited. Rather than checking the - ;; state of each individual file in the fileset, it seems - ;; simplest to just check if the file exists. Bug#9781. - (when (and (file-exists-p file) (not (file-writable-p file))) - ;; Make the file+buffer read-write. - (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) - (error "Aborted")) - ;; Maybe we somehow lost permissions on the directory. - (condition-case nil - (set-file-modes file (logior (file-modes file) 128)) - (error (error "Unable to make file writable"))) - (let ((visited (get-file-buffer file))) - (when visited - (with-current-buffer visited - (read-only-mode -1)))))) + ;; CVS, SVN and bzr don't care about read-only (bug#9781). + ;; RCS does, SCCS might (someone should check...). + (when (memq backend '(RCS SCCS)) + ;; If files are edited but read-only, give user a chance to correct. + (dolist (file files) + ;; If committing a mix of removed and edited files, the + ;; fileset has state = 'edited. Rather than checking the + ;; state of each individual file in the fileset, it seems + ;; simplest to just check if the file exists. Bug#9781. + (when (and (file-exists-p file) (not (file-writable-p file))) + ;; Make the file+buffer read-write. + (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) + (error "Aborted")) + ;; Maybe we somehow lost permissions on the directory. + (condition-case nil + (set-file-modes file (logior (file-modes file) 128)) + (error (error "Unable to make file writable"))) + (let ((visited (get-file-buffer file))) + (when visited + (with-current-buffer visited + (read-only-mode -1))))))) ;; Allow user to revert files with no changes (save-excursion (dolist (file files)