Now on revision 107864. ------------------------------------------------------------ revno: 107864 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-04-11 13:43:47 +0800 message: * startup.el (command-line): Remove support for font-lock-face-attributes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 03:24:26 +0000 +++ lisp/ChangeLog 2012-04-11 05:43:47 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Chong Yidong + + * startup.el (command-line): Remove support for long-obsolete + variable font-lock-face-attributes. + 2012-04-11 Glenn Morris * vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug. === modified file 'lisp/startup.el' --- lisp/startup.el 2012-04-09 06:58:41 +0000 +++ lisp/startup.el 2012-04-11 05:43:47 +0000 @@ -1169,38 +1169,6 @@ (or mail-host-address (system-name)))))) - ;; Originally face attributes were specified via - ;; `font-lock-face-attributes'. Users then changed the default - ;; face attributes by setting that variable. However, we try and - ;; be back-compatible and respect its value if set except for - ;; faces where M-x customize has been used to save changes for the - ;; face. - (when (boundp 'font-lock-face-attributes) - (let ((face-attributes font-lock-face-attributes)) - (while face-attributes - (let* ((face-attribute (pop face-attributes)) - (face (car face-attribute))) - ;; Rustle up a `defface' SPEC from a - ;; `font-lock-face-attributes' entry. - (unless (get face 'saved-face) - (let ((foreground (nth 1 face-attribute)) - (background (nth 2 face-attribute)) - (bold-p (nth 3 face-attribute)) - (italic-p (nth 4 face-attribute)) - (underline-p (nth 5 face-attribute)) - face-spec) - (when foreground - (setq face-spec (cons ':foreground (cons foreground face-spec)))) - (when background - (setq face-spec (cons ':background (cons background face-spec)))) - (when bold-p - (setq face-spec (append '(:weight bold) face-spec))) - (when italic-p - (setq face-spec (append '(:slant italic) face-spec))) - (when underline-p - (setq face-spec (append '(:underline t) face-spec))) - (face-spec-set face (list (list t face-spec)) nil))))))) - ;; If parameter have been changed in the init file which influence ;; face realization, clear the face cache so that new faces will ;; be realized. ------------------------------------------------------------ revno: 107863 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 20:24:26 -0700 message: Add another vc-bzr test * lisp/vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug. * test/automated/vc-bzr.el (vc-bzr-test-faulty-bzr-autoloads): New test. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 02:36:04 +0000 +++ lisp/ChangeLog 2012-04-11 03:24:26 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug. + 2012-04-11 Stefan Monnier * window.el (window--state-get-1): Obey window-point-insertion-type. === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2012-04-11 02:06:59 +0000 +++ lisp/vc/vc-bzr.el 2012-04-11 03:24:26 +0000 @@ -410,7 +410,11 @@ ;; (unchanged . WARNING). FIXME unchanged is not the best status to ;; return in case of error. (with-temp-buffer - (with-demoted-errors (vc-bzr-command "status" t 0 file)) + ;; This is with-demoted-errors without the condition-case-unless-debug + ;; annoyance, which makes it fail during ert testing. + (let (err) + (condition-case err (vc-bzr-command "status" t 0 file) + (error (message "Error: %S" err) nil))) (let ((status 'unchanged)) ;; the only secure status indication in `bzr status' output ;; is a couple of lines following the pattern:: === modified file 'test/ChangeLog' --- test/ChangeLog 2012-02-13 18:45:36 +0000 +++ test/ChangeLog 2012-04-11 03:24:26 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Glenn Morris + + * automated/vc-bzr.el (vc-bzr-test-faulty-bzr-autoloads): New test. + 2012-02-13 Teodor Zlatanov * automated/url-future-tests.el (url-future-tests): Move from === modified file 'test/automated/vc-bzr.el' --- test/automated/vc-bzr.el 2012-01-05 09:46:05 +0000 +++ test/automated/vc-bzr.el 2012-04-11 03:24:26 +0000 @@ -1,6 +1,6 @@ ;;; vc-bzr.el --- tests for vc/vc-bzr.el -;; Copyright (C) 2011-2012 Free Software Foundation, Inc. +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Author: Glenn Morris @@ -98,4 +98,31 @@ (should (get-buffer "*vc-log*"))) (delete-directory tempdir t)))) +;; http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html +(ert-deftest vc-bzr-test-faulty-bzr-autoloads () + "Test we can generate autoloads in a bzr directory when bzr is faulty." + :expected-result (if (executable-find vc-bzr-program) :passed :failed) + (should (executable-find vc-bzr-program)) + (let* ((tempdir (make-temp-file "vc-bzr-test" t)) + (file (expand-file-name "foo.el" tempdir)) + (default-directory (file-name-as-directory tempdir)) + (generated-autoload-file (expand-file-name "loaddefs.el" tempdir))) + (unwind-protect + (progn + (call-process vc-bzr-program nil nil nil "init") + (with-temp-buffer + (insert ";;;###autoload +\(defun foo () \"foo\" (interactive) (message \"foo!\"))") + (write-region nil nil file nil 'silent)) + (call-process vc-bzr-program nil nil nil "add") + (call-process vc-bzr-program nil nil nil "commit" "-m" "Commit 1") + ;; Deleting dirstate ensures both that vc-bzr's status heuristic + ;; fails, so it has to call the external bzr status, and + ;; causes bzr status to fail. This simulates a broken bzr + ;; installation. + (delete-file ".bzr/checkout/dirstate") + (should (progn (update-directory-autoloads default-directory) + t))) + (delete-directory tempdir t)))) + ;;; vc-bzr.el ends here ------------------------------------------------------------ revno: 107862 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 22:36:04 -0400 message: * src/window.c (save_window_save): Obey window-point-insertion-type. * lisp/window.el (window--state-get-1): Idem. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 02:12:20 +0000 +++ lisp/ChangeLog 2012-04-11 02:36:04 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Stefan Monnier + + * window.el (window--state-get-1): Obey window-point-insertion-type. + 2012-04-11 Lennart Borgman * emacs-lisp/lisp.el (narrow-to-defun): `beginning-of-defun' goes === modified file 'lisp/window.el' --- lisp/window.el 2012-04-05 22:26:20 +0000 +++ lisp/window.el 2012-04-11 02:36:04 +0000 @@ -3643,7 +3643,11 @@ (scroll-bars . ,(window-scroll-bars window)) (vscroll . ,(window-vscroll window)) (dedicated . ,(window-dedicated-p window)) - (point . ,(if writable point (copy-marker point))) + (point . ,(if writable point + (copy-marker point + (buffer-local-value + 'window-point-insertion-type + buffer)))) (start . ,(if writable start (copy-marker start))))))))) (tail (when (memq type '(vc hc)) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-11 01:25:51 +0000 +++ src/ChangeLog 2012-04-11 02:36:04 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Stefan Monnier + + * window.c (save_window_save): Obey window-point-insertion-type. + 2012-04-11 Glenn Morris * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. === modified file 'src/window.c' --- src/window.c 2012-03-31 18:10:34 +0000 +++ src/window.c 2012-04-11 02:36:04 +0000 @@ -5945,6 +5945,8 @@ } else p->pointm = Fcopy_marker (w->pointm, Qnil); + XMARKER (p->pointm)->insertion_type + = !NILP (Vwindow_point_insertion_type); p->start = Fcopy_marker (w->start, Qnil); p->start_at_line_beg = w->start_at_line_beg; ------------------------------------------------------------ revno: 107861 fixes bug(s): http://debbugs.gnu.org/6157 author: Lennart Borgman committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 04:12:20 +0200 message: `narrow-to-defun' fixup * emacs-lisp/lisp.el (narrow-to-defun): `beginning-of-defun' goes to previous function when point is on the first character of a function. Take care of that in `narrow-to-defun'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 02:06:59 +0000 +++ lisp/ChangeLog 2012-04-11 02:12:20 +0000 @@ -1,3 +1,9 @@ +2012-04-11 Lennart Borgman + + * emacs-lisp/lisp.el (narrow-to-defun): `beginning-of-defun' goes + to previous function when point is on the first character of a + function. Take care of that in `narrow-to-defun' (bug#6157). + 2012-04-11 Glenn Morris * vc/vc-bzr.el (vc-bzr-status): Handle all errors, === modified file 'lisp/emacs-lisp/lisp.el' --- lisp/emacs-lisp/lisp.el 2012-02-23 08:13:48 +0000 +++ lisp/emacs-lisp/lisp.el 2012-04-11 02:12:20 +0000 @@ -447,7 +447,21 @@ ;; Try first in this order for the sake of languages with nested ;; functions where several can end at the same place as with ;; the offside rule, e.g. Python. - (beginning-of-defun) + + ;; Finding the start of the function is a bit problematic since + ;; `beginning-of-defun' when we are on the first character of + ;; the function might go to the previous function. + ;; + ;; Therefore we first move one character forward and then call + ;; `beginning-of-defun'. However now we must check that we did + ;; not move into the next function. + (let ((here (point))) + (unless (eolp) + (forward-char)) + (beginning-of-defun) + (when (< (point) here) + (goto-char here) + (beginning-of-defun))) (setq beg (point)) (end-of-defun) (setq end (point)) ------------------------------------------------------------ revno: 107860 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 22:06:59 -0400 message: * lisp/vc/vc-bzr.el (vc-bzr-status): Handle all errors, not just file-errors. Ref: http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 01:16:48 +0000 +++ lisp/ChangeLog 2012-04-11 02:06:59 +0000 @@ -1,5 +1,8 @@ 2012-04-11 Glenn Morris + * vc/vc-bzr.el (vc-bzr-status): Handle all errors, + not just file-errors. + * vc/vc-bzr.el (vc-bzr-sha1-program, sha1-program): Remove. (vc-bzr-sha1): Use internal sha1. === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2012-04-11 01:16:48 +0000 +++ lisp/vc/vc-bzr.el 2012-04-11 02:06:59 +0000 @@ -400,49 +400,52 @@ `ignored', `kindchanged', `modified', `removed', `renamed', `unknown', which directly correspond to `bzr status' output, or 'unchanged for files whose copy in the working tree is identical to the one -in the branch repository, or nil for files that are not -registered with Bzr. - -If any error occurred in running `bzr status', then return nil." +in the branch repository (or whose status not be determined)." +;; Doc used to also say the following, but AFAICS, it has never been true. +;; +;; ", or nil for files that are not registered with Bzr. +;; If any error occurred in running `bzr status', then return nil." +;; +;; Rather than returning nil in case of an error, it returns +;; (unchanged . WARNING). FIXME unchanged is not the best status to +;; return in case of error. (with-temp-buffer - (let ((ret (condition-case nil - (vc-bzr-command "status" t 0 file) - (file-error nil))) ; vc-bzr-program not found. - (status 'unchanged)) - ;; the only secure status indication in `bzr status' output - ;; is a couple of lines following the pattern:: - ;; | : - ;; | - ;; if the file is up-to-date, we get no status report from `bzr', - ;; so if the regexp search for the above pattern fails, we consider - ;; the file to be up-to-date. - (goto-char (point-min)) - (when (re-search-forward - ;; bzr prints paths relative to the repository root. - (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+" - (regexp-quote (vc-bzr-file-name-relative file)) - ;; Bzr appends a '/' to directory names and - ;; '*' to executable files - (if (file-directory-p file) "/?" "\\*?") - "[ \t\n]*$") - nil t) - (lexical-let ((statusword (match-string 1))) - ;; Erase the status text that matched. - (delete-region (match-beginning 0) (match-end 0)) - (setq status - (intern (replace-regexp-in-string " " "" statusword))))) - (when status - (goto-char (point-min)) - (skip-chars-forward " \n\t") ;Throw away spaces. - (cons status - ;; "bzr" will output warnings and informational messages to - ;; stderr; due to Emacs's `vc-do-command' (and, it seems, - ;; `start-process' itself) limitations, we cannot catch stderr - ;; and stdout into different buffers. So, if there's anything - ;; left in the buffer after removing the above status - ;; keywords, let us just presume that any other message from - ;; "bzr" is a user warning, and display it. - (unless (eobp) (buffer-substring (point) (point-max)))))))) + (with-demoted-errors (vc-bzr-command "status" t 0 file)) + (let ((status 'unchanged)) + ;; the only secure status indication in `bzr status' output + ;; is a couple of lines following the pattern:: + ;; | : + ;; | + ;; if the file is up-to-date, we get no status report from `bzr', + ;; so if the regexp search for the above pattern fails, we consider + ;; the file to be up-to-date. + (goto-char (point-min)) + (when (re-search-forward + ;; bzr prints paths relative to the repository root. + (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+" + (regexp-quote (vc-bzr-file-name-relative file)) + ;; Bzr appends a '/' to directory names and + ;; '*' to executable files + (if (file-directory-p file) "/?" "\\*?") + "[ \t\n]*$") + nil t) + (lexical-let ((statusword (match-string 1))) + ;; Erase the status text that matched. + (delete-region (match-beginning 0) (match-end 0)) + (setq status + (intern (replace-regexp-in-string " " "" statusword))))) + (when status + (goto-char (point-min)) + (skip-chars-forward " \n\t") ;Throw away spaces. + (cons status + ;; "bzr" will output warnings and informational messages to + ;; stderr; due to Emacs's `vc-do-command' (and, it seems, + ;; `start-process' itself) limitations, we cannot catch stderr + ;; and stdout into different buffers. So, if there's anything + ;; left in the buffer after removing the above status + ;; keywords, let us just presume that any other message from + ;; "bzr" is a user warning, and display it. + (unless (eobp) (buffer-substring (point) (point-max)))))))) (defun vc-bzr-state (file) (lexical-let ((result (vc-bzr-status file))) ------------------------------------------------------------ revno: 107859 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 21:25:51 -0400 message: Repurpose C_SWITCH_X_SYSTEM as GNUSTEP_CFLAGS This is the only thing left that uses it. * configure.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. * src/Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. * lwlib/Makefile.in (C_SWITCH_X_SYSTEM): Remove. (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. * oldXMenu/Makefile.in (C_SWITCH_X_SYSTEM): Remove. (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. * msdos/sedlibmk.inp, msdos/sed1v2.inp: GNUSTEP_CFLAGS replaces C_SWITCH_X_SYSTEM. diff: === modified file 'ChangeLog' --- ChangeLog 2012-04-10 07:18:02 +0000 +++ ChangeLog 2012-04-11 01:25:51 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Glenn Morris + + * configure.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. + 2012-04-10 Glenn Morris * configure.in: Conditionally generate admin/unidata/Makefile. === modified file 'configure.in' --- configure.in 2012-04-10 07:18:02 +0000 +++ configure.in 2012-04-11 01:25:51 +0000 @@ -2589,7 +2589,7 @@ dnl Check for malloc/malloc.h on darwin AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the header file.])]) -C_SWITCH_X_SYSTEM= +GNUSTEP_CFLAGS= ### Use NeXTstep API to implement GUI. if test "${HAVE_NS}" = "yes"; then AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.]) @@ -2600,9 +2600,7 @@ AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) # See also .m.o rule in Makefile.in */ # FIXME: are all these flags really needed? Document here why. */ - dnl FIXME this should be renamed to GNUSTEP_CFLAGS, and only - dnl used in src/Makefile.in. - C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" ## Extra CFLAGS applied to src/*.m files. GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE" fi @@ -3222,7 +3220,7 @@ ## end of LIBX_BASE, but nothing ever set it. AC_SUBST(LD_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SITE) -AC_SUBST(C_SWITCH_X_SYSTEM) +AC_SUBST(GNUSTEP_CFLAGS) AC_SUBST(CFLAGS) ## Used in lwlib/Makefile.in. AC_SUBST(X_TOOLKIT_TYPE) === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2012-02-09 07:48:22 +0000 +++ lwlib/ChangeLog 2012-04-11 01:25:51 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Glenn Morris + + * Makefile.in (C_SWITCH_X_SYSTEM): Remove. + (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. + 2011-10-13 Dmitry Antipov * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with @@ -1756,7 +1761,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'lwlib/Makefile.in' --- lwlib/Makefile.in 2012-01-19 07:21:25 +0000 +++ lwlib/Makefile.in 2012-04-11 01:25:51 +0000 @@ -1,5 +1,5 @@ # Copyright (C) 1992, 1993 Lucid, Inc. -# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. # # This file is part of the Lucid Widget Library. # @@ -26,7 +26,6 @@ VPATH=@srcdir@ @SET_MAKE@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ -C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ @@ -53,7 +52,7 @@ ## $(srcdir) is where the lwlib sources are. ## There are no generated lwlib files, hence no need for -I. ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ - $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \ + $(C_SWITCH_MACHINE) \ $(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \ -DHAVE_CONFIG_H -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-04-07 20:00:16 +0000 +++ msdos/ChangeLog 2012-04-11 01:25:51 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Glenn Morris + + * sedlibmk.inp, sed1v2.inp: GNUSTEP_CFLAGS replaces C_SWITCH_X_SYSTEM. + 2012-04-07 Glenn Morris * sed2v2.inp: Bump version to 24.1.50. @@ -1312,7 +1316,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2012-01-19 07:21:25 +0000 +++ msdos/sed1v2.inp 2012-04-11 01:25:51 +0000 @@ -2,7 +2,7 @@ # Configuration script for src/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -39,7 +39,7 @@ /^LIBOBJS *=/s/@[^@\n]*@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// -/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// +/^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// @@ -186,7 +186,7 @@ /^ *THEFILE=/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | # Make the GCC command line fit one screen line -/^[ ][ ]*\$(C_SWITCH_X_SYSTEM)/d +/^[ ][ ]*\$(GNUSTEP_CFLAGS)/d /^[ ][ ]*\$(GCONF_CFLAGS)/d /^[ ][ ]*\$(LIBGNUTLS_CFLAGS)/d s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) // === modified file 'msdos/sedlibmk.inp' --- msdos/sedlibmk.inp 2012-01-05 09:46:05 +0000 +++ msdos/sedlibmk.inp 2012-04-11 01:25:51 +0000 @@ -2,7 +2,7 @@ # Configuration script for lib/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2012 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -124,7 +124,7 @@ /^CYGWIN_OBJ *=/s/@[^@\n]*@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// -/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// +/^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// /^DEFS *=/s/@[^@\n]*@/-DHAVE_CONFIG_H/ === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2012-02-09 07:48:22 +0000 +++ oldXMenu/ChangeLog 2012-04-11 01:25:51 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Glenn Morris + + * Makefile.in (C_SWITCH_X_SYSTEM): Remove. + (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. + 2011-04-16 Paul Eggert Static checks with GCC 4.6.0 and non-default toolkits. @@ -615,7 +620,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'oldXMenu/Makefile.in' --- oldXMenu/Makefile.in 2012-01-19 07:21:25 +0000 +++ oldXMenu/Makefile.in 2012-04-11 01:25:51 +0000 @@ -15,7 +15,7 @@ ## without express or implied warranty. -## Copyright (C) 2001-2012 Free Software Foundation, Inc. +## Copyright (C) 2001-2012 Free Software Foundation, Inc. ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -45,7 +45,6 @@ srcdir=@srcdir@ VPATH=@srcdir@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ -C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ @@ -88,7 +87,7 @@ all:: libXMenu11.a ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ - $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \ + $(C_SWITCH_X_SITE) \ ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I${srcdir} -I${srcdir}/../src === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-11 00:51:44 +0000 +++ src/ChangeLog 2012-04-11 01:25:51 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Glenn Morris + + * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. + 2012-04-11 Stefan Monnier * alloc.c (lisp_align_malloc): Remove unneeded prototype. @@ -9738,7 +9742,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2011-2012 Free Software Foundation, Inc. + Copyright (C) 2011-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'src/Makefile.in' --- src/Makefile.in 2012-04-09 20:37:08 +0000 +++ src/Makefile.in 2012-04-11 01:25:51 +0000 @@ -75,16 +75,13 @@ ## System-specific CFLAGS. C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ -## Currently only set if NS_IMPL_GNUSTEP. -## C_SWITCH_X_SITE may override this. -C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ +GNUSTEP_CFLAGS=@GNUSTEP_CFLAGS@ ## Define C_SWITCH_X_SITE to contain any special flags your compiler ## may need to deal with X Windows. For instance, if you've defined ## HAVE_X_WINDOWS and your X include files aren't in a place that your ## compiler can find on its own, you might want to add "-I/..." or ## something similar. This is normally set by configure. -## This is used before C_SWITCH_X_SYSTEM and may override it. C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ ## Define LD_SWITCH_X_SITE to contain any special flags your loader @@ -302,14 +299,11 @@ ## -DHAVE_CONFIG_H is needed for some other files to take advantage of ## the information in `config.h'. ## -## C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM -## since it may have -I options that should override those. -## ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I$(srcdir) \ -I$(lib) -I$(srcdir)/../lib \ $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ - $(C_SWITCH_X_SYSTEM) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ + $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) $(PROFILING_CFLAGS) \ ------------------------------------------------------------ revno: 107858 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 21:16:48 -0400 message: Use internal sha1 in vc-bzr * lisp/vc/vc-bzr.el (vc-bzr-sha1-program, sha1-program): Remove. These were only added in 24.1 when sha1.el was removed in favor of an internal sha1 implementation. Frankly, I can't see why the internal sha1 wasn't immediately used here. (vc-bzr-sha1): Use internal sha1. (Comments): Remove reference to abandoned upstream bug report that contains no extra information. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-11 00:21:00 +0000 +++ lisp/ChangeLog 2012-04-11 01:16:48 +0000 @@ -1,3 +1,8 @@ +2012-04-11 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-sha1-program, sha1-program): Remove. + (vc-bzr-sha1): Use internal sha1. + 2012-04-11 Stefan Monnier * progmodes/flymake.el (flymake-mode): Beware read-only dirs (bug#8954). === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2012-03-22 19:57:43 +0000 +++ lisp/vc/vc-bzr.el 2012-04-11 01:16:48 +0000 @@ -37,7 +37,6 @@ ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the ;; symlink, thereby not detecting whether the actual contents ;; (that is, the target contents) are changed. -;; See https://bugs.launchpad.net/vc-bzr/+bug/116607 ;;; Properties of the backend @@ -65,14 +64,6 @@ :group 'vc-bzr :type 'string) -(defcustom vc-bzr-sha1-program '("sha1sum") - "Name of program to compute SHA1. -It must be a string \(program name\) or list of strings \(name and its args\)." - :type '(repeat string) - :group 'vc-bzr) - -(define-obsolete-variable-alias 'sha1-program 'vc-bzr-sha1-program "24.1") - (defcustom vc-bzr-diff-switches nil "String or list of strings specifying switches for bzr diff under VC. If nil, use the value of `vc-diff-switches'. If t, use no switches." @@ -190,20 +181,15 @@ (defun vc-bzr-sha1 (file) (with-temp-buffer (set-buffer-multibyte nil) - (let ((prog vc-bzr-sha1-program) - (args nil) - process-file-side-effects) - (when (consp prog) - (setq args (cdr prog)) - (setq prog (car prog))) - (apply 'process-file prog (file-relative-name file) t nil args) - (buffer-substring (point-min) (+ (point-min) 40))))) + (insert-file-contents-literally file) + (sha1 (current-buffer)))) (defun vc-bzr-state-heuristic (file) "Like `vc-bzr-state' but hopefully without running Bzr." - ;; `bzr status' was excruciatingly slow with large histories and - ;; pending merges, so try to avoid using it until they fix their - ;; performance problems. + ;; `bzr status' could be slow with large histories and pending merges, + ;; so this tries to avoid calling it if possible. bzr status is + ;; faster now, so this is not as important as it was. + ;; ;; This function tries first to parse Bzr internal file ;; `checkout/dirstate', but it may fail if Bzr internal file format ;; has changed. As a safeguard, the `checkout/dirstate' file is @@ -299,10 +285,7 @@ 'up-to-date) (t 'edited)) 'unregistered)))) - ;; Either the dirstate file can't be read, or the sha1 - ;; executable is missing, or ... - ;; In either case, recent versions of Bzr aren't that slow - ;; any more. + ;; The dirstate file can't be read, or some other problem. (error (vc-bzr-state file))))))) ------------------------------------------------------------ revno: 107857 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 20:51:44 -0400 message: * src/alloc.c (lisp_align_malloc): Remove unneeded prototype. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-10 19:36:17 +0000 +++ src/ChangeLog 2012-04-11 00:51:44 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Stefan Monnier + + * alloc.c (lisp_align_malloc): Remove unneeded prototype. + 2012-04-10 "Jason S. Cornez" (tiny change) * keyboard.c: Override inhibit-quit after the third C-g (bug#6585). === modified file 'src/alloc.c' --- src/alloc.c 2012-04-09 13:05:48 +0000 +++ src/alloc.c 2012-04-11 00:51:44 +0000 @@ -296,7 +296,6 @@ MEM_TYPE_VECTORLIKE }; -static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type); static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); @@ -938,9 +937,10 @@ MALLOC_UNBLOCK_INPUT; } -/* Allocation of aligned blocks of memory to store Lisp data. */ -/* The entry point is lisp_align_malloc which returns blocks of at most */ -/* BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ +/***** Allocation of aligned blocks of memory to store Lisp data. *****/ + +/* The entry point is lisp_align_malloc which returns blocks of at most + BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ /* Use posix_memalloc if the system has it and we're using the system's malloc (because our gmalloc.c routines don't have posix_memalign although @@ -1099,7 +1099,7 @@ #endif /* Initialize the blocks and put them on the free list. - Is `base' was not properly aligned, we can't use the last block. */ + If `base' was not properly aligned, we can't use the last block. */ for (i = 0; i < (aligned ? ABLOCKS_SIZE : ABLOCKS_SIZE - 1); i++) { abase->blocks[i].abase = abase; @@ -1146,8 +1146,8 @@ ablock->x.next_free = free_ablock; free_ablock = ablock; /* Update busy count. */ - ABLOCKS_BUSY (abase) = - (struct ablocks *) (-2 + (intptr_t) ABLOCKS_BUSY (abase)); + ABLOCKS_BUSY (abase) + = (struct ablocks *) (-2 + (intptr_t) ABLOCKS_BUSY (abase)); if (2 > (intptr_t) ABLOCKS_BUSY (abase)) { /* All the blocks are free. */ ------------------------------------------------------------ revno: 107856 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8954 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 20:21:00 -0400 message: * lisp/progmodes/flymake.el (flymake-mode): Beware read-only dirs. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 23:34:25 +0000 +++ lisp/ChangeLog 2012-04-11 00:21:00 +0000 @@ -1,3 +1,7 @@ +2012-04-11 Stefan Monnier + + * progmodes/flymake.el (flymake-mode): Beware read-only dirs (bug#8954). + 2012-04-10 Sébastien Gross (tiny change) * progmodes/hideshow.el (hs-hide-all): Don't infloop on comments === modified file 'lisp/progmodes/flymake.el' --- lisp/progmodes/flymake.el 2012-02-08 02:12:24 +0000 +++ lisp/progmodes/flymake.el 2012-04-11 00:21:00 +0000 @@ -1356,8 +1356,12 @@ (setq flymake-timer (run-at-time nil 1 'flymake-on-timer-event (current-buffer))) - (when flymake-start-syntax-check-on-find-file - (flymake-start-syntax-check))))) + (when (and flymake-start-syntax-check-on-find-file + ;; Since we write temp files in current dir, there's no point + ;; trying if the directory is read-only (bug#8954). + (file-writable-p (file-name-directory buffer-file-name))) + (with-demoted-errors + (flymake-start-syntax-check)))))) ;; Turning the mode OFF. (t ------------------------------------------------------------ revno: 107855 fixes bug(s): http://debbugs.gnu.org/10496 author: Sébastien Gross committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 01:34:25 +0200 message: (hs-hide-all): Don't infloop on comments that start in the middle of the line. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 23:24:31 +0000 +++ lisp/ChangeLog 2012-04-10 23:34:25 +0000 @@ -1,3 +1,8 @@ +2012-04-10 Sébastien Gross (tiny change) + + * progmodes/hideshow.el (hs-hide-all): Don't infloop on comments + that start in the middle of the line (bug#10496). + 2012-04-10 Dan Nicolaescu * battery.el (battery-linux-proc-acpi): Only one battery is === modified file 'lisp/progmodes/hideshow.el' --- lisp/progmodes/hideshow.el 2012-04-09 13:05:48 +0000 +++ lisp/progmodes/hideshow.el 2012-04-10 23:34:25 +0000 @@ -802,12 +802,15 @@ (forward-comment (point-max))) (re-search-forward re (point-max) t)) (if (match-beginning 1) - ;; we have found a block beginning + ;; We have found a block beginning. (progn (goto-char (match-beginning 1)) - (if hs-hide-all-non-comment-function - (funcall hs-hide-all-non-comment-function) - (hs-hide-block-at-point t))) + (unless (if hs-hide-all-non-comment-function + (funcall hs-hide-all-non-comment-function) + (hs-hide-block-at-point t)) + ;; Go to end of matched data to prevent from getting stuck + ;; with an endless loop. + (goto-char (match-end 0)))) ;; found a comment, probably (let ((c-reg (hs-inside-comment-p))) (when (and c-reg (car c-reg)) ------------------------------------------------------------ revno: 107854 fixes bug(s): http://debbugs.gnu.org/10332 author: Dan Nicolaescu committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2012-04-11 01:24:31 +0200 message: battery.el not working when multiple batteries are present * battery.el (battery-linux-proc-acpi): Only one battery is discharged at a time, but that seems to confuse battery.el when computing `rate-type' for the battery not being discharged. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 20:15:08 +0000 +++ lisp/ChangeLog 2012-04-10 23:24:31 +0000 @@ -1,3 +1,10 @@ +2012-04-10 Dan Nicolaescu + + * battery.el (battery-linux-proc-acpi): Only one battery is + discharged at a time, but that seems to confuse battery.el when + computing `rate-type' for the battery not being discharged + (bug#10332). + 2012-04-10 Stefan Monnier * emacs-lisp/autoload.el (autoload-make-program): Remove, unused. === modified file 'lisp/battery.el' --- lisp/battery.el 2012-02-11 22:13:29 +0000 +++ lisp/battery.el 2012-04-10 23:24:31 +0000 @@ -344,14 +344,15 @@ (setq charging-state (match-string 1))) (when (re-search-forward "present rate: +\\([0-9]+\\) \\(m[AW]\\)$" nil t) - (setq rate (+ (or rate 0) (string-to-number (match-string 1))) - rate-type (or (and rate-type + (setq rate (+ (or rate 0) (string-to-number (match-string 1)))) + (when (> rate 0) + (setq rate-type (or (and rate-type (if (string= rate-type (match-string 2)) rate-type (error "Inconsistent rate types (%s vs. %s)" rate-type (match-string 2)))) - (match-string 2)))) + (match-string 2))))) (when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$" nil t) (setq capacity ------------------------------------------------------------ revno: 107853 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 16:15:08 -0400 message: * lisp/emacs-lisp/autoload.el (autoload-make-program): Remove, unused. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 20:14:33 +0000 +++ lisp/ChangeLog 2012-04-10 20:15:08 +0000 @@ -1,5 +1,7 @@ 2012-04-10 Stefan Monnier + * emacs-lisp/autoload.el (autoload-make-program): Remove, unused. + * international/quail.el: Use dolist and simplify. (quail-define-package, quail-update-keyboard-layout) (quail-define-rules): Use dolist. === modified file 'lisp/emacs-lisp/autoload.el' --- lisp/emacs-lisp/autoload.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/autoload.el 2012-04-10 20:15:08 +0000 @@ -762,9 +762,6 @@ (define-obsolete-function-alias 'update-autoloads-from-directories 'update-directory-autoloads "22.1") -(defvar autoload-make-program (or (getenv "MAKE") "make") - "Name of the make program in use during the Emacs build process.") - ;;;###autoload (defun batch-update-autoloads () "Update loaddefs.el autoloads in batch mode. ------------------------------------------------------------ revno: 107852 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 16:14:33 -0400 message: * lisp/international/quail.el: Use dolist and simplify. (quail-define-package, quail-update-keyboard-layout) (quail-define-rules): Use dolist. (quail-insert-kbd-layout, quail-get-translation): CSE. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 20:12:07 +0000 +++ lisp/ChangeLog 2012-04-10 20:14:33 +0000 @@ -1,5 +1,10 @@ 2012-04-10 Stefan Monnier + * international/quail.el: Use dolist and simplify. + (quail-define-package, quail-update-keyboard-layout) + (quail-define-rules): Use dolist. + (quail-insert-kbd-layout, quail-get-translation): CSE. + * tmm.el: Use dolist, remove left over hook. (tmm-prompt, tmm-define-keys, tmm-shortcut, tmm-get-keybind): Use dolist. === modified file 'lisp/international/quail.el' --- lisp/international/quail.el 2012-03-22 04:20:07 +0000 +++ lisp/international/quail.el 2012-04-10 20:14:33 +0000 @@ -486,19 +486,15 @@ (setq translation-keymap (copy-keymap (if simple quail-simple-translation-keymap quail-translation-keymap))) - (while translation-keys - (define-key translation-keymap - (car (car translation-keys)) (cdr (car translation-keys))) - (setq translation-keys (cdr translation-keys)))) + (dolist (trans translation-keys) + (define-key translation-keymap (car trans) (cdr trans)))) (setq translation-keymap (if simple quail-simple-translation-keymap quail-translation-keymap))) (when conversion-keys (setq conversion-keymap (copy-keymap quail-conversion-keymap)) - (while conversion-keys - (define-key conversion-keymap - (car (car conversion-keys)) (cdr (car conversion-keys))) - (setq conversion-keys (cdr conversion-keys)))) + (dolist (conv conversion-keys) + (define-key conversion-keymap (car conv) (cdr conv)))) (quail-add-package (list name title (list nil) guidance (or docstring "") translation-keymap @@ -720,12 +716,11 @@ (setq quail-keyboard-layout-substitution subst-list) ;; If there are additional key locations, map them to missing ;; key locations. - (while missing-list + (dolist (missing missing-list) (while (and subst-list (cdr (car subst-list))) (setq subst-list (cdr subst-list))) (if subst-list - (setcdr (car subst-list) (car missing-list))) - (setq missing-list (cdr missing-list)))))) + (setcdr (car subst-list) missing)))))) (defcustom quail-keyboard-layout-type "standard" "Type of keyboard layout used in Quail base input method. @@ -806,9 +801,10 @@ (if translation (progn (if (consp translation) - (if (> (length (cdr translation)) 0) - (setq translation (aref (cdr translation) 0)) - (setq translation " "))) + (setq translation + (if (> (length (cdr translation)) 0) + (aref (cdr translation) 0) + " "))) (setq done-list (cons translation done-list))) (setq translation (aref kbd-layout i))) (aset layout i translation)) @@ -834,17 +830,19 @@ (if (< (if (stringp lower) (string-width lower) (char-width lower)) 2) (insert " ")) (if (characterp lower) - (if (eq (get-char-code-property lower 'general-category) 'Mn) - ;; Pad the left and right of non-spacing characters. - (setq lower (compose-string (string lower) 0 1 - (format "\t%c\t" lower))) - (setq lower (string lower)))) + (setq lower + (if (eq (get-char-code-property lower 'general-category) 'Mn) + ;; Pad the left and right of non-spacing characters. + (compose-string (string lower) 0 1 + (format "\t%c\t" lower)) + (string lower)))) (if (characterp upper) - (if (eq (get-char-code-property upper 'general-category) 'Mn) - ;; Pad the left and right of non-spacing characters. - (setq upper (compose-string (string upper) 0 1 - (format "\t%c\t" upper))) - (setq upper (string upper)))) + (setq upper + (if (eq (get-char-code-property upper 'general-category) 'Mn) + ;; Pad the left and right of non-spacing characters. + (compose-string (string upper) 0 1 + (format "\t%c\t" upper)) + (string upper)))) (insert (bidi-string-mark-left-to-right lower) (propertize " " 'invisible t) (bidi-string-mark-left-to-right upper)) @@ -1032,8 +1030,8 @@ (let ((map (list nil)) (decode-map (if (not no-decode-map) (list 'decode-map))) key trans) - (while l - (setq key (car (car l)) trans (car (cdr (car l))) l (cdr l)) + (dolist (el l) + (setq key (car el) trans (car (cdr el))) (quail-defrule-internal key trans map t decode-map props)) `(if (prog1 (quail-decode-map) (quail-install-map ',map)) @@ -1201,7 +1199,7 @@ (if (stringp trans) (setq trans (string-to-vector trans)))) (let ((new (quail-vunion prevchars trans))) - (setq trans + (setq trans (if (equal new prevchars) ;; Nothing to change, get back to orig value. prev @@ -1215,10 +1213,8 @@ the translation, and INDEX points into VECTOR to specify the currently selected translation." (if (and def (symbolp def)) - (if (functionp def) - ;; DEF is a symbol of a function which returns valid translation. - (setq def (funcall def key len)) - (setq def nil))) + ;; DEF is a symbol of a function which returns valid translation. + (setq def (if (functionp def) (funcall def key len)))) (if (and (consp def) (not (vectorp (cdr def)))) (setq def (car def))) ------------------------------------------------------------ revno: 107851 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 16:12:07 -0400 message: * lisp/tmm.el: Use dolist, remove left over hook. (tmm-prompt, tmm-define-keys, tmm-shortcut, tmm-get-keybind): Use dolist. (calendar-load-hook): Don't mess with it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 20:08:43 +0000 +++ lisp/ChangeLog 2012-04-10 20:12:07 +0000 @@ -1,5 +1,10 @@ 2012-04-10 Stefan Monnier + * tmm.el: Use dolist, remove left over hook. + (tmm-prompt, tmm-define-keys, tmm-shortcut, tmm-get-keybind): + Use dolist. + (calendar-load-hook): Don't mess with it. + * vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal): Use derived-mode-p. Run the diff asynchronously. === modified file 'lisp/tmm.el' --- lisp/tmm.el 2012-01-19 07:21:25 +0000 +++ lisp/tmm.el 2012-04-10 20:12:07 +0000 @@ -165,14 +165,13 @@ ;; tmm-km-list is an alist of (STRING . MEANING). ;; It has no other elements. ;; The order of elements in tmm-km-list is the order of the menu bar. - (mapc (lambda (elt) - (cond - ((stringp elt) (setq gl-str elt)) - ((listp elt) (tmm-get-keymap elt not-menu)) - ((vectorp elt) - (dotimes (i (length elt)) - (tmm-get-keymap (cons i (aref elt i)) not-menu))))) - menu) + (dolist (elt menu) + (cond + ((stringp elt) (setq gl-str elt)) + ((listp elt) (tmm-get-keymap elt not-menu)) + ((vectorp elt) + (dotimes (i (length elt)) + (tmm-get-keymap (cons i (aref elt i)) not-menu))))) ;; Choose an element of tmm-km-list; put it in choice. (if (and not-menu (= 1 (length tmm-km-list))) ;; If this is the top-level of an x-popup-menu menu, @@ -313,15 +312,13 @@ (defun tmm-define-keys (minibuffer) (let ((map (make-sparse-keymap))) (suppress-keymap map t) - (mapc - (lambda (c) - (if (listp tmm-shortcut-style) - (define-key map (char-to-string c) 'tmm-shortcut) - ;; only one kind of letters are shortcuts, so map both upcase and - ;; downcase input to the same - (define-key map (char-to-string (downcase c)) 'tmm-shortcut) - (define-key map (char-to-string (upcase c)) 'tmm-shortcut))) - tmm-short-cuts) + (dolist (c tmm-short-cuts) + (if (listp tmm-shortcut-style) + (define-key map (char-to-string c) 'tmm-shortcut) + ;; only one kind of letters are shortcuts, so map both upcase and + ;; downcase input to the same + (define-key map (char-to-string (downcase c)) 'tmm-shortcut) + (define-key map (char-to-string (upcase c)) 'tmm-shortcut))) (if minibuffer (progn (define-key map [pageup] 'tmm-goto-completions) @@ -401,14 +398,13 @@ (choose-completion)) ;; In minibuffer (delete-region (minibuffer-prompt-end) (point-max)) - (mapc (lambda (elt) - (if (string= - (substring (car elt) 0 - (min (1+ (length tmm-mid-prompt)) - (length (car elt)))) - (concat (char-to-string c) tmm-mid-prompt)) - (setq s (car elt)))) - tmm-km-list) + (dolist (elt tmm-km-list) + (if (string= + (substring (car elt) 0 + (min (1+ (length tmm-mid-prompt)) + (length (car elt)))) + (concat (char-to-string c) tmm-mid-prompt)) + (setq s (car elt)))) (insert s) (exit-minibuffer))))) @@ -540,20 +536,16 @@ (setq allbind (cons globalbind (cons localbind minorbind))) ;; Merge all the elements of ALLBIND into one keymap. - (mapc (lambda (in) - (if (and (symbolp in) (keymapp in)) - (setq in (symbol-function in))) - (and in (keymapp in) - (if (keymapp bind) - (setq bind (nconc bind (copy-sequence (cdr in)))) - (setq bind (copy-sequence in))))) - allbind) + (dolist (in allbind) + (if (and (symbolp in) (keymapp in)) + (setq in (symbol-function in))) + (and in (keymapp in) + (setq bind (if (keymapp bind) + (nconc bind (copy-sequence (cdr in))) + (copy-sequence in))))) ;; Return that keymap. bind)))) -;; Huh? What's that about? --Stef -(add-hook 'calendar-load-hook (lambda () (require 'cal-menu))) - (provide 'tmm) ;;; tmm.el ends here ------------------------------------------------------------ revno: 107850 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 16:08:43 -0400 message: * lisp/vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal): Use derived-mode-p. Run the diff asynchronously. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 17:09:34 +0000 +++ lisp/ChangeLog 2012-04-10 20:08:43 +0000 @@ -1,3 +1,8 @@ +2012-04-10 Stefan Monnier + + * vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal): + Use derived-mode-p. Run the diff asynchronously. + 2012-04-10 Lars Magne Ingebrigtsen * obsolete/mouse-sel.el: Add an Obsolete-since header. @@ -10,13 +15,13 @@ 2012-04-10 Nathan Weizenbaum - * progmodes/python.el (python-fill-paragraph): Make - python-fill-region in a multiline string work when font-lock is + * progmodes/python.el (python-fill-paragraph): + Make python-fill-region in a multiline string work when font-lock is disabled (bug#7018). 2012-04-10 Laimonas Vėbra (tiny change) - * language/european.el (cp775): Added oem/legacy (en)coding on + * language/european.el (cp775): Add oem/legacy (en)coding on DOS/MS Windows for the Baltic languages. There are still plenty of texts written in this encoding/codepage (bug#6519). @@ -27,7 +32,7 @@ 2012-04-10 Florian Adamsky (tiny change) - * recentf.el (recentf-dialog-mode-map): Added two keybindings for + * recentf.el (recentf-dialog-mode-map): Add two keybindings for next-line "n" and previous-line "p" in order to make recentf more consistent with ibuffer, dired or org-mode (bug#9387). === modified file 'lisp/vc/vc-annotate.el' --- lisp/vc/vc-annotate.el 2012-01-19 07:21:25 +0000 +++ lisp/vc/vc-annotate.el 2012-04-10 20:08:43 +0000 @@ -522,12 +522,12 @@ (car rev-at-line) t 1))))))) (defun vc-annotate-show-diff-revision-at-line-internal (filediff) - (if (not (equal major-mode 'vc-annotate-mode)) + (if (not (derived-mode-p 'vc-annotate-mode)) (message "Cannot be invoked outside of a vc annotate buffer") (let* ((rev-at-line (vc-annotate-extract-revision-at-line)) - (prev-rev nil) - (rev (car rev-at-line)) - (fname (cdr rev-at-line))) + (prev-rev nil) + (rev (car rev-at-line)) + (fname (cdr rev-at-line))) (if (not rev-at-line) (message "Cannot extract revision number from the current line") (setq prev-rev @@ -535,17 +535,15 @@ (if filediff fname nil) rev)) (if (not prev-rev) (message "Cannot diff from any revision prior to %s" rev) - (save-window-excursion - (vc-diff-internal - nil - ;; The value passed here should follow what - ;; `vc-deduce-fileset' returns. - (list vc-annotate-backend - (if filediff - (list fname) - nil)) - prev-rev rev)) - (switch-to-buffer "*vc-diff*")))))) + (vc-diff-internal + t + ;; The value passed here should follow what + ;; `vc-deduce-fileset' returns. + (list vc-annotate-backend + (if filediff + (list fname) + nil)) + prev-rev rev)))))) (defun vc-annotate-show-diff-revision-at-line () "Visit the diff of the revision at line from its previous revision." ------------------------------------------------------------ revno: 107849 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6585 author: "Jason S. Cornez" committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-04-10 15:36:17 -0400 message: * src/keyboard.c: Override inhibit-quit after the third C-g. (force_quit_count): New var. (handle_interrupt): Use it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-10 14:16:05 +0000 +++ src/ChangeLog 2012-04-10 19:36:17 +0000 @@ -1,3 +1,9 @@ +2012-04-10 "Jason S. Cornez" (tiny change) + + * keyboard.c: Override inhibit-quit after the third C-g (bug#6585). + (force_quit_count): New var. + (handle_interrupt): Use it. + 2012-04-10 Juanma Barranquero * w32.c (w32_delayed_load): Record the full path of the library @@ -17,8 +23,8 @@ * process.h: Add integer `gnutls_handshakes_tried' member to process struct. - * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit. Add - convenience `GNUTLS_LOG2i' macro. + * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit. + Add convenience `GNUTLS_LOG2i' macro. * gnutls.c (gnutls_log_function2i): Convenience log function. (emacs_gnutls_read): Use new log functions, @@ -104,8 +110,8 @@ (xml_cleanup_parser): New function, export for fn_xmlCleanupParser. Calls xmlCleanupParser only if libxml2 was loaded (or statically linked in). - (Flibxml_parse_html_region, Flibxml_parse_xml_region): Call - init_libxml2_functions before calling libxml2 functions. + (Flibxml_parse_html_region, Flibxml_parse_xml_region): + Call init_libxml2_functions before calling libxml2 functions. (syms_of_xml) : DEFSYM it. * emacs.c: Don't include libxml/parser.h. === modified file 'src/keyboard.c' --- src/keyboard.c 2012-04-04 07:54:02 +0000 +++ src/keyboard.c 2012-04-10 19:36:17 +0000 @@ -10213,7 +10213,7 @@ memset (keybuf, 0, sizeof keybuf); GCPRO1 (keybuf[0]); - gcpro1.nvars = (sizeof keybuf/sizeof (keybuf[0])); + gcpro1.nvars = (sizeof keybuf / sizeof (keybuf[0])); if (NILP (continue_echo)) { @@ -10227,7 +10227,7 @@ cancel_hourglass (); #endif - i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])), + i = read_key_sequence (keybuf, (sizeof keybuf / sizeof (keybuf[0])), prompt, ! NILP (dont_downcase_last), ! NILP (can_return_switch_frame), 0); @@ -10918,6 +10918,11 @@ errno = old_errno; } +/* If Emacs is stuck because `inhibit-quit' is true, then keep track + of the number of times C-g has been requested. If C-g is pressed + enough times, then quit anyway. See bug#6585. */ +static int force_quit_count; + /* This routine is called at interrupt level in response to C-g. It is called from the SIGINT handler or kbd_buffer_store_event. @@ -11036,8 +11041,16 @@ UNGCPRO; } else - /* Else request quit when it's safe */ - Vquit_flag = Qt; + { /* Else request quit when it's safe. */ + if (NILP (Vquit_flag)) + force_quit_count = 0; + if (++force_quit_count == 3) + { + immediate_quit = 1; + Vinhibit_quit = Qnil; + } + Vquit_flag = Qt; + } } /* TODO: The longjmp in this call throws the NS event loop integration off, ------------------------------------------------------------ revno: 107848 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2012-04-10 22:07:46 +0300 message: .bzrignore: Don't ignore info/dir. diff: === modified file '.bzrignore' --- .bzrignore 2012-04-04 07:36:19 +0000 +++ .bzrignore 2012-04-10 19:07:46 +0000 @@ -56,6 +56,7 @@ !doc/lispintro/drawers.pdf !doc/lispintro/lambda-*.pdf info/* +!info/dir admin/unidata/unidata.txt build-aux/compile build-aux/config.guess ------------------------------------------------------------ revno: 107847 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2012-04-10 22:03:32 +0300 message: Better parallelism on MS-Windows for "make info". nt/makefile.w32-in (emacs, misc, lispref, lispintro): New targets, each runs makeinfo in its own subdirectory of 'doc'. (info-gmake): Depend on these new targets. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-04-07 20:00:16 +0000 +++ nt/ChangeLog 2012-04-10 19:03:32 +0000 @@ -1,3 +1,9 @@ +2012-04-10 Eli Zaretskii + + * makefile.w32-in (emacs, misc, lispref, lispintro): New targets, + each runs makeinfo in its own subdirectory of 'doc'. + (info-gmake): Depend on these new targets. + 2012-04-07 Glenn Morris * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc: === modified file 'nt/makefile.w32-in' --- nt/makefile.w32-in 2012-04-07 20:00:16 +0000 +++ nt/makefile.w32-in 2012-04-10 19:03:32 +0000 @@ -307,11 +307,11 @@ $(MAKE) $(MFLAGS) info cd $(MAKEDIR) -info-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro info +info-gmake: emacs misc lispref lispintro + +emacs misc lispref lispintro: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/$@ info + # # Maintenance # ------------------------------------------------------------ revno: 107846 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 13:27:01 -0400 message: * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". Add header keyword. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-04-10 07:18:02 +0000 +++ admin/ChangeLog 2012-04-10 17:27:01 +0000 @@ -1,5 +1,7 @@ 2012-04-10 Glenn Morris + * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". + * unidata/Makefile.in: Add FSF copyright. Make it use autoconf features, and work for out-of-tree builds. === modified file 'admin/bzrmerge.el' --- admin/bzrmerge.el 2012-01-19 06:42:57 +0000 +++ admin/bzrmerge.el 2012-04-10 17:27:01 +0000 @@ -1,9 +1,9 @@ ;;; bzrmerge.el --- help merge one Emacs bzr branch to another -;; Copyright (C) 2010-2012 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Stefan Monnier -;; Keywords: +;; Keywords: maint ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ (require 'cl)) ; assert (defvar bzrmerge-skip-regexp - "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" + "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk" "Regexp matching logs of revisions that might be skipped. `bzrmerge-missing' will ask you if it should skip any matches.") ------------------------------------------------------------ revno: 107845 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 19:09:34 +0200 message: * obsolete/mouse-sel.el: Add an Obsolete-since header. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 14:16:05 +0000 +++ lisp/ChangeLog 2012-04-10 17:09:34 +0000 @@ -1,3 +1,7 @@ +2012-04-10 Lars Magne Ingebrigtsen + + * obsolete/mouse-sel.el: Add an Obsolete-since header. + 2012-04-10 Juanma Barranquero * misc.el: Display absolute path of loaded DLLs (bug#10424). === modified file 'lisp/obsolete/mouse-sel.el' --- lisp/obsolete/mouse-sel.el 2012-04-10 17:08:36 +0000 +++ lisp/obsolete/mouse-sel.el 2012-04-10 17:09:34 +0000 @@ -4,6 +4,7 @@ ;; Author: Mike Williams ;; Keywords: mouse +;; Obsolete-since: 24.2 ;; This file is part of GNU Emacs. ------------------------------------------------------------ revno: 107844 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 19:08:36 +0200 message: Moved mouse-sel.el to the lisp/obsolete directory diff: === renamed file 'lisp/mouse-sel.el' => 'lisp/obsolete/mouse-sel.el' ------------------------------------------------------------ revno: 107843 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 19:03:34 +0200 message: Tiny url-util.el code clean-up. diff: === modified file 'lisp/url/url-util.el' --- lisp/url/url-util.el 2012-04-10 17:02:04 +0000 +++ lisp/url/url-util.el 2012-04-10 17:03:34 +0000 @@ -330,8 +330,7 @@ " ") (t (byte-to-string code)))) str (substring str (match-end 0))))) - (setq tmp (concat tmp str)) - tmp)) + (concat tmp str))) (defconst url-unreserved-chars '( ------------------------------------------------------------ revno: 107842 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 19:02:04 +0200 message: Revert previous url-util patch. The caller can as easily do the decoding themselves. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-04-10 11:22:08 +0000 +++ lisp/url/ChangeLog 2012-04-10 17:02:04 +0000 @@ -10,9 +10,6 @@ 2012-04-10 Lars Magne Ingebrigtsen - * url-util.el (url-unhex-string): Add an optional CODING-SYSTEM - parameter (bug#6252). - * url-domsurf.el: New file (bug#1401). * url-cookie.el (url-cookie-two-dot-domains): Remove. === modified file 'lisp/url/url-util.el' --- lisp/url/url-util.el 2012-04-10 02:14:13 +0000 +++ lisp/url/url-util.el 2012-04-10 17:02:04 +0000 @@ -308,13 +308,11 @@ ;; str)) ;;;###autoload -(defun url-unhex-string (str &optional allow-newlines coding-system) +(defun url-unhex-string (str &optional allow-newlines) "Remove %XX embedded spaces, etc in a URL. If optional second argument ALLOW-NEWLINES is non-nil, then allow the decoding of carriage returns and line feeds in the string, which is normally -forbidden in URL encoding. -If CODING-SYSTEM is non-nil, interpret the unhexed string as -being encoded in that coding system." +forbidden in URL encoding." (setq str (or str "")) (let ((tmp "") (case-fold-search t)) @@ -333,9 +331,7 @@ (t (byte-to-string code)))) str (substring str (match-end 0))))) (setq tmp (concat tmp str)) - (if coding-system - (decode-coding-string tmp coding-system) - tmp))) + tmp)) (defconst url-unreserved-chars '( ------------------------------------------------------------ revno: 107841 fixes bug(s): http://debbugs.gnu.org/10424 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2012-04-10 16:16:05 +0200 message: Record and display absolute path of DLLs loaded (bug#10424). * lisp/misc.el (list-dynamic-libraries--loaded): New function. (list-dynamic-libraries--refresh): Use it. * src/w32.c (w32_delayed_load): Record the full path of the library being loaded. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 11:27:44 +0000 +++ lisp/ChangeLog 2012-04-10 14:16:05 +0000 @@ -1,3 +1,9 @@ +2012-04-10 Juanma Barranquero + + * misc.el: Display absolute path of loaded DLLs (bug#10424). + (list-dynamic-libraries--loaded): New function. + (list-dynamic-libraries--refresh): Use it. + 2012-04-10 Nathan Weizenbaum * progmodes/python.el (python-fill-paragraph): Make === modified file 'lisp/misc.el' --- lisp/misc.el 2012-01-19 07:21:25 +0000 +++ lisp/misc.el 2012-04-10 14:16:05 +0000 @@ -138,6 +138,19 @@ (defvar list-dynamic-libraries--loaded-only-p) (make-variable-buffer-local 'list-dynamic-libraries--loaded-only-p) +(defun list-dynamic-libraries--loaded (from) + "Compute the \"Loaded from\" column. +Internal use only." + (if from + (let ((name (car from)) + (path (or (cdr from) ""))) + ;; This is a roundabout way to change the tooltip without + ;; having to replace the default printer function + (propertize name + 'display (propertize name + 'help-echo (concat "Loaded from: " path)))) + "")) + (defun list-dynamic-libraries--refresh () "Recompute the list of dynamic libraries. Internal use only." @@ -159,7 +172,7 @@ (when (or from (not list-dynamic-libraries--loaded-only-p)) (push (list id (vector (symbol-name id) - (or from "") + (list-dynamic-libraries--loaded from) (mapconcat 'identity (cdr lib) ", "))) tabulated-list-entries))))) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-09 20:43:15 +0000 +++ src/ChangeLog 2012-04-10 14:16:05 +0000 @@ -1,3 +1,8 @@ +2012-04-10 Juanma Barranquero + + * w32.c (w32_delayed_load): Record the full path of the library + being loaded (bug#10424). + 2012-04-09 Glenn Morris * doc.c (Fsnarf_documentation): Check variables, functions are bound, === modified file 'src/w32.c' --- src/w32.c 2012-02-04 13:48:38 +0000 +++ src/w32.c 2012-04-10 14:16:05 +0000 @@ -5816,7 +5816,15 @@ CHECK_STRING_CAR (dlls); if ((library_dll = LoadLibrary (SDATA (XCAR (dlls))))) { - found = XCAR (dlls); + char name[MAX_PATH]; + DWORD len; + + len = GetModuleFileNameA (library_dll, name, sizeof (name)); + found = Fcons (XCAR (dlls), + (len > 0) + /* Possibly truncated */ + ? make_specified_string (name, -1, len, 1) + : Qnil); break; } } ------------------------------------------------------------ revno: 107840 fixes bug(s): http://debbugs.gnu.org/7018 author: Nathan Weizenbaum committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 13:27:44 +0200 message: `python-fill-paragraph' filling fixup when font-lock is disabled * progmodes/python.el (python-fill-paragraph): Make python-fill-region in a multiline string work when font-lock is disabled. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 11:15:11 +0000 +++ lisp/ChangeLog 2012-04-10 11:27:44 +0000 @@ -1,3 +1,9 @@ +2012-04-10 Nathan Weizenbaum + + * progmodes/python.el (python-fill-paragraph): Make + python-fill-region in a multiline string work when font-lock is + disabled (bug#7018). + 2012-04-10 Laimonas Vėbra (tiny change) * language/european.el (cp775): Added oem/legacy (en)coding on === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2012-04-09 13:05:48 +0000 +++ lisp/progmodes/python.el 2012-04-10 11:27:44 +0000 @@ -1959,7 +1959,7 @@ ;; paragraph in a multi-line string properly, so narrow ;; to the string and then fill around (the end of) the ;; current line. - ((eq t (nth 3 syntax)) ; in fenced string + ((nth 3 syntax) ; in fenced string (goto-char (nth 8 syntax)) ; string start (setq start (line-beginning-position)) (setq end (condition-case () ; for unbalanced quotes ------------------------------------------------------------ revno: 107839 fixes bug(s): http://debbugs.gnu.org/7017 author: William Xu committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 13:22:08 +0200 message: (url-retrieve-internal): Hexify multibye URL string first when necessary. Also mention this in the relevant doc strings. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-04-10 02:14:13 +0000 +++ lisp/url/ChangeLog 2012-04-10 11:22:08 +0000 @@ -1,3 +1,13 @@ +2012-04-10 William Xu (tiny change) + + * url.el (url-retrieve-internal): Hexify multibye URL string first + when necessary (bug#7017). + +2012-04-10 Lars Magne Ingebrigtsen + + * url.el (url-retrieve-internal): Mention utf-8 encoding. + (url-retrieve): Ditto. + 2012-04-10 Lars Magne Ingebrigtsen * url-util.el (url-unhex-string): Add an optional CODING-SYSTEM === modified file 'lisp/url/url.el' --- lisp/url/url.el 2012-02-20 08:22:41 +0000 +++ lisp/url/url.el 2012-04-10 11:22:08 +0000 @@ -149,7 +149,9 @@ If SILENT, then don't message progress reports and the like. If INHIBIT-COOKIES, cookies will neither be stored nor sent to -the server." +the server. +If URL is a multibyte string, it will be encoded as utf-8 and +URL-encoded before it's used." ;;; XXX: There is code in Emacs that does dynamic binding ;;; of the following variables around url-retrieve: ;;; url-standalone-mode, url-gateway-unplugged, w3-honor-stylesheets, @@ -171,11 +173,16 @@ If SILENT, don't message progress reports and the like. If INHIBIT-COOKIES, cookies will neither be stored nor sent to -the server." +the server. +If URL is a multibyte string, it will be encoded as utf-8 and +URL-encoded before it's used." (url-do-setup) (url-gc-dead-buffers) (if (stringp url) (set-text-properties 0 (length url) nil url)) + (when (multibyte-string-p url) + (let ((url-unreserved-chars (append '(?: ?/) url-unreserved-chars))) + (setq url (url-hexify-string url)))) (if (not (vectorp url)) (setq url (url-generic-parse-url url))) (if (not (functionp callback)) ------------------------------------------------------------ revno: 107838 fixes bug(s): http://debbugs.gnu.org/6519 author: Laimonas V bra committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 13:15:11 +0200 message: Added new charset cp775 * language/european.el (cp775): Added oem/legacy (en)coding on DOS/MS Windows for the Baltic languages. There are still plenty of texts written in this encoding/codepage. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 07:19:38 +0000 +++ lisp/ChangeLog 2012-04-10 11:15:11 +0000 @@ -1,3 +1,9 @@ +2012-04-10 Laimonas Vėbra (tiny change) + + * language/european.el (cp775): Added oem/legacy (en)coding on + DOS/MS Windows for the Baltic languages. There are still plenty of + texts written in this encoding/codepage (bug#6519). + 2012-04-10 Glenn Morris * cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac): === modified file 'lisp/language/european.el' --- lisp/language/european.el 2012-01-19 07:21:25 +0000 +++ lisp/language/european.el 2012-04-10 11:15:11 +0000 @@ -324,6 +324,14 @@ :mime-charset 'windows-1257) (define-coding-system-alias 'cp1257 'windows-1257) +(define-coding-system 'cp775 + "DOS codepage 775 (PC Baltic, MS-DOS Baltic Rim)" + :coding-type 'charset + :mnemonic ?D + :charset-list '(cp775) + :mime-charset 'cp775) +(define-coding-system-alias 'ibm775 'cp775) + (define-coding-system 'cp850 "DOS codepage 850 (Western European)" :coding-type 'charset ------------------------------------------------------------ revno: 107837 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2012-04-10 13:54:17 +0300 message: Fix changes in revision 107818. diff: === modified file 'lisp/international/characters.el' --- lisp/international/characters.el 2012-04-09 18:12:40 +0000 +++ lisp/international/characters.el 2012-04-10 10:54:17 +0000 @@ -576,7 +576,7 @@ (set-case-syntax-pair from (1+ from) tbl) (setq from (+ from 2)))))) - (set-case-syntax-pair ?Ÿ ?ÿ tbl) + (set-case-syntax-pair #x178 #x0ff tbl) (set-case-syntax-pair #x189 #x256 tbl) (set-case-syntax-pair #x18A #x257 tbl) ------------------------------------------------------------ revno: 107836 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 06:17:26 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2012-04-09 10:17:30 +0000 +++ autogen/configure 2012-04-10 10:17:26 +0000 @@ -22430,6 +22430,16 @@ fi + +opt_makefile=admin/unidata/Makefile + +if test -f $srcdir/${opt_makefile}.in; then + SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile" + ac_config_files="$ac_config_files admin/unidata/Makefile" + +fi + + SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'` @@ -23259,6 +23269,7 @@ "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;; + "admin/unidata/Makefile") CONFIG_FILES="$CONFIG_FILES admin/unidata/Makefile" ;; "mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;; "epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;; "gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;; ------------------------------------------------------------ revno: 107835 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 00:19:38 -0700 message: Remove some more "rogue" defcustoms that show up in emacs -Q * lisp/cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac): Add :standard values, reducing "rogue" customs in emacs -Q a bit more. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-10 02:45:10 +0000 +++ lisp/ChangeLog 2012-04-10 07:19:38 +0000 @@ -1,3 +1,8 @@ +2012-04-10 Glenn Morris + + * cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac): + Add :standard values, reducing "rogue" customs in emacs -Q a bit more. + 2012-04-10 Florian Adamsky (tiny change) * recentf.el (recentf-dialog-mode-map): Added two keybindings for === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2012-03-07 05:53:51 +0000 +++ lisp/cus-start.el 2012-04-10 07:19:38 +0000 @@ -138,9 +138,18 @@ ;; coding.c (inhibit-eol-conversion mule boolean) (eol-mnemonic-undecided mule string) - (eol-mnemonic-unix mule string) - (eol-mnemonic-dos mule string) - (eol-mnemonic-mac mule string) + ;; startup.el fiddles with the values. IMO, would be + ;; simpler to just use #ifdefs in coding.c. + (eol-mnemonic-unix mule string nil + :standard + (if (memq system-type '(ms-dos windows-nt)) + "(Unix)" ":")) + (eol-mnemonic-dos mule string nil + :standard + (if (memq system-type '(ms-dos windows-nt)) + "\\" "(DOS)")) + (eol-mnemonic-mac mule string nil + :standard "(Mac)") (file-coding-system-alist mule (alist ------------------------------------------------------------ revno: 107834 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 00:18:02 -0700 message: Generate admin/unidata/Makefile with configure * configure.in: Conditionally generate admin/unidata/Makefile. * admin/unidata/Makefile.in: Add FSF copyright. Make it use autoconf features, and work for out-of-tree builds. diff: === modified file 'ChangeLog' --- ChangeLog 2012-04-09 13:10:22 +0000 +++ ChangeLog 2012-04-10 07:18:02 +0000 @@ -1,8 +1,10 @@ +2012-04-10 Glenn Morris + + * configure.in: Conditionally generate admin/unidata/Makefile. + 2012-04-09 Teodor Zlatanov - * info/dir (File): - * Makefile.in: Add emacs-gnutls to the info directory and the - INFO_FILES target. + * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls manual. 2012-04-09 Glenn Morris === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-04-07 14:26:14 +0000 +++ admin/ChangeLog 2012-04-10 07:18:02 +0000 @@ -1,3 +1,8 @@ +2012-04-10 Glenn Morris + + * unidata/Makefile.in: Add FSF copyright. + Make it use autoconf features, and work for out-of-tree builds. + 2012-04-07 Eli Zaretskii * unidata/README: === modified file 'admin/unidata/Makefile.in' --- admin/unidata/Makefile.in 2011-08-15 17:47:25 +0000 +++ admin/unidata/Makefile.in 2012-04-10 07:18:02 +0000 @@ -1,4 +1,7 @@ # Makefile -- Makefile to generate character property tables. + +# Copyright (C) 2012 Free Software Foundation, Inc. + # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 @@ -18,25 +21,33 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see . - -EMACS = ../../src/emacs -DSTDIR = ../../lisp/international -RUNEMACS = ${EMACS} -Q -batch +SHELL = /bin/sh + +srcdir = @srcdir@ +abs_builddir = @abs_builddir@ +top_srcdir = @top_srcdir@ +abs_top_builddir = @abs_top_builddir@ + +EMACS = ${abs_top_builddir}/src/emacs +DSTDIR = ${top_srcdir}/lisp/international +emacs = ${EMACS} -batch --no-site-file --no-site-lisp all: ${DSTDIR}/charprop.el .el.elc: - ${RUNEMACS} -batch -f batch-byte-compile $< - -unidata.txt: UnicodeData.txt - sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < UnicodeData.txt > $@ - -${DSTDIR}/charprop.el: unidata-gen.elc unidata.txt - ELC=`/bin/pwd`/unidata-gen.elc; \ - DATADIR=`/bin/pwd`; \ - DATA=unidata.txt; \ - cd ${DSTDIR}; \ - ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA} + ${emacs} -f batch-byte-compile $< + +unidata.txt: ${srcdir}/UnicodeData.txt + sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < ${srcdir}/UnicodeData.txt > $@ + +${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt + cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \ + -f unidata-gen-files ${srcdir} ${abs_builddir}/unidata.txt + +## Like the above, but generate in PWD rather than lisp/international. +charprop.el: ${srcdir}/unidata-gen.elc unidata.txt + ${emacs} -l ${srcdir}/unidata-gen \ + -f unidata-gen-files ${srcdir} unidata.txt install: charprop.el cp charprop.el ${DSTDIR} @@ -46,4 +57,9 @@ if test -f charprop.el; then \ rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \ fi - rm -f charprop.el unidata-gen.elc unidata.txt + rm -f charprop.el ${srcdir}/unidata-gen.elc unidata.txt + +distclean: clean + -rm -f ./Makefile + +maintainer-clean: distclean === modified file 'configure.in' --- configure.in 2012-04-09 00:50:17 +0000 +++ configure.in 2012-04-10 07:18:02 +0000 @@ -3834,6 +3834,16 @@ AC_CONFIG_FILES([test/automated/Makefile]) fi + +dnl admin/ may or may not be present. +opt_makefile=admin/unidata/Makefile + +if test -f $srcdir/${opt_makefile}.in; then + SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile" + AC_CONFIG_FILES([admin/unidata/Makefile]) +fi + + SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' -e 's|Makefile|Makefile.in|g'` AC_SUBST(SUBDIR_MAKEFILES_IN) ------------------------------------------------------------ revno: 107833 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-10 00:15:09 -0700 message: Comment trivia. diff: === modified file 'lisp/url/url-domsuf.el' --- lisp/url/url-domsuf.el 2012-04-10 01:57:45 +0000 +++ lisp/url/url-domsuf.el 2012-04-10 07:15:09 +0000 @@ -1,6 +1,8 @@ ;;; url-domsuf.el --- Say what domain names can have cookies set. -;; Copyright (C) 2011 Free Software Foundation, Inc. +;; Copyright (C) 2012 Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen ;; Keywords: comm, data, processes, hypermedia ------------------------------------------------------------ revno: 107832 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2012-04-10 06:43:35 +0200 message: Make erc use auth-source to look up channel keys * lisp/erc/erc-join.el (erc-server-join-channel): New function to look up the channel password via auth-source. (erc-autojoin-channels): Use it. (erc-autojoin-after-ident): Ditto. (erc-autojoin-channels-alist): Mention auth-source. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-04-09 12:36:01 +0000 +++ etc/NEWS 2012-04-10 04:43:35 +0000 @@ -39,6 +39,10 @@ * Editing Changes in Emacs 24.2 * Changes in Specialized Modes and Packages in Emacs 24.2 + +** erc will look up server/channel names via auth-source and use the + channel keys found, if any. + * New Modes and Packages in Emacs 24.2 === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-04-10 02:51:39 +0000 +++ lisp/erc/ChangeLog 2012-04-10 04:43:35 +0000 @@ -1,3 +1,11 @@ +2012-04-10 Lars Magne Ingebrigtsen + + * erc-join.el (erc-server-join-channel): New function to look up + the channel password via auth-source. + (erc-autojoin-channels): Use it. + (erc-autojoin-after-ident): Ditto. + (erc-autojoin-channels-alist): Mention auth-source. + 2012-04-10 Deniz Dogan (tiny change) * erc.el (erc-display-prompt): Adds the field text property to the === modified file 'lisp/erc/erc-join.el' --- lisp/erc/erc-join.el 2012-02-08 08:07:24 +0000 +++ lisp/erc/erc-join.el 2012-04-10 04:43:35 +0000 @@ -32,6 +32,7 @@ ;;; Code: (require 'erc) +(require 'auth-source) (eval-when-compile (require 'cl)) (defgroup erc-autojoin nil @@ -56,6 +57,13 @@ SERVER is a regexp matching the server, and channels is the list of channels to join. +If the channel(s) require channel keys for joining, the passwords +are found via auth-source. For instance, if you use ~/.authinfo +as your auth-source backend, then put something like the +following in that file: + +machine irc.example.net login \"#fsf\" password sEcReT + Customize this variable to set the value for your first connect. Once you are connected and join and part channels, this alist keeps track of what channels you are on, and will join them @@ -131,7 +139,7 @@ (when (string-match (car l) server) (dolist (chan (cdr l)) (unless (erc-member-ignore-case chan joined) - (erc-server-send (concat "join " chan)))))))) + (erc-server-join-channel server chan))))))) nil) (defun erc-autojoin-channels (server nick) @@ -148,10 +156,25 @@ (dolist (l erc-autojoin-channels-alist) (when (string-match (car l) server) (dolist (chan (cdr l)) - (erc-server-send (concat "join " chan)))))) + (erc-server-join-channel server chan))))) ;; Return nil to avoid stomping on any other hook funcs. nil) +(defun erc-server-join-channel (server channel) + (let* ((secret (plist-get (nth 0 (auth-source-search + :max 1 + :host server + :port "irc" + :user channel)) + :secret)) + (password (if (functionp secret) + (funcall secret) + secret))) + (erc-server-send (concat "join " channel + (if password + (concat " " password) + ""))))) + (defun erc-autojoin-add (proc parsed) "Add the channel being joined to `erc-autojoin-channels-alist'." (let* ((chnl (erc-response.contents parsed))