------------------------------------------------------------ revno: 115256 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-11-27 00:21:19 -0800 message: Make bootstrap without generated uni-*.el files possible again * lisp/loadup.el: Update command-line-args checking for unidata-gen. Add vc to load-path to allow loading vc-bzr when writing uni-*.el. * lisp/composite.el, lisp/international/characters.el: Handle unicode tables being undefined. * lisp/composite.el: Add (rough) FSF copyright years. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-27 06:28:18 +0000 +++ lisp/ChangeLog 2013-11-27 08:21:19 +0000 @@ -1,5 +1,11 @@ 2013-11-27 Glenn Morris + Make bootstrap without generated uni-*.el files possible again. + * loadup.el: Update command-line-args checking for unidata-gen. + Add vc to load-path to allow loading vc-bzr when writing uni-*.el. + * composite.el, international/characters.el: + Handle unicode tables being undefined. + Move ja-dic, quail, leim-list.el from ../leim to a leim subdirectory. * Makefile.in (setwins_for_subdirs): Skip leim/ directory. (compile-main): Depend on leim rule. === modified file 'lisp/composite.el' --- lisp/composite.el 2013-11-05 07:44:14 +0000 +++ lisp/composite.el 2013-11-27 08:21:19 +0000 @@ -1,5 +1,7 @@ ;;; composite.el --- support character composition +;; Copyright (C) 2001-2013 Free Software Foundation, Inc. + ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) @@ -669,13 +671,15 @@ (setq i (1+ i)))) gstring)))))) -(let ((elt `([,(purecopy "\\c.\\c^+") 1 compose-gstring-for-graphic] - [nil 0 compose-gstring-for-graphic]))) - (map-char-table - #'(lambda (key val) - (if (memq val '(Mn Mc Me)) - (set-char-table-range composition-function-table key elt))) - unicode-category-table)) +;; Allow for bootstrapping without uni-*.el. +(when unicode-category-table + (let ((elt `([,(purecopy "\\c.\\c^+") 1 compose-gstring-for-graphic] + [nil 0 compose-gstring-for-graphic]))) + (map-char-table + #'(lambda (key val) + (if (memq val '(Mn Mc Me)) + (set-char-table-range composition-function-table key elt))) + unicode-category-table))) (defun compose-gstring-for-terminal (gstring) "Compose glyph-string GSTRING for terminal display. === modified file 'lisp/international/characters.el' --- lisp/international/characters.el 2013-11-05 09:54:43 +0000 +++ lisp/international/characters.el 2013-11-27 08:21:19 +0000 @@ -484,13 +484,16 @@ ;; Bidi categories -(map-char-table (lambda (key val) - (cond - ((memq val '(R AL RLO RLE)) - (modify-category-entry key ?R)) - ((memq val '(L LRE LRO)) - (modify-category-entry key ?L)))) - (unicode-property-table-internal 'bidi-class)) +;; If bootstrapping without generated uni-*.el files, table not defined. +(let ((table (unicode-property-table-internal 'bidi-class))) + (when table + (map-char-table (lambda (key val) + (cond + ((memq val '(R AL RLO RLE)) + (modify-category-entry key ?R)) + ((memq val '(L LRE LRO)) + (modify-category-entry key ?L)))) + table))) ;; Latin @@ -1332,15 +1335,15 @@ ;;; Setting unicode-category-table. -(setq unicode-category-table - (unicode-property-table-internal 'general-category)) -(map-char-table #'(lambda (key val) - (if (and val - (or (and (/= (aref (symbol-name val) 0) ?M) - (/= (aref (symbol-name val) 0) ?C)) - (eq val 'Zs))) - (modify-category-entry key ?.))) - unicode-category-table) +(when (setq unicode-category-table + (unicode-property-table-internal 'general-category)) + (map-char-table #'(lambda (key val) + (if (and val + (or (and (/= (aref (symbol-name val) 0) ?M) + (/= (aref (symbol-name val) 0) ?C)) + (eq val 'Zs))) + (modify-category-entry key ?.))) + unicode-category-table)) (optimize-char-table (standard-category-table)) @@ -1426,23 +1429,24 @@ (glyphless-set-char-table-range glyphless-char-display #x80 #x9F method)) ((eq target 'format-control) - (map-char-table - #'(lambda (char category) - (if (eq category 'Cf) - (let ((this-method method) - from to) - (if (consp char) - (setq from (car char) to (cdr char)) - (setq from char to char)) - (while (<= from to) - (when (/= from #xAD) - (if (eq method 'acronym) - (setq this-method - (aref char-acronym-table from))) - (set-char-table-range glyphless-char-display - from this-method)) - (setq from (1+ from)))))) - unicode-category-table)) + (when unicode-category-table + (map-char-table + #'(lambda (char category) + (if (eq category 'Cf) + (let ((this-method method) + from to) + (if (consp char) + (setq from (car char) to (cdr char)) + (setq from char to char)) + (while (<= from to) + (when (/= from #xAD) + (if (eq method 'acronym) + (setq this-method + (aref char-acronym-table from))) + (set-char-table-range glyphless-char-display + from this-method)) + (setq from (1+ from)))))) + unicode-category-table))) ((eq target 'no-font) (set-char-table-extra-slot glyphless-char-display 0 method)) (t === modified file 'lisp/loadup.el' --- lisp/loadup.el 2013-11-27 06:15:06 +0000 +++ lisp/loadup.el 2013-11-27 08:21:19 +0000 @@ -51,8 +51,9 @@ ;; in deciding whether to modify it. (if (or (equal (nth 3 command-line-args) "bootstrap") (equal (nth 4 command-line-args) "bootstrap") - (equal (nth 3 command-line-args) "unidata-gen.el") - (equal (nth 4 command-line-args) "unidata-gen-files") + ;; FIXME this is irritatingly fragile. + (equal (nth 4 command-line-args) "unidata-gen.el") + (equal (nth 7 command-line-args) "unidata-gen-files") ;; In case CANNOT_DUMP. (string-match "src/bootstrap-emacs" (nth 0 command-line-args))) (let ((dir (car load-path))) @@ -62,7 +63,8 @@ (expand-file-name "emacs-lisp" dir) (expand-file-name "language" dir) (expand-file-name "international" dir) - (expand-file-name "textmodes" dir))))) + (expand-file-name "textmodes" dir) + (expand-file-name "vc" dir))))) (if (eq t purify-flag) ;; Hash consing saved around 11% of pure space in my tests. ------------------------------------------------------------ revno: 115255 committer: martin rudalics branch nick: trunk timestamp: Wed 2013-11-27 08:44:48 +0100 message: Reset window_end_valid after some window changes (Bug#15957). * window.c (Fset_window_start, window_resize_apply) (window_scroll): Reset window_end_valid (Bug#15957). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-27 06:15:06 +0000 +++ src/ChangeLog 2013-11-27 07:44:48 +0000 @@ -1,3 +1,8 @@ +2013-11-27 Martin Rudalics + + * window.c (Fset_window_start, window_resize_apply) + (window_scroll): Reset window_end_valid (Bug#15957). + 2013-11-27 Glenn Morris * Makefile.in (leimdir): Now in lisp source directory. === modified file 'src/window.c' --- src/window.c 2013-11-06 18:41:31 +0000 +++ src/window.c 2013-11-27 07:44:48 +0000 @@ -1574,6 +1574,8 @@ if (NILP (noforce)) w->force_start = 1; w->update_mode_line = 1; + /* Bug#15957. */ + w->window_end_valid = 0; if (w != XWINDOW (selected_window)) /* Enforce full redisplay. FIXME: make it more selective. */ windows_or_buffers_changed = 26; @@ -3615,6 +3617,9 @@ c = NILP (c->next) ? 0 : XWINDOW (c->next); } } + else + /* Bug#15957. */ + w->window_end_valid = 0; } @@ -4286,6 +4291,8 @@ else window_scroll_line_based (window, n, whole, noerror); + /* Bug#15957. */ + XWINDOW (window)->window_end_valid = 0; immediate_quit = 0; } ------------------------------------------------------------ revno: 115254 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2013-11-27 06:39:37 +0000 message: [Gnus] Allow overriding charset in some decoding functions diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-11-27 01:59:37 +0000 +++ lisp/gnus/ChangeLog 2013-11-27 06:39:37 +0000 @@ -1,5 +1,13 @@ 2013-11-27 Katsumi Yamaoka + * gnus-art.el (article-de-quoted-unreadable) + (article-de-base64-unreadable, gnus-mime-copy-part) + * gnus-html.el (gnus-article-html) + * mm-view.el (mm-inline-text-html-render-with-w3) + (mm-inline-text-html-render-with-w3m-standalone) + * rfc2231.el (rfc2231-decode-encoded-string): + Allow overriding charset by mm-charset-override-alist. + * gnus-art.el (gnus-article-browse-html-parts): Replace LWSPs with ` 's in header. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2013-11-27 01:59:37 +0000 +++ lisp/gnus/gnus-art.el 2013-11-27 06:39:37 +0000 @@ -2665,7 +2665,7 @@ (string-match "quoted-printable" type)))) (article-goto-body) (quoted-printable-decode-region - (point) (point-max) (mm-charset-to-coding-system charset)))))) + (point) (point-max) (mm-charset-to-coding-system charset nil t)))))) (defun article-de-base64-unreadable (&optional force read-charset) "Translate a base64 article. @@ -2696,7 +2696,8 @@ (narrow-to-region (point) (point-max)) (base64-decode-region (point-min) (point-max)) (mm-decode-coding-region - (point-min) (point-max) (mm-charset-to-coding-system charset))))))) + (point-min) (point-max) + (mm-charset-to-coding-system charset nil t))))))) (eval-when-compile (require 'rfc1843)) @@ -5247,7 +5248,8 @@ (switch-to-buffer (generate-new-buffer filename)) (if (or coding-system (and charset - (setq coding-system (mm-charset-to-coding-system charset)) + (setq coding-system (mm-charset-to-coding-system + charset nil t)) (not (eq coding-system 'ascii)))) (progn (mm-enable-multibyte) === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2013-09-13 07:19:15 +0000 +++ lisp/gnus/gnus-html.el 2013-11-27 06:39:37 +0000 @@ -143,7 +143,8 @@ (charset (mail-content-type-get (mm-handle-type handle) 'charset))) (when (and charset - (setq charset (mm-charset-to-coding-system charset)) + (setq charset (mm-charset-to-coding-system + charset nil t)) (not (eq charset 'ascii))) (insert (prog1 (mm-decode-coding-string (buffer-string) charset) === modified file 'lisp/gnus/mm-view.el' --- lisp/gnus/mm-view.el 2013-07-06 23:40:56 +0000 +++ lisp/gnus/mm-view.el 2013-11-27 06:39:37 +0000 @@ -175,7 +175,7 @@ (match-end 2)))) (if (fboundp 'w3-coding-system-for-mime-charset) (w3-coding-system-for-mime-charset bsubstr) - (mm-charset-to-coding-system bsubstr)))) + (mm-charset-to-coding-system bsubstr nil t)))) (delete-region (point-min) (point-max)) (insert (mm-decode-string text charset)))) (save-window-excursion @@ -343,9 +343,10 @@ 'charset) (symbol-name mail-parse-charset))) cs) - (unless (and charset - (setq cs (mm-charset-to-coding-system charset)) - (not (eq cs 'ascii))) + (if (and charset + (setq cs (mm-charset-to-coding-system charset nil t)) + (not (eq cs 'ascii))) + (setq charset (format "%s" (mm-coding-system-to-mime-charset cs))) ;; The default. (setq charset "iso-8859-1" cs 'iso-8859-1)) === modified file 'lisp/gnus/rfc2231.el' --- lisp/gnus/rfc2231.el 2013-01-01 09:11:05 +0000 +++ lisp/gnus/rfc2231.el 2013-11-27 06:39:37 +0000 @@ -215,7 +215,8 @@ \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or \"This is ***fun***\"." (string-match "\\`\\(?:\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string) - (let ((coding-system (mm-charset-to-coding-system (match-string 1 string))) + (let ((coding-system (mm-charset-to-coding-system + (match-string 1 string) nil t)) ;;(language (match-string 2 string)) (value (match-string 3 string))) (mm-with-unibyte-buffer ------------------------------------------------------------ revno: 115253 committer: Glenn Morris branch nick: trunk timestamp: Tue 2013-11-26 22:28:18 -0800 message: ChangeLog fixes diff: === modified file 'ChangeLog' --- ChangeLog 2013-11-27 06:15:06 +0000 +++ ChangeLog 2013-11-27 06:28:18 +0000 @@ -1,5 +1,6 @@ 2013-11-27 Glenn Morris + Move ja-dic, quail, leim-list.el from leim to lisp/leim. * Makefile.in (abs_builddir, leimdir): Remove. (buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory. (epaths-force-w32): No longer set BLD. === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-11-27 06:19:02 +0000 +++ leim/ChangeLog 2013-11-27 06:28:18 +0000 @@ -1,5 +1,6 @@ 2013-11-27 Glenn Morris + Move ja-dic, quail, leim-list.el to ../lisp/leim. * Makefile.in (leimdir): New variable. (TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc) (${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el): === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-27 06:17:47 +0000 +++ lisp/ChangeLog 2013-11-27 06:28:18 +0000 @@ -1,5 +1,6 @@ 2013-11-27 Glenn Morris + Move ja-dic, quail, leim-list.el from ../leim to a leim subdirectory. * Makefile.in (setwins_for_subdirs): Skip leim/ directory. (compile-main): Depend on leim rule. (leim): New rule. ------------------------------------------------------------ revno: 115252 committer: Glenn Morris branch nick: trunk timestamp: Tue 2013-11-26 22:19:02 -0800 message: ChangeLog fix diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-11-27 06:15:06 +0000 +++ leim/ChangeLog 2013-11-27 06:19:02 +0000 @@ -13,6 +13,7 @@ * leim-ext.el (ucs-input-activate, hangul-input-method-activate): Remove manual autoloads; now in loaddefs.el. Disable byte-compile, version-control, autoloads in the output. + * quail: Move to ../lisp/leim. 2013-11-23 Glenn Morris ------------------------------------------------------------ revno: 115251 committer: Glenn Morris branch nick: trunk timestamp: Tue 2013-11-26 22:17:47 -0800 message: Mark tiny change diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-27 06:15:06 +0000 +++ lisp/ChangeLog 2013-11-27 06:17:47 +0000 @@ -54,7 +54,7 @@ * emacs-lisp/helpers.el (string-join): New function. -2013-11-25 Sebastian Wiesner +2013-11-25 Sebastian Wiesner (tiny change) * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions): Mark as obsolete and replace it with a symbol property. ------------------------------------------------------------ revno: 115250 committer: Glenn Morris branch nick: trunk timestamp: Tue 2013-11-26 22:15:06 -0800 message: Move runtime leim lisp files to lisp/leim directory This allows us to reuse much of the lisp build and installation machinery, rather than duplicating it. * Makefile.in (abs_builddir, leimdir): Remove. (buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory. (epaths-force-w32): No longer set BLD. (leim): Remove. (install-arch-indep): No longer run or install leim. (mostlyclean, clean): No longer run leim rule. (bootstrap-clean): Change leim target. (maintainer-clean): Add leim. (check-declare): Remove leim. * README: Update for leim changes. * configure.ac (leimdir): Remove. (standardlisppath): No more leimdir. * make-dist: Update for files from leim/ now being in lisp/leim/. * doc/lispref/loading.texi (Library Search): * doc/lispref/os.texi (Startup Summary): No more leim directory. * leim/Makefile.in (leimdir): New variable. (TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc) (${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el): Generate in $leimdir. (all): Remove compilation, add ja-dic. (leim-list.el): Now PHONY. (setwins, compile-targets, compile-main, clean, mostlyclean) (extraclean): Remove. (bootstrap-clean): Delete all generated files. * leim/README: Update for moved leim/ directory. * leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate): Remove manual autoloads; now in loaddefs.el. Disable byte-compile, version-control, autoloads in the output. * lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory. (compile-main): Depend on lisp/leim rule. (leim): New rule. * lisp/loadup.el: Move leim-list.el to leim/ subdirectory. * lisp/startup.el (normal-top-level): No more leim directory. * lisp/international/ja-dic-cnv.el (skkdic-convert): Disable version-control and autoloads in output files. * lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert): Disable version-control and autoloads in output files. * lisp/leim/quail: Move here from ../leim. * lisp/leim/quail/hangul.el (hangul-input-method-activate): Add autoload cookie. (generated-autoload-load-name): Set file-local value. * lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie. (generated-autoload-load-name): Set file-local value. * nt/README.W32: * nt/addpm.c (env_vars): * nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH): * nt/paths.h (PATH_LOADSEARCH): No more leim directory. * src/Makefile.in (leimdir): Now in lisp source directory. ($(leimdir)/leim-list.el): Just use ../leim . * src/epaths.in (PATH_DUMPLOADSEARCH): * src/lread.c (load_path_default): * src/nsterm.m (ns_load_path): No more leim directory. * .bzrignore: Update for relocated leim files. diff: === modified file '.bzrignore' --- .bzrignore 2013-11-02 19:41:33 +0000 +++ .bzrignore 2013-11-27 06:15:06 +0000 @@ -90,12 +90,8 @@ build-aux/depcomp build-aux/install-sh build-aux/missing -leim/ja-dic/ -leim/leim-list.el -leim/quail/*.el leim/changed.misc leim/changed.tit -leim/stamp-subdir lib/.deps lib/Makefile.in lib/deps @@ -152,6 +148,30 @@ lisp/eshell/esh-groups.el lisp/finder-inf.el lisp/gnus/_dir-locals.el +lisp/leim/ja-dic +lisp/leim/leim-list.el +# Generated quail files. +lisp/leim/quail/4Corner.el +lisp/leim/quail/ARRAY30.el +lisp/leim/quail/CCDOSPY.el +lisp/leim/quail/CTLau-b5.el +lisp/leim/quail/CTLau.el +lisp/leim/quail/ECDICT.el +lisp/leim/quail/ETZY.el +lisp/leim/quail/PY-b5.el +lisp/leim/quail/PY.el +lisp/leim/quail/Punct-b5.el +lisp/leim/quail/Punct.el +lisp/leim/quail/QJ-b5.el +lisp/leim/quail/QJ.el +lisp/leim/quail/SW.el +lisp/leim/quail/TONEPY.el +lisp/leim/quail/ZIRANMA.el +lisp/leim/quail/ZOZY.el +lisp/leim/quail/quick-b5.el +lisp/leim/quail/quick-cns.el +lisp/leim/quail/tsang-b5.el +lisp/leim/quail/tsang-cns.el nextstep/Emacs.app nextstep/Cocoa/Emacs.base/Contents/Info.plist nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj === modified file 'ChangeLog' --- ChangeLog 2013-11-26 01:06:23 +0000 +++ ChangeLog 2013-11-27 06:15:06 +0000 @@ -1,3 +1,20 @@ +2013-11-27 Glenn Morris + + * Makefile.in (abs_builddir, leimdir): Remove. + (buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory. + (epaths-force-w32): No longer set BLD. + (leim): Remove. + (install-arch-indep): No longer run or install leim. + (mostlyclean, clean): No longer run leim rule. + (bootstrap-clean): Change leim target. + (maintainer-clean): Add leim. + (check-declare): Remove leim. + * README: Update for leim changes. + * configure.ac (leimdir): Remove. + (standardlisppath): No more leimdir. + + * make-dist: Update for files from leim/ now being in lisp/leim/. + 2013-11-26 Glenn Morris Preload leim-list.el. === modified file 'Makefile.in' --- Makefile.in 2013-11-26 01:06:23 +0000 +++ Makefile.in 2013-11-27 06:15:06 +0000 @@ -164,7 +164,6 @@ # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. srcdir=@srcdir@ abs_srcdir=@abs_srcdir@ -abs_builddir=@abs_builddir@ # MinGW CPPFLAGS may use this. abs_top_srcdir=@abs_top_srcdir@ @@ -191,15 +190,13 @@ # These variables hold the values Emacs will actually use. They are # based on the values of the standard Make variables above. -# Where to install the lisp, leim files distributed with -# Emacs. This includes the Emacs version, so that the -# lisp files for different versions of Emacs will install -# themselves in separate directories. +# Where to install the lisp files distributed with Emacs. +# This includes the Emacs version, so that the lisp files for different +# versions of Emacs will install themselves in separate directories. lispdir=@lispdir@ -leimdir=@leimdir@ # Directories Emacs should search for standard lisp files. -# The default is ${lispdir}:${leimdir}. +# The default is ${lispdir}. standardlisppath=@standardlisppath@ # Directories Emacs should search for lisp files specific to this @@ -219,11 +216,9 @@ # to help Emacs find its lisp files before they've been installed # in their final location. # This should be a colon-separated list of directories. -# Normally it points to the lisp/ directory in the sources and -# the leim/ directory in the build tree. +# Normally it points to the lisp/ directory in the sources. # NB lread.c relies on lisp/ being first here. -# TODO generate leim in srcdir also, prebuild in tarfiles. -buildlisppath=${abs_srcdir}/lisp:${abs_builddir}/leim +buildlisppath=${abs_srcdir}/lisp # Where to install the other architecture-independent # data files distributed with Emacs (like the tutorial, @@ -278,7 +273,7 @@ EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT} # Subdirectories to make recursively. -SUBDIR = $(NTDIR) lib lib-src src lisp leim +SUBDIR = $(NTDIR) lib lib-src src lisp # The subdir makefiles created by config.status. SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ @@ -287,10 +282,9 @@ # Subdirectories to install, and where they'll go. lib-src's and nt's # makefiles know how to install them, so we don't do that here. # Directories that cannot simply be copied, eg info, are treated -# separately. quail appears twice because in out-of-tree builds, it -# exists twice. -COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail -COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}/ja-dic" "$(DESTDIR)${leimdir}/quail" "$(DESTDIR)${leimdir}/quail" +# separately. +COPYDIR = ${srcdir}/etc ${srcdir}/lisp +COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" all: ${SUBDIR} @@ -341,7 +335,6 @@ # '/foo/bar'). epaths-force-w32: FRC @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \ - w32blddir=`${srcdir}/build-aux/msys-to-w32 .`; \ w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \ w32prefixpattern=`echo "${w32prefix}" | ${msys_sed_sh_escape}` ; \ w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" N ":" "\\;" | ${msys_w32prefix_subst}` ; \ @@ -349,7 +342,6 @@ -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath}"'";' \ -e '/^.*#/s/@VER@/${version}/g' \ -e '/^.*#/s/@CFG@/${configuration}/g' \ - -e '/^.*#/s|@BLD@|$${w32blddir}|g' \ -e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \ ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h @@ -361,12 +353,11 @@ src: lib-src -# We need to build `emacs' in `src' to compile the *.elc files in `lisp' -# and `leim'. -lisp leim: src +# We need to build `emacs' in `src' to compile the *.elc files in `lisp'. +lisp: src # These targets should be "${SUBDIR} without `src'". -lib lib-src lisp leim nt: Makefile FRC +lib lib-src lisp nt: Makefile FRC cd $@ && $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' @@ -567,7 +558,7 @@ ## work correctly, and therefore no idea when tar can be replaced. ## See also these comments from 2004 about cp -r working fine: ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html -install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} +install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} -set ${COPYDESTS} ; \ unset CDPATH; \ $(set_installuser); \ @@ -579,13 +570,8 @@ [ "$$exp_dest" = "`cd $${dir} && /bin/pwd`" ] && continue ; \ else true; \ fi; \ - if [ "$${dir}" = "leim/quail" ]; then \ - [ "`cd $${dir} && /bin/pwd`" = "`cd ${srcdir}/leim/quail && /bin/pwd`" ] && \ - continue ; \ - else \ - rm -rf "$${dest}" ; \ - umask 022; ${MKDIR_P} "$${dest}" ; \ - fi ; \ + rm -rf "$${dest}" ; \ + umask 022; ${MKDIR_P} "$${dest}" ; \ echo "Copying $${dir} to $${dest}..." ; \ (cd $${dir}; tar -chf - . ) \ | (cd "$${dest}"; umask 022; \ @@ -612,8 +598,6 @@ done ); \ find "$${dest}" -exec chown $${installuser} {} ';' ;\ done - -rm -f "$(DESTDIR)${leimdir}/leim-list.el" - ${INSTALL_DATA} leim/leim-list.el "$(DESTDIR)${leimdir}/leim-list.el" -rm -f "$(DESTDIR)${lispdir}/subdirs.el" umask 022; $(srcdir)/build-aux/update-subdirs "$(DESTDIR)${lispdir}" subdir="$(DESTDIR)${datadir}/emacs/${version}/site-lisp" ; \ @@ -624,7 +608,7 @@ ( echo "Compressing *.el ..." ; \ unset CDPATH; \ thisdir=`/bin/pwd`; \ - for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}"; do \ + for dir in "$(DESTDIR)${lispdir}"; do \ cd "$${thisdir}" ; \ cd "$${dir}" || exit 1 ; \ for f in `find . -name "*.elc" -print`; do \ @@ -821,7 +805,6 @@ -cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean -cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean -cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean - cd leim && $(MAKE) $(MFLAGS) mostlyclean ### `clean' ### Delete all files from the current directory that are normally @@ -843,7 +826,6 @@ -cd doc/misc && $(MAKE) $(MFLAGS) clean -cd doc/lispref && $(MAKE) $(MFLAGS) clean -cd doc/lispintro && $(MAKE) $(MFLAGS) clean - cd leim && $(MAKE) $(MFLAGS) clean cd nextstep && $(MAKE) $(MFLAGS) clean ### `bootclean' @@ -892,7 +874,7 @@ -cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean -cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean -cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean - cd leim && $(MAKE) $(MFLAGS) maintainer-clean + cd leim && $(MAKE) $(MFLAGS) bootstrap-clean cd lisp && $(MAKE) $(MFLAGS) bootstrap-clean cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean for dir in test/automated admin/unidata; do \ @@ -917,6 +899,7 @@ rm -fr autom4te.cache maintainer-clean: bootstrap-clean FRC cd src && $(MAKE) $(MFLAGS) maintainer-clean + cd leim && $(MAKE) $(MFLAGS) maintainer-clean cd lisp && $(MAKE) $(MFLAGS) maintainer-clean for dir in test/automated admin/unidata; do \ [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) maintainer-clean); \ @@ -1083,5 +1066,4 @@ echo "You must build Emacs to use this command"; \ exit 1; \ fi - cd leim && $(MAKE) $(MFLAGS) $@ cd lisp && $(MAKE) $(MFLAGS) $@ === modified file 'README' --- README 2013-03-05 03:59:35 +0000 +++ README 2013-11-27 06:15:06 +0000 @@ -64,9 +64,10 @@ its primitives, the redisplay code, and some basic editing functions). `lisp' holds the Emacs Lisp code for Emacs (most everything else). -`leim' holds the library of Emacs input methods, Lisp code and - auxiliary data files required to type international characters - which can't be directly produced by your keyboard. +`leim' holds the original source files for the generated files + in lisp/leim. These form the library of Emacs input methods, + required to type international characters that can't be + directly produced by your keyboard. `lib' holds source code for libraries used by Emacs and its utilities `lib-src' holds the source code for some utility programs for use by or with Emacs, like movemail and etags. === modified file 'configure.ac' --- configure.ac 2013-11-21 17:26:55 +0000 +++ configure.ac 2013-11-27 06:15:06 +0000 @@ -80,8 +80,7 @@ dnl (autoconf) Installation Directory Variables dnl See also epaths.h below. lispdir='${datadir}/emacs/${version}/lisp' -leimdir='${datadir}/emacs/${version}/leim' -standardlisppath='${lispdir}:${leimdir}' +standardlisppath='${lispdir}' locallisppath='${datadir}/emacs/${version}/site-lisp:'\ '${datadir}/emacs/site-lisp' lisppath='${locallisppath}:${standardlisppath}' @@ -1683,7 +1682,6 @@ infodir="\${ns_appresdir}/info" mandir="\${ns_appresdir}/man" lispdir="\${ns_appresdir}/lisp" - leimdir="\${ns_appresdir}/leim" INSTALL_ARCH_INDEP_EXTRA= fi @@ -4490,7 +4488,6 @@ AC_SUBST(mandir) AC_SUBST(infodir) AC_SUBST(lispdir) -AC_SUBST(leimdir) AC_SUBST(standardlisppath) AC_SUBST(locallisppath) AC_SUBST(lisppath) === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-26 02:58:51 +0000 +++ doc/lispref/ChangeLog 2013-11-27 06:15:06 +0000 @@ -1,3 +1,8 @@ +2013-11-27 Glenn Morris + + * loading.texi (Library Search): + * os.texi (Startup Summary): No more leim directory. + 2013-11-26 Glenn Morris * os.texi (Startup Summary): Update for leim-list being preloaded. === modified file 'doc/lispref/loading.texi' --- doc/lispref/loading.texi 2013-11-23 01:55:16 +0000 +++ doc/lispref/loading.texi 2013-11-27 06:15:06 +0000 @@ -270,7 +270,6 @@ "/usr/local/share/emacs/@var{version}/lisp" @end example -followed by a similarly named @file{leim} directory. (In this and the following examples, replace @file{/usr/local} with the installation prefix appropriate for your Emacs.) These directories contain the standard Lisp files that come with @@ -278,10 +277,12 @@ If you run Emacs from the directory where it was built---that is, an executable that has not been formally installed---Emacs instead -initializes @code{load-path} using the @file{lisp} and @file{leim} -directories in the directory containing the sources from which it -was built. If you built Emacs in a separate directory from the -sources, it also adds those directories from the build directory. +initializes @code{load-path} using the @file{lisp} +directory in the directory containing the sources from which it +was built. +@c Though there should be no *.el files in builddir/lisp, so it's pointless. +If you built Emacs in a separate directory from the +sources, it also adds the lisp directories from the build directory. (In all cases, elements are represented as absolute file names.) @cindex site-lisp directories === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2013-11-26 02:58:51 +0000 +++ doc/lispref/os.texi 2013-11-27 06:15:06 +0000 @@ -74,11 +74,9 @@ It loads any @file{leim-list.el} that it finds in the @code{load-path} directories. This file is intended for registering input methods. The search is only for any personal @file{leim-list.el} files that you -may have created; so it skips the directories containing the standard Emacs -libraries (for efficiency, since @file{leim-list.el} should not exist -in those directories), as well as the @file{leim} directory that is -part of the distribution (since the @file{leim-list.el} file in this -directory is compiled into the Emacs executable). +may have created; it skips the directories containing the standard Emacs +libraries (these should contain only a single @file{leim-list.el} file, +which is compiled into the Emacs executable). @vindex before-init-time @item === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-11-23 01:55:16 +0000 +++ leim/ChangeLog 2013-11-27 06:15:06 +0000 @@ -1,3 +1,19 @@ +2013-11-27 Glenn Morris + + * Makefile.in (leimdir): New variable. + (TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc) + (${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el): + Generate in $leimdir. + (all): Remove compilation, add ja-dic. + (leim-list.el): Now PHONY. + (setwins, compile-targets, compile-main, clean, mostlyclean) + (extraclean): Remove. + (bootstrap-clean): Delete all generated files. + * README: Update for moved leim/ directory. + * leim-ext.el (ucs-input-activate, hangul-input-method-activate): + Remove manual autoloads; now in loaddefs.el. + Disable byte-compile, version-control, autoloads in the output. + 2013-11-23 Glenn Morris * Makefile.in (RUN_EMACS): Empty EMACSLOADPATH rather than unsetting. === modified file 'leim/Makefile.in' --- leim/Makefile.in 2013-11-23 01:55:16 +0000 +++ leim/Makefile.in 2013-11-27 06:15:06 +0000 @@ -26,8 +26,11 @@ # Here are the things that we expect ../configure to edit. srcdir=@srcdir@ +# Where the generated files go. +leimdir = ${srcdir}/../lisp/leim + # Which Emacs to use to convert TIT files to Emacs Lisp files, -# byte-compile Emacs Lisp files, and generate the file leim-list.el. +# and generate the file leim-list.el. EMACS = ../src/emacs # How to run Emacs. @@ -38,45 +41,39 @@ # Files generated from TIT dictionaries for Chinese GB character set. TIT_GB=\ - quail/CCDOSPY.el \ - quail/Punct.el \ - quail/QJ.el \ - quail/SW.el \ - quail/TONEPY.el + ${leimdir}/quail/CCDOSPY.el \ + ${leimdir}/quail/Punct.el \ + ${leimdir}/quail/QJ.el \ + ${leimdir}/quail/SW.el \ + ${leimdir}/quail/TONEPY.el # Files generated from TIT dictionaries for Chinese BIG5 character set. TIT_BIG5=\ - quail/4Corner.el \ - quail/ARRAY30.el \ - quail/ECDICT.el \ - quail/ETZY.el \ - quail/Punct-b5.el \ - quail/PY-b5.el \ - quail/QJ-b5.el \ - quail/ZOZY.el + ${leimdir}/quail/4Corner.el \ + ${leimdir}/quail/ARRAY30.el \ + ${leimdir}/quail/ECDICT.el \ + ${leimdir}/quail/ETZY.el \ + ${leimdir}/quail/Punct-b5.el \ + ${leimdir}/quail/PY-b5.el \ + ${leimdir}/quail/QJ-b5.el \ + ${leimdir}/quail/ZOZY.el CHINESE_TIT=${TIT_GB} ${TIT_BIG5} MISC= \ - quail/tsang-b5.el \ - quail/quick-b5.el \ - quail/tsang-cns.el \ - quail/quick-cns.el \ - quail/PY.el \ - quail/ZIRANMA.el \ - quail/CTLau.el \ - quail/CTLau-b5.el + ${leimdir}/quail/tsang-b5.el \ + ${leimdir}/quail/quick-b5.el \ + ${leimdir}/quail/tsang-cns.el \ + ${leimdir}/quail/quick-cns.el \ + ${leimdir}/quail/PY.el \ + ${leimdir}/quail/ZIRANMA.el \ + ${leimdir}/quail/CTLau.el \ + ${leimdir}/quail/CTLau-b5.el ## The generated .el files. TIT_MISC=${CHINESE_TIT} ${MISC} -.SUFFIXES: .elc .el - -.el.elc: - @echo Compiling $< - @${RUN_EMACS} -l international/quail -f batch-byte-compile $< - -all: leim-list.el compile-main +all: ${leimdir}/leim-list.el ${leimdir}/ja-dic/ja-dic.el .PHONY: all TIT_SOURCES= \ @@ -106,10 +103,10 @@ ## quail/%.el: CXTERM-DIC/%.tit ## It doesn't seem possible to do this with VPATH and suffix rules. changed.tit: ${TIT_SOURCES} - @${MKDIR_P} quail + @${MKDIR_P} ${leimdir}/quail ${RUN_EMACS} -l titdic-cnv \ - -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ - echo "changed" > $@ + -f batch-titdic-convert -dir ${leimdir}/quail ${srcdir}/CXTERM-DIC + echo "changed" > $@ MISC_SOURCES= \ ${srcdir}/MISC-DIC/CTLau-b5.html \ @@ -123,75 +120,36 @@ @true changed.misc: ${MISC_SOURCES} - @${MKDIR_P} quail + @${MKDIR_P} ${leimdir}/quail ${RUN_EMACS} -l titdic-cnv \ - -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \ - echo "changed" > $@ - -leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el - rm -f leim-list.el - if [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] ; then \ - ${RUN_EMACS} -l international/quail \ - --eval "(update-leim-list-file \".\")" ; \ - else \ - ${RUN_EMACS} -l international/quail \ - --eval "(update-leim-list-file \".\" (unmsys--file-name \"${srcdir}\"))" ; \ - fi + -f batch-miscdic-convert -dir ${leimdir}/quail ${srcdir}/MISC-DIC + echo "changed" > $@ + +.PHONY: leim-list.el +leim-list.el: ${leimdir}/leim-list.el + +${leimdir}/leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el + rm -f $@ + ${RUN_EMACS} -l international/quail \ + --eval "(update-leim-list-file (unmsys--file-name \"${leimdir}\"))" sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ -$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L - @$(MKDIR_P) $(srcdir)/ja-dic +${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L + @$(MKDIR_P) $(leimdir)/ja-dic $(RUN_EMACS) -batch -l ja-dic-cnv \ - -f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \ + -f batch-skkdic-convert -dir "$(leimdir)/ja-dic" \ "$(srcdir)/SKK-DIC/SKK-JISYO.L" -## Following adapted from lisp/Makefile.in. -setwins=wins="${srcdir}/ja-dic quail"; \ - [ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && \ - wins="$$wins ${srcdir}/quail" - -.PHONY: compile-targets -# TARGETS is set dynamically in the recursive call from `compile-main'. -compile-targets: $(TARGETS) - -# Compile all the Elisp files that need it. Beware: it approximates -# `no-byte-compile', so watch out for false-positives! -.PHONY: compile-main -compile-main: ${TIT_MISC} $(srcdir)/ja-dic/ja-dic.el - @($(setwins); \ - els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \ - for el in $$els; do \ - test -f $$el || continue; \ - test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \ - echo "$${el}c"; \ - done | xargs echo) | \ - while read chunk; do \ - $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ - done - -.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean - -clean mostlyclean: +.PHONY: bootstrap-clean distclean maintainer-clean + +bootstrap-clean: rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ - leim-list.el changed.tit changed.misc - -# The following target is needed because the `clean' target only removes -# TIT-generated files and doesn't touch compiled Quail packages. But -# bootstrapping should not leave non-fresh .elc files behind. -bootstrap-clean: clean - $(setwins); for w in $$wins; do rm -f $$w/*.elc; done - -distclean: clean - -[ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && rm -rf quail + ${leimdir}/leim-list.el changed.tit changed.misc + rm -rf ${leimdir}/ja-dic + +distclean: rm -f Makefile maintainer-clean: distclean bootstrap-clean -extraclean: maintainer-clean - -rm -f *~ \#* */*~ */\#* - -.PHONY: check-declare - -check-declare: - $(RUN_EMACS) -l check-declare \ - --eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))' +### Makefile.in ends here === modified file 'leim/README' --- leim/README 2013-01-01 09:11:05 +0000 +++ leim/README 2013-11-27 06:15:06 +0000 @@ -20,24 +20,22 @@ methods. These dictionaries are automatically converted to Quail packages (Emacs Lisp source files) by `make'. -quail: - -This directory contains Emacs Lisp source files for Quail packages. - SKK-DIC: This directory contains source dictionary for Japanese input method -distributed with SKK (Japanese input method run with Mule). But, you -don't need this file because we distribute an Emacs Lisp source file -ja-dic/ja-dic.el which has already been converted from the source -dictionary (See below). - -ja-dic: - -This directory contains Emacs Lisp source file ja-dic.el which is -generated from a source dictionary in SKK-DIC directory. The -inclusion of this file is for users convenience because it takes -rather long time to generate it. +distributed with SKK (Japanese input method run with Mule). + + +The above source files are used to generate the following outputs: + +../lisp/leim/quail: + +This directory contains Emacs Lisp source files for Quail packages. + +../lisp/leim/ja-dic: + +This directory contains Emacs Lisp source file ja-dic.el, +generated from a source dictionary in SKK-DIC directory. This file is part of GNU Emacs. === modified file 'leim/leim-ext.el' --- leim/leim-ext.el 2013-01-01 09:11:05 +0000 +++ leim/leim-ext.el 2013-11-27 06:15:06 +0000 @@ -37,21 +37,9 @@ (eval-after-load "quail/Punct-b5" '(quail-defrule " " ?　 nil t)) -(autoload 'ucs-input-activate "quail/uni-input" - "Activate UCS input method. -With arg, activate UCS input method if and only if arg is positive. - -While this input method is active, the variable -`input-method-function' is bound to the function `ucs-input-method'.") - (register-input-method "ucs" "UTF-8" 'ucs-input-activate "U+" "Unicode input as hex in the form Uxxxx.") -(autoload 'hangul-input-method-activate "quail/hangul" - "Activate Hangul input method INPUT-METHOD. -FUNC is a function to handle input key. -HELP-TEXT is a text set in `hangul-input-method-help-text'.") - (register-input-method "korean-hangul" "UTF-8" @@ -88,3 +76,16 @@ 'hangul390-input-method "Input method: korean-hangul390 (mode line indicator:한390)\n\nHangul 3-Bulsik 390 input method.") +;; Following lines are indented so that Makefile adds them to output. +;; leim-list-header adds "coding: utf-8"; we could move that here, +;; unless others are using that stuff to generate their own leim files. + + ;; Local Variables: + ;; no-byte-compile: t + ;; version-control: never + ;; no-update-autoloads: t + ;; End: + + ;;; leim-list.el ends here + +;;; leim-ext.el ends here === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-26 20:05:48 +0000 +++ lisp/ChangeLog 2013-11-27 06:15:06 +0000 @@ -1,3 +1,21 @@ +2013-11-27 Glenn Morris + + * Makefile.in (setwins_for_subdirs): Skip leim/ directory. + (compile-main): Depend on leim rule. + (leim): New rule. + * loadup.el: Move leim-list.el to leim/ subdirectory. + * startup.el (normal-top-level): No more leim directory. + * international/ja-dic-cnv.el (skkdic-convert): + Disable version-control and autoloads in output files. + * international/titdic-cnv.el (titdic-convert, miscdic-convert): + Disable version-control and autoloads in output files. + * leim/quail: Move here from ../leim. + * leim/quail/hangul.el (hangul-input-method-activate): + Add autoload cookie. + (generated-autoload-load-name): Set file-local value. + * leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie. + (generated-autoload-load-name): Set file-local value. + 2013-11-26 Kenjiro NAKAYAMA (tiny change) * net/eww.el (eww-bookmark-browse): Use 'eww-browse-url'. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2013-11-23 01:55:16 +0000 +++ lisp/Makefile.in 2013-11-27 06:15:06 +0000 @@ -118,14 +118,15 @@ # Find all subdirectories except `obsolete' and `term'. setwins_almost=for file in `find ${srcdir} -type d -print`; do \ case $$file in ${srcdir}*/obsolete | ${srcdir}*/term ) ;; \ - *) wins="$$wins$${wins:+ }$$file" ;; \ + *) wins="$$wins$${wins:+ }$$file" ;; \ esac; \ done # Find all subdirectories in which we might want to create subdirs.el. setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \ - case $$file in ${srcdir}*/cedet* ) ;; \ - *) wins="$$wins$${wins:+ }$$file" ;; \ + case $$file in \ + ${srcdir}*/cedet* | ${srcdir}*/leim* ) ;; \ + *) wins="$$wins$${wins:+ }$$file" ;; \ esac; \ done @@ -172,6 +173,10 @@ # The chmod +w is to handle env var CVSREAD=1. # Use expand-file-name rather than $abs_scrdir so that Emacs does not # get confused when it compares file-names for equality. +# +# Note that we set no-update-autoloads in _generated_ leim files. +# If you want to allow autoloads in such files, remove that, +# and make this depend on leim. autoloads: $(LOADDEFS) doit cd $(lisp) && chmod +w $(AUTOGEN_VCS) $(setwins_almost); \ @@ -291,7 +296,7 @@ # Compile all the Elisp files that need it. Beware: it approximates # `no-byte-compile', so watch out for false-positives! -compile-main: compile-clean +compile-main: leim compile-clean @(cd $(lisp) && $(setwins); \ els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ for el in $$els; do \ @@ -315,6 +320,10 @@ fi \ done +.PHONY: leim +leim: + cd ../leim && $(MAKE) $(MFLAGS) all EMACS="$(EMACS)" + # Compile all Lisp files, but don't recompile those that are up to # date. Some .el files don't get compiled because they set the # local variable no-byte-compile. === modified file 'lisp/international/ja-dic-cnv.el' --- lisp/international/ja-dic-cnv.el 2013-03-20 05:17:04 +0000 +++ lisp/international/ja-dic-cnv.el 2013-11-27 06:15:06 +0000 @@ -1,5 +1,7 @@ ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp +;; Copyright (C) 2001-2013 Free Software Foundation, Inc. + ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) @@ -342,15 +344,12 @@ (with-current-buffer buf (erase-buffer) (buffer-disable-undo) - (insert ";;; ja-dic.el --- dictionary for Japanese input method" - " -*-coding: utf-8; -*-\n" + (insert ";;; ja-dic.el --- dictionary for Japanese input method\n" ";;\tGenerated by the command `skkdic-convert'\n" ";;\tOriginal SKK dictionary file: " (file-relative-name (expand-file-name filename) dirname) "\n\n" ";; This file is part of GNU Emacs.\n\n" - ";;; Commentary:\n\n" - ";; Do byte-compile this file again after any modification.\n\n" ";;; Start of the header of the original SKK dictionary.\n\n") (set-buffer skkbuf) (goto-char 1) @@ -398,7 +397,13 @@ ;; Postfix (with-current-buffer buf (goto-char (point-max)) - (insert ";;\n(provide 'ja-dic)\n\n;;; ja-dic.el ends here\n"))) + (insert ";;\n(provide 'ja-dic)\n\n" + ";; Local Variables:\n" + ";; version-control: never\n" + ";; no-update-autoloads: t\n" + ";; coding: utf-8\n" + ";; End:\n\n" + ";;; ja-dic.el ends here\n"))) ;; Save the working buffer. (set-buffer buf) === modified file 'lisp/international/titdic-cnv.el' --- lisp/international/titdic-cnv.el 2013-06-19 07:19:42 +0000 +++ lisp/international/titdic-cnv.el 2013-11-27 06:15:06 +0000 @@ -272,13 +272,11 @@ (princ ";; Quail package `") (princ package) - (princ (format "' -*- coding:%s -*-\n" coding-system-for-write)) + (princ "\n") (princ ";; Generated by the command `titdic-convert'\n") (princ ";;\tOriginal TIT dictionary file: ") (princ (file-name-nondirectory filename)) - (princ "\n\n;;; Comment:\n\n") - (princ ";; Byte-compile this file again after any modification.\n\n") - (princ ";;; Start of the header of original TIT dictionary.\n\n") + (princ "\n\n") (while (not (eobp)) (let ((ch (following-char)) @@ -518,7 +516,13 @@ (widen) ;; Process the body part - (tit-process-body)))))) + (tit-process-body) + + (princ ";; Local Variables:\n") + (princ ";; version-control: never\n") + (princ ";; no-update-autoloads: t\n") + (princ (format ";; coding: %s\n" coding-system-for-write)) + (princ ";; End:\n")))))) ;;;###autoload (defun batch-titdic-convert (&optional force) @@ -1148,8 +1152,7 @@ (setq coding-system-for-write (coding-system-change-eol-conversion coding 'unix)) (with-temp-file (expand-file-name quailfile dirname) - (insert (format ";; Quail package `%s' -*- coding:%s -*-\n" - name coding)) + (insert (format ";; Quail package `%s'\n" name)) (insert ";; Generated by the command `miscdic-convert'\n") (insert ";; Source dictionary file: " dicfile "\n") (insert ";; Copyright notice of the source file\n") @@ -1168,7 +1171,13 @@ (coding-system-change-eol-conversion coding 'unix)) (dicbuf (find-file-noselect filename))) (funcall converter dicbuf name title) - (kill-buffer dicbuf))) + (kill-buffer dicbuf)) + (insert ";; Local Variables:\n" + ";; version-control: never\n" + ";; no-update-autoloads: t\n" + (format ";; coding: %s\n" coding) + ";; End:\n\n" + ";;; " quailfile " ends here\n")) (message "Converting %s to %s...done" dicfile quailfile)) (setq tail (cdr tail))))) === added directory 'lisp/leim' === renamed directory 'leim/quail' => 'lisp/leim/quail' === modified file 'lisp/leim/quail/hangul.el' --- leim/quail/hangul.el 2013-01-01 09:11:05 +0000 +++ lisp/leim/quail/hangul.el 2013-11-27 06:15:06 +0000 @@ -508,6 +508,7 @@ (defvar hangul-input-method-help-text nil) (make-variable-buffer-local 'hangul-input-method-help-text) +;;;###autoload (defun hangul-input-method-activate (input-method func help-text &rest args) "Activate Hangul input method INPUT-METHOD. FUNC is a function to handle input key. @@ -542,4 +543,8 @@ (provide 'hangul) +;; Local Variables: +;; generated-autoload-load-name: "quail/hangul" +;; End: + ;;; hangul.el ends here === modified file 'lisp/leim/quail/uni-input.el' --- leim/quail/uni-input.el 2013-06-21 13:37:15 +0000 +++ lisp/leim/quail/uni-input.el 2013-11-27 06:15:06 +0000 @@ -85,6 +85,7 @@ (set-buffer-modified-p modified-p) (run-hooks 'input-method-after-insert-chunk-hook))))) +;;;###autoload (defun ucs-input-activate (&optional arg) "Activate UCS input method. With ARG, activate UCS input method if and only if ARG is positive. @@ -124,10 +125,14 @@ Input as Unicode: U or u, where is a four-digit hex number."))) -;; The file ../leim-ext.el contains the following call. +;; The file leim-list.el contains the following call. ;; (register-input-method "ucs" "UTF-8" 'ucs-input-activate "U+" ;; "Unicode input as hex in the form Uxxxx.") (provide 'uni-input) +;; Local Variables: +;; generated-autoload-load-name: "quail/uni-input" +;; End: + ;;; uni-input.el ends here === modified file 'lisp/loadup.el' --- lisp/loadup.el 2013-11-26 01:06:23 +0000 +++ lisp/loadup.el 2013-11-27 06:15:06 +0000 @@ -282,7 +282,7 @@ ;; This file doesn't exist when building a development version of Emacs ;; from the repository. It is generated just after temacs is built. -(load "leim-list.el" t) +(load "leim/leim-list.el" t) ;; If you want additional libraries to be preloaded and their ;; doc strings kept in the DOC file rather than in core, === modified file 'lisp/startup.el' --- lisp/startup.el 2013-11-26 01:06:23 +0000 +++ lisp/startup.el 2013-11-27 06:15:06 +0000 @@ -499,8 +499,6 @@ ;; available input methods. (let ((tail load-path) (lispdir (expand-file-name "../lisp" data-directory)) - ;; For out-of-tree builds, leim-list is generated in the build dir. - (leimdir (expand-file-name "../leim" doc-directory)) dir) (while tail (setq dir (car tail)) @@ -508,12 +506,8 @@ (load (expand-file-name "subdirs.el") t t t)) ;; Do not scan standard directories that won't contain a leim-list.el. ;; http://lists.gnu.org/archive/html/emacs-devel/2009-10/msg00502.html - ;; Also skip leim/leim-list.el, since we preloaded that one. + ;; (Except the preloaded one in lisp/leim.) (or (string-prefix-p lispdir dir) - ;; Not supposed to be subdirs.el in leim, but someone - ;; might have added one and be keeping their own leim-list - ;; files in subdirs of leim. - (string-equal leimdir dir) (let ((default-directory dir)) (load (expand-file-name "leim-list.el") t t t))) ;; We don't use a dolist loop and we put this "setq-cdr" command at === modified file 'make-dist' --- make-dist 2013-11-20 01:50:37 +0000 +++ make-dist 2013-11-27 06:15:06 +0000 @@ -201,13 +201,11 @@ if [ $check = yes ]; then ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - leim/[a-z]*/[a-z]*.el > /tmp/el + lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el > /tmp/el ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \ - lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \ - leim/[a-z]*/[a-z]*.elc > /tmp/elc + lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc > /tmp/elc ## Check for .elc files with no corresponding .el file. sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc @@ -262,7 +260,7 @@ (cd leim && make leim-list.el EMACS="$EMACS") echo "Recompiling Lisp files" - $EMACS -batch -f batch-byte-recompile-directory lisp leim + $EMACS -batch -f batch-byte-recompile-directory lisp fi # $update = yes echo "Creating staging directory: \`${tempparent}'" @@ -291,8 +289,7 @@ echo "Creating subdirectories" for subdir in site-lisp \ - leim leim/CXTERM-DIC leim/MISC-DIC \ - leim/SKK-DIC leim/ja-dic leim/quail \ + leim leim/CXTERM-DIC leim/MISC-DIC leim/SKK-DIC \ build-aux build-aux/snippet \ src src/bitmaps lib lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ @@ -340,16 +337,8 @@ ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC ln MISC-DIC/README MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC - ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic ln Makefile.in ../${tempdir}/leim/Makefile.in - ln leim-ext.el ../${tempdir}/leim/leim-ext.el - ## Lisp files that start with a capital (also 4Corner.el) are - ## generated from TIT dictionaries so we don't distribute them. - ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail - rm -f ../${tempdir}/leim/quail/quick-b5.* - rm -f ../${tempdir}/leim/quail/quick-cns.* - rm -f ../${tempdir}/leim/quail/tsang-b5.* - rm -f ../${tempdir}/leim/quail/tsang-cns.*) + ln leim-ext.el ../${tempdir}/leim/leim-ext.el) echo "Making links to \`build-aux'" (cd build-aux === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-11-26 01:06:23 +0000 +++ nt/ChangeLog 2013-11-27 06:15:06 +0000 @@ -1,3 +1,10 @@ +2013-11-27 Glenn Morris + + * README.W32: + * addpm.c (env_vars): + * epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH): + * paths.h (PATH_LOADSEARCH): No more leim directory. + 2013-11-26 Glenn Morris * epaths.nt (PATH_DUMPLOADSEARCH): Add leim/. === modified file 'nt/README.W32' --- nt/README.W32 2013-08-27 19:40:24 +0000 +++ nt/README.W32 2013-11-27 06:15:06 +0000 @@ -20,8 +20,8 @@ * Preliminaries - Along with this file should be six subdirectories (bin, etc, info, - lisp, leim, site-lisp). If you have downloaded the barebin + Along with this file should be five subdirectories (bin, etc, info, + lisp, site-lisp). If you have downloaded the barebin distribution, then it will contain only the bin directory and the built in documentation in etc/DOC, the rest of the subdirectories are in the src distribution, which the barebin distribution is === modified file 'nt/addpm.c' --- nt/addpm.c 2013-04-15 13:39:41 +0000 +++ nt/addpm.c 2013-11-27 06:15:06 +0000 @@ -82,7 +82,7 @@ { #ifdef OLD_PATHS {"emacs_dir", NULL}, - {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"}, + {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp"}, {"SHELL", "%emacs_dir%/bin/cmdproxy.exe"}, {"EMACSDATA", "%emacs_dir%/etc"}, {"EMACSPATH", "%emacs_dir%/bin"}, === modified file 'nt/epaths.nt' --- nt/epaths.nt 2013-11-26 01:06:23 +0000 +++ nt/epaths.nt 2013-11-27 06:15:06 +0000 @@ -34,10 +34,9 @@ load-path, which is the search path for the Lisp function "load". Configure (using "make epaths-force") sets this to ${standardlisppath}, which typically has a value like: - /emacs/VERSION/lisp:/emacs/VERSION/leim - where datadir is eg /usr/local/share. + /emacs/VERSION/lisp where datadir is eg /usr/local/share. */ -#define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp;%emacs_dir%/share/emacs/@VER@/leim" +#define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp" /* Like PATH_LOADSEARCH, but contains the non-standard pieces. These are the site-lisp directories. Configure sets this to @@ -51,10 +50,9 @@ /* Like PATH_LOADSEARCH, but used only during the build process when Emacs is dumping. Configure (using "make epaths-force-w32") sets - this to $buildlisppath, which normally has the value: - /lisp;/leim. + this to $buildlisppath, which normally has the value: /lisp. */ -#define PATH_DUMPLOADSEARCH "@SRC@/lisp;@BLD@/leim" +#define PATH_DUMPLOADSEARCH "@SRC@/lisp" /* The extra search path for programs to invoke. This is appended to whatever the PATH environment variable says to set the Lisp === modified file 'nt/paths.h' --- nt/paths.h 2013-04-01 07:28:56 +0000 +++ nt/paths.h 2013-11-27 06:15:06 +0000 @@ -1,7 +1,6 @@ /* paths.h file for MS Windows -Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software -Foundation, Inc. +Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -26,7 +25,7 @@ /* The default search path for Lisp function "load". Together with PATH_SITELOADSEARCH, this sets load-path. */ /* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */ -#define PATH_LOADSEARCH "%emacs_dir%/lisp;%emacs_dir%/leim" +#define PATH_LOADSEARCH "%emacs_dir%/lisp" /* Like PATH_LOADSEARCH, but contains the non-standard pieces. */ #define PATH_SITELOADSEARCH "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp" === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-26 09:00:32 +0000 +++ src/ChangeLog 2013-11-27 06:15:06 +0000 @@ -1,3 +1,11 @@ +2013-11-27 Glenn Morris + + * Makefile.in (leimdir): Now in lisp source directory. + ($(leimdir)/leim-list.el): Just use ../leim . + * epaths.in (PATH_DUMPLOADSEARCH): + * lread.c (load_path_default): + * nsterm.m (ns_load_path): No more leim directory. + 2013-11-26 Andreas Schwab * .gdbinit (xgettype): Add cast. === modified file 'src/Makefile.in' --- src/Makefile.in 2013-11-21 17:26:55 +0000 +++ src/Makefile.in 2013-11-27 06:15:06 +0000 @@ -52,7 +52,7 @@ lib = ../lib libsrc = ../lib-src etc = ../etc -leimdir = ../leim +leimdir = ${lispsource}/leim oldXMenudir = ../oldXMenu lwlibdir = ../lwlib @@ -415,7 +415,7 @@ .PHONY: all $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) - cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)" + cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)" ## The dumped Emacs is as functional and more efficient than ## bootstrap-emacs, so we replace the latter with the former. === modified file 'src/epaths.in' --- src/epaths.in 2013-11-26 01:06:23 +0000 +++ src/epaths.in 2013-11-27 06:15:06 +0000 @@ -22,8 +22,7 @@ load-path, which is the search path for the Lisp function "load". Configure (using "make epaths-force") sets this to ${standardlisppath}, which typically has a value like: - /emacs/VERSION/lisp:/emacs/VERSION/leim - where datadir is eg /usr/local/share. + /emacs/VERSION/lisp where datadir is eg /usr/local/share. */ #define PATH_LOADSEARCH "/usr/local/share/emacs/lisp" @@ -41,10 +40,9 @@ /* Like PATH_LOADSEARCH, but used only during the build process when Emacs is dumping. Configure (using "make epaths-force") sets - this to $buildlisppath, which normally has the value: - /lisp:/leim. + this to $buildlisppath, which normally has the value: /lisp. */ -#define PATH_DUMPLOADSEARCH "../lisp:../leim" +#define PATH_DUMPLOADSEARCH "../lisp" /* The extra search path for programs to invoke. This is appended to whatever the PATH environment variable says to set the Lisp === modified file 'src/lread.c' --- src/lread.c 2013-11-25 17:30:09 +0000 +++ src/lread.c 2013-11-27 06:15:06 +0000 @@ -4157,14 +4157,12 @@ are not yet installed, we should not use them, even if they exist.) If installation-dir/lisp does not exist, just add dump_path at the end instead. - Add installation-dir/leim (if exists and not already a member) at the front. Add installation-dir/site-lisp (if !no_site_lisp, and exists and not already a member) at the front. If installation-dir != source-dir (ie running an uninstalled, out-of-tree build) AND install-dir/src/Makefile exists BUT install-dir/src/Makefile.in does NOT exist (this is a sanity - check), then repeat the above steps for source-dir/lisp, - leim and site-lisp. */ + check), then repeat the above steps for source-dir/lisp, site-lisp. */ static Lisp_Object load_path_default (bool changed) @@ -4233,9 +4231,9 @@ if (NILP (Fmember (tem, lpath))) { /* We are running uninstalled. The default load-path - points to the eventual installed lisp, leim - directories. We should not use those now, even - if they exist, so start over from a clean slate. */ + points to the eventual installed lisp directories. + We should not use those now, even if they exist, + so start over from a clean slate. */ lpath = list1 (tem); } } @@ -4244,16 +4242,6 @@ Lisp dirs instead. */ lpath = nconc2 (lpath, dump_path); - /* Add leim under the installation dir, if it is accessible. */ - tem = Fexpand_file_name (build_string ("leim"), - Vinstallation_directory); - tem1 = Ffile_accessible_directory_p (tem); - if (!NILP (tem1)) - { - if (NILP (Fmember (tem, lpath))) - lpath = Fcons (tem, lpath); - } - /* Add site-lisp under the installation dir, if it exists. */ if (!no_site_lisp) { @@ -4269,7 +4257,7 @@ /* If Emacs was not built in the source directory, and it is run from where it was built, add to load-path - the lisp, leim and site-lisp dirs under that directory. */ + the lisp and site-lisp dirs under that directory. */ if (NILP (Fequal (Vinstallation_directory, Vsource_directory))) { @@ -4294,12 +4282,6 @@ if (NILP (Fmember (tem, lpath))) lpath = Fcons (tem, lpath); - tem = Fexpand_file_name (build_string ("leim"), - Vsource_directory); - - if (NILP (Fmember (tem, lpath))) - lpath = Fcons (tem, lpath); - if (!no_site_lisp) { tem = Fexpand_file_name (build_string ("site-lisp"), === modified file 'src/nsterm.m' --- src/nsterm.m 2013-11-20 18:33:12 +0000 +++ src/nsterm.m 2013-11-27 06:15:06 +0000 @@ -1,7 +1,7 @@ /* NeXT/Open/GNUstep / MacOSX communication module. -Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2013 Free Software -Foundation, Inc. +Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2013 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -445,8 +445,8 @@ const char * ns_load_path (void) /* If running as a self-contained app bundle, return as a path string - the filenames of the site-lisp, lisp and leim directories. - Ie, site-lisp:lisp:leim. Otherwise, return nil. */ + the filenames of the site-lisp and lisp directories. + Ie, site-lisp:lisp. Otherwise, return nil. */ { NSBundle *bundle = [NSBundle mainBundle]; NSString *resourceDir = [bundle resourcePath]; @@ -456,7 +456,7 @@ BOOL isDir; NSArray *paths = [resourceDir stringsByAppendingPaths: [NSArray arrayWithObjects: - @"site-lisp", @"lisp", @"leim", nil]]; + @"site-lisp", @"lisp", nil]]; NSEnumerator *pathEnum = [paths objectEnumerator]; resourcePaths = @""; ------------------------------------------------------------ revno: 115249 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2013-11-27 01:59:37 +0000 message: lisp/gnus/gnus-art.el (gnus-article-browse-html-parts): Replace LWSPs with ` 's in header diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-11-27 01:54:35 +0000 +++ lisp/gnus/ChangeLog 2013-11-27 01:59:37 +0000 @@ -1,5 +1,8 @@ 2013-11-27 Katsumi Yamaoka + * gnus-art.el (gnus-article-browse-html-parts): + Replace LWSPs with ` 's in header. + Work for broken Chinese articles. * gnus-art.el (gnus-article-browse-html-save-cid-content): === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2013-11-27 01:54:35 +0000 +++ lisp/gnus/gnus-art.el 2013-11-27 01:59:37 +0000 @@ -2895,6 +2895,13 @@ ((match-beginning 3) "&") (t "
\n")))) (goto-char (point-min)) + (while (re-search-forward "^[\t ]+" nil t) + (dotimes (i (prog1 + (current-column) + (delete-region (match-beginning 0) + (match-end 0)))) + (insert " "))) + (goto-char (point-min)) (insert "
\n") (goto-char (point-max)) (insert "
\n
\n") ------------------------------------------------------------ revno: 115248 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2013-11-27 01:54:35 +0000 message: lisp/gnus/gnus-art.el (gnus-article-browse-html-*): Work for broken Chinese articles diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-11-22 20:18:16 +0000 +++ lisp/gnus/ChangeLog 2013-11-27 01:54:35 +0000 @@ -1,3 +1,12 @@ +2013-11-27 Katsumi Yamaoka + + Work for broken Chinese articles. + + * gnus-art.el (gnus-article-browse-html-save-cid-content): + Exclude broken handles that gnus-summary-enter-digest-group may create. + (gnus-article-browse-html-parts): + Allow overriding charset by mm-charset-override-alist. + 2013-11-21 Jan Tatarik * gnus-icalendar.el (gnus-icalendar-additional-identities): New. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2013-09-11 03:31:56 +0000 +++ lisp/gnus/gnus-art.el 2013-11-27 01:54:35 +0000 @@ -2794,6 +2794,9 @@ (dolist (handle handles) (cond ((not (listp handle))) + ;; Exclude broken handles that `gnus-summary-enter-digest-group' + ;; may create. + ((not (or (bufferp (car handle)) (stringp (car handle))))) ((equal (mm-handle-media-supertype handle) "multipart") (when (setq file (gnus-article-browse-html-save-cid-content cid handle directory)) @@ -2801,11 +2804,12 @@ ((equal (concat "<" cid ">") (mm-handle-id handle)) (setq file (expand-file-name - (or (mm-handle-filename handle) - (concat - (make-temp-name "cid") - (car (rassoc (car (mm-handle-type handle)) mailcap-mime-extensions)))) - directory)) + (or (mm-handle-filename handle) + (concat + (make-temp-name "cid") + (car (rassoc (car (mm-handle-type handle)) + mailcap-mime-extensions)))) + directory)) (mm-save-part-to-file handle file) (throw 'found file)))))))) @@ -2908,7 +2912,7 @@ (cond ((= (length hcharset) 1) (setq hcharset (car hcharset) coding (mm-charset-to-coding-system - hcharset))) + hcharset nil t))) ((> (length hcharset) 1) (setq hcharset 'utf-8 coding hcharset))) @@ -2916,7 +2920,8 @@ (if charset (progn (setq body - (mm-charset-to-coding-system charset)) + (mm-charset-to-coding-system charset + nil t)) (if (eq coding body) (setq eheader (mm-encode-coding-string (buffer-string) coding) ------------------------------------------------------------ revno: 115247 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-11-26 12:22:17 -0800 message: Spelling fixes. diff: === modified file 'build-aux/msys-to-w32' --- build-aux/msys-to-w32 2013-11-20 01:50:37 +0000 +++ build-aux/msys-to-w32 2013-11-26 20:22:17 +0000 @@ -37,7 +37,7 @@ 4. Translate to Windows-native format those paths that are not in such format already. The translated paths will not end with a slash, except for root directories (e.g. 'c:/' or 'c:/foo'). -5. Escape with backslashes every ocurrence of SEPARATOR2 within the paths. +5. Escape with backslashes every occurrence of SEPARATOR2 within the paths. 6. Concatenate the translated paths with SEPARATOR2. If MUSTEXIST is 'Y' or not supplied, then each path in PATHLIST must === modified file 'etc/TODO' --- etc/TODO 2013-11-23 14:32:56 +0000 +++ etc/TODO 2013-11-26 20:22:17 +0000 @@ -203,7 +203,7 @@ ** "Emacs as word processor" http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00515.html rms writes: - 25 years ago I hoped we would extend Emacs to do WYSIWG word + 25 years ago I hoped we would extend Emacs to do WYSIWYG word processing. That is why we added text properties and variable width fonts. However, more features are still needed to achieve this. ------------------------------------------------------------ revno: 115246 committer: Ted Zlatanov branch nick: quickfixes timestamp: Tue 2013-11-26 15:05:48 -0500 message: eww usability improvements * net/eww.el (eww-bookmark-browse): Use 'eww-browse-url'. (eww-add-bookmark): ask confirmation when add to bookmarks (eww-quit): ask confirmation before quitting eww diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-26 19:17:55 +0000 +++ lisp/ChangeLog 2013-11-26 20:05:48 +0000 @@ -1,3 +1,9 @@ +2013-11-26 Kenjiro NAKAYAMA (tiny change) + + * net/eww.el (eww-bookmark-browse): Use 'eww-browse-url'. + (eww-add-bookmark): ask confirmation when add to bookmarks + (eww-quit): ask confirmation before quitting eww + 2013-11-26 Eli Zaretskii * vc/vc.el (vc-diff-internal): Use *-dos coding-system when === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2013-11-21 16:41:35 +0000 +++ lisp/net/eww.el 2013-11-26 20:05:48 +0000 @@ -403,8 +403,10 @@ (defun eww-quit () "Exit the Emacs Web Wowser." (interactive) - (setq eww-history nil) - (kill-buffer (current-buffer))) + (if (y-or-n-p "quit eww? ") + (progn + (setq eww-history nil) + (kill-buffer (current-buffer))))) (defun eww-back-url () "Go to the previously displayed page." @@ -964,14 +966,16 @@ (when (equal eww-current-url (plist-get bookmark :url)) (error "Already bookmarked"))) - (let ((title (replace-regexp-in-string "[\n\t\r]" " " eww-current-title))) - (setq title (replace-regexp-in-string "\\` +\\| +\\'" "" title)) - (push (list :url eww-current-url - :title title - :time (current-time-string)) - eww-bookmarks)) - (eww-write-bookmarks) - (message "Bookmarked %s (%s)" eww-current-url eww-current-title)) + (if (y-or-n-p "bookmark this page? ") + (progn + (let ((title (replace-regexp-in-string "[\n\t\r]" " " eww-current-title))) + (setq title (replace-regexp-in-string "\\` +\\| +\\'" "" title)) + (push (list :url eww-current-url + :title title + :time (current-time-string)) + eww-bookmarks)) + (eww-write-bookmarks) + (message "Bookmarked %s (%s)" eww-current-url eww-current-title)))) (defun eww-write-bookmarks () (with-temp-file (expand-file-name "eww-bookmarks" user-emacs-directory) @@ -1063,7 +1067,7 @@ ;; just let it remain. (ignore-errors (delete-window)) - (eww (plist-get bookmark :url)))) + (eww-browse-url (plist-get bookmark :url)))) (defun eww-next-bookmark () "Go to the next bookmark in the list." ------------------------------------------------------------ revno: 115245 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2013-11-26 21:17:55 +0200 message: Fix ugly ^M characters in Diff output shown by "C-x v u". lisp/vc/vc.el (vc-diff-internal): Use *-dos coding-system when reading output from Diff on MS-Windows and MS-DOS. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-26 15:24:10 +0000 +++ lisp/ChangeLog 2013-11-26 19:17:55 +0000 @@ -1,3 +1,8 @@ +2013-11-26 Eli Zaretskii + + * vc/vc.el (vc-diff-internal): Use *-dos coding-system when + reading output from Diff on MS-Windows and MS-DOS. + 2013-11-26 Bozhidar Batsov * emacs-lisp/helpers.el (string-reverse): New function. === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2013-11-13 20:06:37 +0000 +++ lisp/vc/vc.el 2013-11-26 19:17:55 +0000 @@ -1641,6 +1641,13 @@ ;; be to call the back end separately for each file. (coding-system-for-read (if files (vc-coding-system-for-diff (car files)) 'undecided))) + ;; On MS-Windows and MS-DOS, Diff is likely to produce DOS-style + ;; EOLs, which will look ugly if (car files) happens to have Unix + ;; EOLs. + (if (memq system-type '(windows-nt ms-dos)) + (setq coding-system-for-read + (coding-system-change-eol-conversion coding-system-for-read + 'dos))) (vc-setup-buffer buffer) (message "%s" (car messages)) ;; Many backends don't handle well the case of a file that has been ------------------------------------------------------------ revno: 115244 committer: Bozhidar Batsov branch nick: master timestamp: Tue 2013-11-26 17:24:10 +0200 message: * lisp/emacs-lisp/helpers.el (string-reverse): New function. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-11-26 10:21:03 +0000 +++ etc/NEWS 2013-11-26 15:24:10 +0000 @@ -788,6 +788,7 @@ *** `hash-table-keys' *** `hash-table-values' *** `string-join` +*** `string-reverse` *** `string-trim-left' *** `string-trim-right' *** `string-trim' === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-26 15:07:10 +0000 +++ lisp/ChangeLog 2013-11-26 15:24:10 +0000 @@ -1,3 +1,7 @@ +2013-11-26 Bozhidar Batsov + + * emacs-lisp/helpers.el (string-reverse): New function. + 2013-11-26 Michael Albinus * net/tramp.el (tramp-file-name-regexp-unified): Support IPv6 host === modified file 'lisp/emacs-lisp/helpers.el' --- lisp/emacs-lisp/helpers.el 2013-11-25 19:04:50 +0000 +++ lisp/emacs-lisp/helpers.el 2013-11-26 15:24:10 +0000 @@ -41,6 +41,10 @@ "Join all STRINGS using SEPARATOR." (mapconcat 'identity strings separator)) +(defsubst string-reverse (str) + "Reverse the string STR." + (apply 'string (nreverse (string-to-list str)))) + (defsubst string-trim-left (string) "Remove leading whitespace from STRING." (if (string-match "\\`[ \t\n\r]+" string) ------------------------------------------------------------ revno: 115243 committer: Michael Albinus branch nick: trunk timestamp: Tue 2013-11-26 16:07:10 +0100 message: * net/tramp.el (tramp-file-name-regexp-unified): Support IPv6 host names on MS Windows, like "/[::1]:". * net/tramp-sh.el (tramp-sh-handle-insert-directory): Accept nil SWITCHES. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-26 10:38:19 +0000 +++ lisp/ChangeLog 2013-11-26 15:07:10 +0000 @@ -1,3 +1,11 @@ +2013-11-26 Michael Albinus + + * net/tramp.el (tramp-file-name-regexp-unified): Support IPv6 host + names on MS Windows, like "/[::1]:". + + * net/tramp-sh.el (tramp-sh-handle-insert-directory): Accept nil + SWITCHES. + 2013-11-26 Glenn Morris * progmodes/python.el (python-indent-guess-indent-offset): === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2013-11-15 07:37:18 +0000 +++ lisp/net/tramp-sh.el 2013-11-26 15:07:10 +0000 @@ -2493,6 +2493,7 @@ (filename switches &optional wildcard full-directory-p) "Like `insert-directory' for Tramp files." (setq filename (expand-file-name filename)) + (unless switches (setq switches "")) (with-parsed-tramp-file-name filename nil (if (and (featurep 'ls-lisp) (not (symbol-value 'ls-lisp-use-insert-directory-program))) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2013-11-13 15:28:06 +0000 +++ lisp/net/tramp.el 2013-11-26 15:07:10 +0000 @@ -884,7 +884,7 @@ ;;;###autoload (defconst tramp-file-name-regexp-unified (if (memq system-type '(cygwin windows-nt)) - "\\`/[^/|:]\\{2,\\}[^/|]*:" + "\\`/\\(\\[.*\\]\\|[^/|:]\\{2,\\}[^/|]*\\):" "\\`/[^/|:][^/|]*:") "Value for `tramp-file-name-regexp' for unified remoting. Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and ------------------------------------------------------------ revno: 115242 committer: Bozhidar Batsov branch nick: master timestamp: Tue 2013-11-26 12:38:19 +0200 message: Improve a couple of changelog entries. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-26 03:15:49 +0000 +++ lisp/ChangeLog 2013-11-26 10:38:19 +0000 @@ -307,9 +307,13 @@ * subr.el (version-regexp-alist): Recognize hg, svn and darcs versions as snapshot versions. - * progmodes/ruby-mode.el (ruby-mode-set-encoding): - Add the ability to always insert an utf-8 encoding comment. - Fix and simplify coding comment update logic. + * progmodes/ruby-mode.el (ruby--detect-encoding): Make aware of + 'always-utf8 value of `ruby-insert-encoding-magic-comment'. + (ruby--encoding-comment-required-p): Extract from + `ruby-mode-set-encoding'. + (ruby-mode-set-encoding): Add the ability to always insert an + utf-8 encoding comment. Fix and simplify coding comment update + logic. 2013-11-14 Michael Albinus @@ -455,9 +459,13 @@ 2013-11-08 Bozhidar Batsov - * progmodes/ruby-mode.el (ruby-mode-set-encoding): - Use `ruby-encoding-magic-comment-style' to control the - style of the auto-inserted encoding comment. + * progmodes/ruby-mode.el: Improve encoding comment handling. + (ruby-encoding-magic-comment-style): New option. + (ruby-custom-encoding-magic-comment-template): New option. + (ruby--insert-coding-comment, ruby--detect-encoding): New + functions extracted from `ruby-mode-set-encoding'. + (ruby-mode-set-encoding): Use `ruby-encoding-magic-comment-style' + to control the style of the auto-inserted encoding comment. 2013-11-08 Dmitry Gutov === modified file 'test/ChangeLog' --- test/ChangeLog 2013-11-23 20:46:43 +0000 +++ test/ChangeLog 2013-11-26 10:38:19 +0000 @@ -28,9 +28,12 @@ 2013-11-20 Bozhidar Batsov - * test/automated/ruby-mode-tests.el: + * test/automated/ruby-mode-tests.el (ruby-exit!-font-lock): Add a failing test for Bug#15874. - * test/automated/ruby-mode-tests.el: + * test/automated/ruby-mode-tests.el + (ruby--insert-coding-comment-ruby-style) + (ruby--insert-coding-comment-emacs-style) + (ruby--insert-coding-comment-custom-style): Add a few tests for `ruby--insert-coding-comment'. 2013-11-18 Paul Eggert ------------------------------------------------------------ revno: 115241 committer: Bozhidar Batsov branch nick: master timestamp: Tue 2013-11-26 12:21:03 +0200 message: Mention some of the noteworthy changes in ruby-mode diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-11-25 19:04:50 +0000 +++ etc/NEWS 2013-11-26 10:21:03 +0000 @@ -643,6 +643,18 @@ *** New option `imenu-generic-skip-comments-and-strings'. +** Ruby mode + +*** New option `ruby-encoding-magic-comment-style'. + +*** New option `ruby-custom-encoding-magic-comment-template'. + +*** New mode menu. + +*** Improved syntax highlighting and indentation. + +*** Add more Ruby file types to `auto-mode-alist'. + * New Modes and Packages in Emacs 24.4 ------------------------------------------------------------ revno: 115240 committer: Andreas Schwab branch nick: emacs timestamp: Tue 2013-11-26 10:00:32 +0100 message: * .gdbinit (xgettype): Add cast. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2013-06-03 09:01:53 +0000 +++ src/.gdbinit 2013-11-26 09:00:32 +0000 @@ -67,7 +67,7 @@ else set $bugfix = $arg0 end - set $type = (enum Lisp_Type) (USE_LSB_TAG ? $bugfix & (1 << GCTYPEBITS) - 1 : $bugfix >> VALBITS) + set $type = (enum Lisp_Type) (USE_LSB_TAG ? $bugfix & (1 << GCTYPEBITS) - 1 : (EMACS_UINT) $bugfix >> VALBITS) end # Set up something to print out s-expressions. === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-26 01:06:23 +0000 +++ src/ChangeLog 2013-11-26 09:00:32 +0000 @@ -1,3 +1,7 @@ +2013-11-26 Andreas Schwab + + * .gdbinit (xgettype): Add cast. + 2013-11-26 Glenn Morris Preload leim-list.el.