Mercurial > emacs
changeset 108437:4fbbaa6bce36
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 21 Mar 2010 11:01:52 +0000 |
| parents | d276e52e2247 (current diff) e64817c0ab40 (diff) |
| children | 2485b1fb98d3 |
| files | |
| diffstat | 10 files changed, 284 insertions(+), 133 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Sat Mar 20 10:43:59 2010 +0000 +++ b/lib-src/ChangeLog Sun Mar 21 11:01:52 2010 +0000 @@ -1,3 +1,11 @@ +2010-03-20 Glenn Morris <rgm@gnu.org> + + * Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) + (LIBHESIOD, LIBRESOLV): Make previous change a bit more friendly by + defining these as Makefile variables. + (LIBS_MOVE): Add LIBS_MAIL into this. + (movemail${EXEEXT}): Just use LIBS_MOVE, not LIBS_MAIL as well. + 2010-03-18 Glenn Morris <rgm@gnu.org> * Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
--- a/lib-src/Makefile.in Sat Mar 20 10:43:59 2010 +0000 +++ b/lib-src/Makefile.in Sun Mar 21 11:01:52 2010 +0000 @@ -130,6 +130,27 @@ # If neither flag is set, blessmail is used. MOVE_FLAGS= +## -lkrb if HAVE_LIBKRB or -lkrb4 if HAVE_LIBKRB4 +KRB4LIB=@KRB4LIB@ +## -ldes if HAVE_LIBDES or -ldes425 if HAVE_LIBDES425 +DESLIB=@DESLIB@ +## -lkrb5 if HAVE_LIBKRB5 +KRB5LIB=@KRB5LIB@ +## -lk5crypto if HAVE_LIBK5CRYPTO or -lcrypto if HAVE_LIBCRYPTO +CRYPTOLIB=@CRYPTOLIB@ +## -lcom_err if HAVE_LIBCOM_ERR +COM_ERRLIB=@COM_ERRLIB@ +## -lhesiod if HAVE_LIBHESIOD +LIBHESIOD=@LIBHESIOD@ +## -lresolv if HAVE_LIBRESOLV +LIBRESOLV=@LIBRESOLV@ +## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL +LIBS_MAIL=@LIBS_MAIL@ + +## Extra libraries to use when linking movemail. +LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) + + # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ @@ -168,10 +189,6 @@ #define BLESSMAIL #endif -LIBS_MOVE=@KRB4LIB@ @DESLIB@ @KRB5LIB@ @CRYPTOLIB@ @COM_ERRLIB@ @LIBHESIOD@ @LIBRESOLV@ - -LIBS_MAIL=@LIBS_MAIL@ - LOADLIBES=LIBS_SYSTEM LIBS_MACHINE /* Those files shared with other GNU utilities need HAVE_CONFIG_H @@ -365,7 +382,7 @@ $(GETOPTOBJS) $(LOADLIBES) -o b2m movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS) - $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail + $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail /* We need to define emacs to get the right version of something (what?). */ movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H)
--- a/lisp/ChangeLog Sat Mar 20 10:43:59 2010 +0000 +++ b/lisp/ChangeLog Sun Mar 21 11:01:52 2010 +0000 @@ -1,3 +1,44 @@ +2010-03-21 Juri Linkov <juri@jurta.org> + + Fix message of multi-line occur regexps and multi-buffer header lines. + http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00457.html + + * replace.el (occur-1): Don't display regexp if it is longer + than window-width. Use `query-replace-descr' to display regexp. + (occur-engine): Don't display regexp in the buffer header for + multi-buffer occur. Display a separate header line with total + match count and regexp for multi-buffer occur. + Use `query-replace-descr' to display regexp. + +2010-03-20 Teodor Zlatanov <tzz@lifelogs.com> + + * net/secrets.el: Fix parenthesis. + (secrets-enabled): Fix parenthesis. + +2010-03-20 Stefan Monnier <monnier@iro.umontreal.ca> + + Use more relative file and directory names. + * Makefile.in (EMACS): Arrange for it to work when we chdir. + (setwins, setwins_almost, setwins_for_subdirs): + Don't `cd'; output relative names. + (all, compile, compile-always, compile-last): Set emacswd. + (custom-deps, finder-data, autoloads, update-subdirs, compile-last): + Just cd to the lisp source dir so we can use relative file names. + + * outline.el (hide-sublevels): Unfix the paren non-typo! (bug#5738). + +2010-03-20 Glenn Morris <rgm@gnu.org> + + * textmodes/rst.el: Use faces for font-lock customization, and make the + old -face variables obsolete. + (rst-block, rst-external, rst-definition, rst-directive, rst-comment) + (rst-emphasis1, rst-emphasis2, rst-literal, rst-reference): New faces. + (rst-block-face, rst-external-face, rst-definition-face) + (rst-directive-face, rst-comment-face, rst-emphasis1-face) + (rst-emphasis2-face, rst-literal-face, rst-reference-face): + Make obsolete. + (rst-font-lock-keywords-function): Update for above changes. + 2010-03-20 Juri Linkov <juri@jurta.org> * s-region.el:
--- a/lisp/Makefile.in Sat Mar 20 10:43:59 2010 +0000 +++ b/lisp/Makefile.in Sun Mar 21 11:01:52 2010 +0000 @@ -26,7 +26,15 @@ # You can specify a different executable on the make command line, # e.g. "make EMACS=../src/emacs ...". -EMACS = ../src/emacs +# We sometimes change directory before running Emacs (typically when +# building out-of-tree, we chdir to the source directory), so we need +# to use an aboluste file name. But there's no standard way +# in a makefile to get the pwd, so we simply rely on a shell +# "$emacswd" var that needs to be set wherever we use $(EMACS) (or +# $(emacs)). Yet, it is setup in such a way that if you forget to set +# $emacswd, it will still work, so long as you did not +# change directory. +EMACS = $$emacswd../src/emacs # Command line flags for Emacs. This must include --multibyte, # otherwise some files will not compile. @@ -80,28 +88,28 @@ # Common command to find subdirectories -setwins=subdirs=`(cd $$wd; find . -type d -print)`; \ +setwins=subdirs=`(find . -type d -print)`; \ for file in $$subdirs; do \ case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* ) ;; \ - *) wins="$$wins $$wd/$$file" ;; \ + *) wins="$$wins $$file" ;; \ esac; \ done # Find all subdirectories except `obsolete' and `term'. -setwins_almost=subdirs=`(cd $$wd; find . -type d -print)`; \ +setwins_almost=subdirs=`(find . -type d -print)`; \ for file in $$subdirs; do \ case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */obsolete | */term ) ;; \ - *) wins="$$wins $$wd/$$file" ;; \ + *) wins="$$wins $$file" ;; \ esac; \ done # Find all subdirectories in which we might want to create subdirs.el -setwins_for_subdirs=subdirs=`(cd $$wd; find . -type d -print)`; \ +setwins_for_subdirs=subdirs=`(find . -type d -print)`; \ for file in $$subdirs; do \ case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */cedet* ) ;; \ - *) wins="$$wins $$wd/$$file" ;; \ + *) wins="$$wins $$file" ;; \ esac; \ done @@ -111,7 +119,7 @@ # we add them here to make sure they get built. all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el @: Let us check that we byte-compiled all the files. - $(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS) + emacswd=`pwd`/; $(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS) doit: @@ -132,14 +140,14 @@ $(lisp)/cus-load.el: $(MAKE) $(MFLAGS) custom-deps custom-deps: doit - wd=$(lisp); $(setwins_almost); \ + emacswd=`pwd`/; cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins $(lisp)/finder-inf.el: $(MAKE) $(MFLAGS) finder-data finder-data: doit - wd=$(lisp); $(setwins_almost); \ + emacswd=`pwd`/; cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins @@ -149,7 +157,7 @@ chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \ $(lisp)/emacs-lisp/cl-loaddefs.el $(lisp)/mail/rmail.el \ $(lisp)/dired.el $(lisp)/ibuffer.el - wd=$(lisp); $(setwins_almost); \ + emacswd=`pwd`/; cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins @@ -158,7 +166,7 @@ $(lisp)/subdirs.el: $(MAKE) $(MFLAGS) update-subdirs update-subdirs: doit - wd=$(lisp); $(setwins_for_subdirs); \ + cd $(lisp); $(setwins_for_subdirs); \ for file in $$wins; do \ $(srcdir)/update-subdirs $$file; \ done; @@ -1505,7 +1513,8 @@ # Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those # sub-makes that run rules that use it, for the sake of some non-GNU makes. compile: $(LOADDEFS) autoloads compile-first - $(MAKE) $(MFLAGS) compile-main EMACS=$(EMACS) + emacswd=`pwd`/; \ + $(MAKE) $(MFLAGS) compile-main EMACS=$(EMACS); \ $(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS) ## Doing this causes make install to dump another emacs. @@ -1516,11 +1525,12 @@ # set the local variable no-byte-compile. compile-always: doit cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc + emacswd=`pwd`/; \ $(MAKE) $(MFLAGS) compile EMACS=$(EMACS) ## In case any files are missing from ELCFILES. compile-last: - @wd=$(lisp); $(setwins); \ + @emacswd=`pwd`/; cd $(lisp); $(setwins); \ els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ for el in $$els; do \ test -f $$el || continue; \
--- a/lisp/net/secrets.el Sat Mar 20 10:43:59 2010 +0000 +++ b/lisp/net/secrets.el Sun Mar 21 11:01:52 2010 +0000 @@ -149,7 +149,7 @@ (require 'dbus) (defvar secrets-enabled nil - "Whether there is a daemon offering the Secret Service API." + "Whether there is a daemon offering the Secret Service API.") (defvar secrets-debug t "Write debug messages") @@ -693,7 +693,7 @@ ;; We shall inform, whether the secret service is enabled on this ;; machine. - (setq secrets-enabled t))) + (setq secrets-enabled t)) (provide 'secrets)
--- a/lisp/outline.el Sat Mar 20 10:43:59 2010 +0000 +++ b/lisp/outline.el Sun Mar 21 11:01:52 2010 +0000 @@ -914,12 +914,12 @@ (outline-map-region (lambda () (if (<= (funcall outline-level) levels) - (outline-show-heading) - beg end)) - ;; Finally unhide any trailing newline. - (goto-char (point-max)) - (if (and (bolp) (not (bobp)) (outline-invisible-p (1- (point)))) - (outline-flag-region (1- (point)) (point) nil))))) + (outline-show-heading))) + beg end) + ;; Finally unhide any trailing newline. + (goto-char (point-max)) + (if (and (bolp) (not (bobp)) (outline-invisible-p (1- (point)))) + (outline-flag-region (1- (point)) (point) nil)))) (run-hooks 'outline-view-change-hook)) (defun hide-other ()
--- a/lisp/replace.el Sat Mar 20 10:43:59 2010 +0000 +++ b/lisp/replace.el Sun Mar 21 11:01:52 2010 +0000 @@ -1166,12 +1166,15 @@ (not (eq occur-excluded-properties t))))) (let* ((bufcount (length active-bufs)) (diff (- (length bufs) bufcount))) - (message "Searched %d buffer%s%s; %s match%s for `%s'" + (message "Searched %d buffer%s%s; %s match%s%s" bufcount (if (= bufcount 1) "" "s") (if (zerop diff) "" (format " (%d killed)" diff)) (if (zerop count) "no" (format "%d" count)) (if (= count 1) "" "es") - regexp)) + ;; Don't display regexp if with remaining text + ;; it is longer than window-width. + (if (> (+ (length regexp) 42) (window-width)) + "" (format " for `%s'" (query-replace-descr regexp))))) (setq occur-revert-arguments (list regexp nlines bufs)) (if (= count 0) (kill-buffer occur-buf) @@ -1298,9 +1301,13 @@ (goto-char headerpt) (let ((beg (point)) end) - (insert (format "%d match%s for \"%s\" in buffer: %s\n" + (insert (format "%d match%s%s in buffer: %s\n" matches (if (= matches 1) "" "es") - regexp (buffer-name buf))) + ;; Don't display regexp for multi-buffer. + (if (> (length buffers) 1) + "" (format " for \"%s\"" + (query-replace-descr regexp))) + (buffer-name buf))) (setq end (point)) (add-text-properties beg end (append @@ -1308,6 +1315,18 @@ `(font-lock-face ,title-face)) `(occur-title ,buf)))) (goto-char (point-min))))))) + ;; Display total match count and regexp for multi-buffer. + (when (and (not (zerop globalcount)) (> (length buffers) 1)) + (goto-char (point-min)) + (let ((beg (point)) + end) + (insert (format "%d match%s total for \"%s\":\n" + globalcount (if (= globalcount 1) "" "es") + (query-replace-descr regexp))) + (setq end (point)) + (add-text-properties beg end (when title-face + `(font-lock-face ,title-face)))) + (goto-char (point-min))) (if coding ;; CODING is buffer-file-coding-system of the first buffer ;; that locally binds it. Let's use it also for the output
--- a/lisp/textmodes/rst.el Sat Mar 20 10:43:59 2010 +0000 +++ b/lisp/textmodes/rst.el Sun Mar 21 11:01:52 2010 +0000 @@ -2585,62 +2585,132 @@ :group 'faces :version "21.1") -(defcustom rst-block-face 'font-lock-keyword-face +(defface rst-block '((t :inherit font-lock-keyword-face)) + "Face used for all syntax marking up a special block." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-block-face 'rst-block "All syntax marking up a special block." + :version "24.1" :group 'rst-faces :type '(face)) - -(defcustom rst-external-face 'font-lock-type-face +(make-obsolete-variable 'rst-block-face + "customize the face `rst-block' instead." + "24.1") + +(defface rst-external '((t :inherit font-lock-type-face)) + "Face used for field names and interpreted text." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-external-face 'rst-external "Field names and interpreted text." + :version "24.1" :group 'rst-faces :type '(face)) - -(defcustom rst-definition-face 'font-lock-function-name-face +(make-obsolete-variable 'rst-external-face + "customize the face `rst-external' instead." + "24.1") + +(defface rst-definition '((t :inherit font-lock-function-name-face)) + "Face used for all other defining constructs." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-definition-face 'rst-definition "All other defining constructs." + :version "24.1" :group 'rst-faces :type '(face)) - -(defcustom rst-directive-face - ;; XEmacs compatibility - (if (boundp 'font-lock-builtin-face) - 'font-lock-builtin-face - 'font-lock-preprocessor-face) +(make-obsolete-variable 'rst-definition-face + "customize the face `rst-definition' instead." + "24.1") + +;; XEmacs compatibility (?). +(defface rst-directive (if (boundp 'font-lock-builtin-face) + '((t :inherit font-lock-builtin-face)) + '((t :inherit font-lock-preprocessor-face))) + "Face used for directives and roles." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-directive-face 'rst-directive "Directives and roles." :group 'rst-faces :type '(face)) - -(defcustom rst-comment-face 'font-lock-comment-face +(make-obsolete-variable 'rst-directive-face + "customize the face `rst-directive' instead." + "24.1") + +(defface rst-comment '((t :inherit font-lock-comment-face)) + "Face used for comments." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-comment-face 'rst-comment "Comments." + :version "24.1" :group 'rst-faces :type '(face)) - -(defcustom rst-emphasis1-face - ;; XEmacs compatibility - (if (facep 'italic) - ''italic - 'italic) +(make-obsolete-variable 'rst-comment-face + "customize the face `rst-comment' instead." + "24.1") + +(defface rst-emphasis1 '((t :inherit italic)) + "Face used for simple emphasis." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-emphasis1-face 'rst-emphasis1 "Simple emphasis." + :version "24.1" :group 'rst-faces :type '(face)) - -(defcustom rst-emphasis2-face - ;; XEmacs compatibility - (if (facep 'bold) - ''bold - 'bold) +(make-obsolete-variable 'rst-emphasis1-face + "customize the face `rst-emphasis1' instead." + "24.1") + +(defface rst-emphasis2 '((t :inherit bold)) + "Face used for double emphasis." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-emphasis2-face 'rst-emphasis2 "Double emphasis." :group 'rst-faces :type '(face)) - -(defcustom rst-literal-face 'font-lock-string-face +(make-obsolete-variable 'rst-emphasis2-face + "customize the face `rst-emphasis2' instead." + "24.1") + +(defface rst-literal '((t :inherit font-lock-string-face)) + "Face used for literal text." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-literal-face 'rst-literal "Literal text." + :version "24.1" :group 'rst-faces :type '(face)) - -(defcustom rst-reference-face 'font-lock-variable-name-face +(make-obsolete-variable 'rst-literal-face + "customize the face `rst-literal' instead." + "24.1") + +(defface rst-reference '((t :inherit font-lock-variable-name-face)) + "Face used for references to a definition." + :version "24.1" + :group 'rst-faces) + +(defcustom rst-reference-face 'rst-reference "References to a definition." + :version "24.1" :group 'rst-faces :type '(face)) +(make-obsolete-variable 'rst-reference-face + "customize the face `rst-reference' instead." + "24.1") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2818,94 +2888,76 @@ ;; Simple `Body Elements`_ ;; `Bullet Lists`_ - (list - (concat re-bol "\\([-*+]" re-blksep1 "\\)") - 1 rst-block-face) + `(,(concat re-bol "\\([-*+]" re-blksep1 "\\)") + 1 rst-block-face) ;; `Enumerated Lists`_ - (list - (concat re-bol "\\((?\\(#\\|[0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]" - re-blksep1 "\\)") - 1 rst-block-face) + `(,(concat re-bol "\\((?\\(#\\|[0-9]+\\|[A-Za-z]\\|[IVXLCMivxlcm]+\\)[.)]" + re-blksep1 "\\)") + 1 rst-block-face) ;; `Definition Lists`_ FIXME: missing ;; `Field Lists`_ - (list - (concat re-bol "\\(:[^:\n]+:\\)" re-blksep1) - 1 rst-external-face) + `(,(concat re-bol "\\(:[^:\n]+:\\)" re-blksep1) + 1 rst-external-face) ;; `Option Lists`_ - (list - (concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*" - "\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)") - 1 rst-block-face) + `(,(concat re-bol "\\(\\(\\(\\([-+/]\\|--\\)\\sw\\(-\\|\\sw\\)*" + "\\([ =]\\S +\\)?\\)\\(,[\t ]\\)?\\)+\\)\\($\\|[\t ]\\{2\\}\\)") + 1 rst-block-face) ;; `Tables`_ FIXME: missing ;; All the `Explicit Markup Blocks`_ ;; `Footnotes`_ / `Citations`_ - (list - (concat re-bol "\\(" re-ems "\\[[^[\n]+\\]\\)" re-blksep1) + `(,(concat re-bol "\\(" re-ems "\\[[^[\n]+\\]\\)" re-blksep1) 1 rst-definition-face) ;; `Directives`_ / `Substitution Definitions`_ - (list - (concat re-bol "\\(" re-ems "\\)\\(\\(|[^|\n]+|[\t ]+\\)?\\)\\(" - re-sym1 "+::\\)" re-blksep1) - (list 1 rst-directive-face) - (list 2 rst-definition-face) - (list 4 rst-directive-face)) + `(,(concat re-bol "\\(" re-ems "\\)\\(\\(|[^|\n]+|[\t ]+\\)?\\)\\(" + re-sym1 "+::\\)" re-blksep1) + (1 rst-directive-face) + (2 rst-definition-face) + (4 rst-directive-face)) ;; `Hyperlink Targets`_ - (list - (concat re-bol "\\(" re-ems "_\\([^:\\`\n]\\|\\\\.\\|`[^`\n]+`\\)+:\\)" - re-blksep1) - 1 rst-definition-face) - (list - (concat re-bol "\\(__\\)" re-blksep1) - 1 rst-definition-face) + `(,(concat re-bol "\\(" re-ems "_\\([^:\\`\n]\\|\\\\.\\|`[^`\n]+`\\)+:\\)" + re-blksep1) + 1 rst-definition-face) + `(,(concat re-bol "\\(__\\)" re-blksep1) + 1 rst-definition-face) ;; All `Inline Markup`_ ;; FIXME: Condition 5 preventing fontification of e.g. "*" not implemented ;; `Strong Emphasis`_ - (list - (concat re-imp1 "\\(\\*\\*" re-ima2 "\\*\\*\\)" re-ims1) - 2 rst-emphasis2-face) + `(,(concat re-imp1 "\\(\\*\\*" re-ima2 "\\*\\*\\)" re-ims1) + 2 rst-emphasis2-face) ;; `Emphasis`_ - (list - (concat re-imp1 "\\(\\*" re-ima2 "\\*\\)" re-ims1) - 2 rst-emphasis1-face) + `(,(concat re-imp1 "\\(\\*" re-ima2 "\\*\\)" re-ims1) + 2 rst-emphasis1-face) ;; `Inline Literals`_ - (list - (concat re-imp1 "\\(``" re-imb2 "``\\)" re-ims1) - 2 rst-literal-face) + `(,(concat re-imp1 "\\(``" re-imb2 "``\\)" re-ims1) + 2 rst-literal-face) ;; `Inline Internal Targets`_ - (list - (concat re-imp1 "\\(_`" re-imb2 "`\\)" re-ims1) - 2 rst-definition-face) + `(,(concat re-imp1 "\\(_`" re-imb2 "`\\)" re-ims1) + 2 rst-definition-face) ;; `Hyperlink References`_ ;; FIXME: `Embedded URIs`_ not considered - (list - (concat re-imp1 "\\(\\(`" re-imb2 "`\\|\\(\\sw\\(\\sw\\|-\\)+\\sw\\)\\)__?\\)" re-ims1) + `(,(concat re-imp1 "\\(\\(`" re-imb2 "`\\|\\(\\sw\\(\\sw\\|-\\)+\\sw\\)\\)__?\\)" re-ims1) 2 rst-reference-face) ;; `Interpreted Text`_ - (list - (concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:" - re-sym1 "+:\\)?\\)" re-ims1) - (list 2 rst-directive-face) - (list 5 rst-external-face) - (list 8 rst-directive-face)) + `(,(concat re-imp1 "\\(\\(:" re-sym1 "+:\\)?\\)\\(`" re-imb2 "`\\)\\(\\(:" + re-sym1 "+:\\)?\\)" re-ims1) + (2 rst-directive-face) + (5 rst-external-face) + (8 rst-directive-face)) ;; `Footnote References`_ / `Citation References`_ - (list - (concat re-imp1 "\\(\\[[^]]+\\]_\\)" re-ims1) - 2 rst-reference-face) + `(,(concat re-imp1 "\\(\\[[^]]+\\]_\\)" re-ims1) + 2 rst-reference-face) ;; `Substitution References`_ - (list - (concat re-imp1 "\\(|" re-imv2 "|\\)" re-ims1) - 2 rst-reference-face) + `(,(concat re-imp1 "\\(|" re-imv2 "|\\)" re-ims1) + 2 rst-reference-face) ;; `Standalone Hyperlinks`_ - (list - ;; FIXME: This takes it easy by using a whitespace as delimiter - (concat re-imp1 "\\(" re-uris1 ":\\S +\\)" re-ims1) - 2 rst-definition-face) - (list - (concat re-imp1 "\\(" re-sym1 "+@" re-sym1 "+\\)" re-ims1) - 2 rst-definition-face) + `(;; FIXME: This takes it easy by using a whitespace as delimiter + ,(concat re-imp1 "\\(" re-uris1 ":\\S +\\)" re-ims1) + 2 rst-definition-face) + `(,(concat re-imp1 "\\(" re-sym1 "+@" re-sym1 "+\\)" re-ims1) + 2 rst-definition-face) ;; Do all block fontification as late as possible so 'append works @@ -2914,7 +2966,7 @@ (list re-ado2) (if (not rst-mode-lazy) - (list 1 rst-block-face) + '(1 rst-block-face) (list (list 'rst-font-lock-handle-adornment '(progn @@ -2934,7 +2986,7 @@ (list (concat re-bol "\\(" re-ems "\\)\[^[|_]\\([^:\n]\\|:\\([^:\n]\\|$\\)\\)*$") - (list 1 rst-comment-face)) + '(1 rst-comment-face)) (if rst-mode-lazy (list (list 'rst-font-lock-find-unindented-line @@ -2942,12 +2994,12 @@ (setq rst-font-lock-indentation-point (match-end 1)) (point-max)) nil - (list 0 rst-comment-face 'append))))) + '(0 rst-comment-face append))))) (append (list (concat re-bol "\\(" re-emt "\\)\\(\\s *\\)$") - (list 1 rst-comment-face) - (list 2 rst-comment-face)) + '(1 rst-comment-face) + '(2 rst-comment-face)) (if rst-mode-lazy (list (list 'rst-font-lock-find-unindented-line @@ -2955,13 +3007,13 @@ (setq rst-font-lock-indentation-point 'next) (point-max)) nil - (list 0 rst-comment-face 'append))))) + '(0 rst-comment-face append))))) ;; `Literal Blocks`_ (append (list (concat re-bol "\\(\\([^.\n]\\|\\.[^.\n]\\).*\\)?\\(::\\)$") - (list 3 rst-block-face)) + '(3 rst-block-face)) (if rst-mode-lazy (list (list 'rst-font-lock-find-unindented-line @@ -2969,14 +3021,14 @@ (setq rst-font-lock-indentation-point t) (point-max)) nil - (list 0 rst-literal-face 'append))))) + '(0 rst-literal-face append))))) ;; `Doctest Blocks`_ (append (list (concat re-bol "\\(>>>\\|\\.\\.\\.\\)\\(.+\\)") - (list 1 rst-block-face) - (list 2 rst-literal-face))) + '(1 rst-block-face) + '(2 rst-literal-face))) )))
--- a/src/ChangeLog Sat Mar 20 10:43:59 2010 +0000 +++ b/src/ChangeLog Sun Mar 21 11:01:52 2010 +0000 @@ -1,3 +1,7 @@ +2010-03-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * Makefile.in (bootstrap_exe): Use an absolute name. + 2010-03-20 Dan Nicolaescu <dann@ics.uci.edu> Remove support for old GNU/Linux using libc version 5.
--- a/src/Makefile.in Sat Mar 20 10:43:59 2010 +0000 +++ b/src/Makefile.in Sun Mar 21 11:01:52 2010 +0000 @@ -63,7 +63,7 @@ S_FILE = ${srcdir}/@opsysfile@ config_h = config.h $(M_FILE) $(S_FILE) -bootstrap_exe = ../src/bootstrap-emacs${EXEEXT} +bootstrap_exe = `pwd`/bootstrap-emacs${EXEEXT} OTHER_FILES = @OTHER_FILES@