Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99709. ------------------------------------------------------------ revno: 99709 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2010-03-20 17:46:31 -0400 message: Use more relative file and directory names in `lisp' make rules. * lisp/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. * src/Makefile.in (bootstrap_exe): Use an absolute name. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-20 19:21:44 +0000 +++ lisp/ChangeLog 2010-03-20 21:46:31 +0000 @@ -5,6 +5,14 @@ 2010-03-20 Stefan Monnier + 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 === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2010-03-20 01:29:12 +0000 +++ lisp/Makefile.in 2010-03-20 21:46:31 +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; \ === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-20 08:11:59 +0000 +++ src/ChangeLog 2010-03-20 21:46:31 +0000 @@ -1,3 +1,7 @@ +2010-03-20 Stefan Monnier + + * Makefile.in (bootstrap_exe): Use an absolute name. + 2010-03-20 Dan Nicolaescu Remove support for old GNU/Linux using libc version 5. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-03-20 00:46:01 +0000 +++ src/Makefile.in 2010-03-20 21:46:31 +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@ ------------------------------------------------------------ revno: 99708 committer: Ted Zlatanov branch nick: quickfixes timestamp: Sat 2010-03-20 14:21:44 -0500 message: Fix unbalanced parenthesis in secrets.el. Fix parenthesis. (secrets-enabled): Fix parenthesis. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-20 19:04:44 +0000 +++ lisp/ChangeLog 2010-03-20 19:21:44 +0000 @@ -1,3 +1,8 @@ +2010-03-20 Teodor Zlatanov + + * net/secrets.el: Fix parenthesis. + (secrets-enabled): Fix parenthesis. + 2010-03-20 Stefan Monnier * outline.el (hide-sublevels): Unfix the paren non-typo! (bug#5738). === modified file 'lisp/net/secrets.el' --- lisp/net/secrets.el 2010-03-16 16:45:07 +0000 +++ lisp/net/secrets.el 2010-03-20 19:21:44 +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) ------------------------------------------------------------ revno: 99707 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2010-03-20 15:04:44 -0400 message: (hide-sublevels): Unfix the paren non-typo! (bug#5738). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-20 18:17:59 +0000 +++ lisp/ChangeLog 2010-03-20 19:04:44 +0000 @@ -1,3 +1,7 @@ +2010-03-20 Stefan Monnier + + * outline.el (hide-sublevels): Unfix the paren non-typo! (bug#5738). + 2010-03-20 Glenn Morris * textmodes/rst.el: Use faces for font-lock customization, and make the === modified file 'lisp/outline.el' --- lisp/outline.el 2010-03-19 03:32:47 +0000 +++ lisp/outline.el 2010-03-20 19:04:44 +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 () ------------------------------------------------------------ revno: 99706 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-03-20 11:17:59 -0700 message: Use faces not variables for font-lock customization in rst.el. * textmodes/rst.el: (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. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-20 01:29:12 +0000 +++ lisp/ChangeLog 2010-03-20 18:17:59 +0000 @@ -1,3 +1,15 @@ +2010-03-20 Glenn Morris + + * 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 * s-region.el: === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/rst.el 2010-03-20 18:17:59 +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))) ))) ------------------------------------------------------------ revno: 99705 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-03-20 11:13:46 -0700 message: Cosmetic changes to lib-src/Makefile.in. * 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. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-03-18 05:49:31 +0000 +++ lib-src/ChangeLog 2010-03-20 18:13:46 +0000 @@ -1,3 +1,11 @@ +2010-03-20 Glenn Morris + + * 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 * Makefile.in (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2010-03-18 05:49:31 +0000 +++ lib-src/Makefile.in 2010-03-20 18:13:46 +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) ------------------------------------------------------------ revno: 99704 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-03-20 01:11:59 -0700 message: Remove support for old GNU/Linux using libc version 5. * m/alpha.h (LINUX_SBRK_BUG): Remove definition. * emacs.c (main): Remove code depending on LINUX_SBRK_BUG. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-20 07:57:11 +0000 +++ src/ChangeLog 2010-03-20 08:11:59 +0000 @@ -1,5 +1,9 @@ 2010-03-20 Dan Nicolaescu + Remove support for old GNU/Linux using libc version 5. + * m/alpha.h (LINUX_SBRK_BUG): Remove definition. + * emacs.c (main): Remove code depending on LINUX_SBRK_BUG. + Consolidate redundant definitions in s/bsd-common.h. * s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) === modified file 'src/emacs.c' --- src/emacs.c 2010-03-20 00:46:01 +0000 +++ src/emacs.c 2010-03-20 08:11:59 +0000 @@ -790,11 +790,6 @@ heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static); } -#ifdef LINUX_SBRK_BUG - /* This is only used GNU/LINUX running on alpha when using libc5 */ - __sbrk (1); -#endif - #ifdef RUN_TIME_REMAP if (initialized) run_time_remap (argv[0]); === modified file 'src/m/alpha.h' --- src/m/alpha.h 2010-01-28 17:33:28 +0000 +++ src/m/alpha.h 2010-03-20 08:11:59 +0000 @@ -116,11 +116,6 @@ #endif /* __ELF__ */ -#if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6 -/* This controls a conditional in main. */ -#define LINUX_SBRK_BUG -#endif - /* On the Alpha it's best to avoid including TERMIO since struct termio and struct termios are mutually incompatible. */ #define NO_TERMIO ------------------------------------------------------------ revno: 99703 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-03-20 00:57:11 -0700 message: Consolidate redundant definitions in s/bsd-common.h. * s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) (LDAV_SYMBOL, KERNEL_FILE): Define (or undefine) here instead of doing it in all files that include this one. * s/gnu.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) (LDAV_SYMBOL, KERNEL_FILE): Remove. * s/freebsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) (LDAV_SYMBOL, KERNEL_FILE): Remove. * s/netbsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) (LDAV_SYMBOL, KERNEL_FILE): Remove. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-20 07:09:31 +0000 +++ src/ChangeLog 2010-03-20 07:57:11 +0000 @@ -1,5 +1,20 @@ 2010-03-20 Dan Nicolaescu + Consolidate redundant definitions in s/bsd-common.h. + * s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) + (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) + (LDAV_SYMBOL, KERNEL_FILE): Define (or undefine) here instead of + doing it in all files that include this one. + * s/gnu.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) + (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) + (LDAV_SYMBOL, KERNEL_FILE): Remove. + * s/freebsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) + (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) + (LDAV_SYMBOL, KERNEL_FILE): Remove. + * s/netbsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) + (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) + (LDAV_SYMBOL, KERNEL_FILE): Remove. + Consolidate redundant definitions. * s/usg5-4.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not define, it's undefined in all files that include this one. === modified file 'src/s/bsd-common.h' --- src/s/bsd-common.h 2010-01-13 08:35:10 +0000 +++ src/s/bsd-common.h 2010-03-20 07:57:11 +0000 @@ -33,6 +33,36 @@ #define BSD_SYSTEM 43 #endif /* BSD_SYSTEM */ +/* For mem-limits.h. */ +#define BSD4_2 + +#define TABDLY OXTABS +#define TAB3 OXTABS + +/* These aren't needed, since we have getloadavg. */ +#undef KERNEL_FILE +#undef LDAV_SYMBOL + +#define HAVE_TERMIOS +#define NO_TERMIO + +#define LIBS_DEBUG + +#define SYSV_SYSTEM_DIR + +/* POSIX-style pgrp behavior. */ +#undef BSD_PGRPS + +#define UNEXEC unexelf.o + +/* If the system's imake configuration file defines `NeedWidePrototypes' + as `NO', we must define NARROWPROTO manually. Such a define is + generated in the Makefile generated by `xmkmf'. If we don't + define NARROWPROTO, we will see the wrong function prototypes + for X functions taking float or double parameters. */ + +#define NARROWPROTO 1 + /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ === modified file 'src/s/freebsd.h' --- src/s/freebsd.h 2010-03-20 05:18:05 +0000 +++ src/s/freebsd.h 2010-03-20 07:57:11 +0000 @@ -29,13 +29,8 @@ /* For mem-limits.h. */ #define BSD4_2 -/* These aren't needed, since we have getloadavg. */ -#undef KERNEL_FILE -#undef LDAV_SYMBOL - #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -#define LIBS_DEBUG #define LIBS_SYSTEM -lutil #if __FreeBSD_version < 400000 #define LIBS_TERMCAP -ltermcap @@ -44,31 +39,19 @@ #define LIBS_TERMCAP -lncurses #endif -#define SYSV_SYSTEM_DIR - -/* freebsd has POSIX-style pgrp behavior. */ -#undef BSD_PGRPS - /* Let `ld' find image libs and similar things in /usr/local/lib. The system compiler, GCC, has apparently been modified to not look there, contrary to what a stock GCC would do. */ #define LD_SWITCH_SYSTEM -L/usr/local/lib #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o -#define UNEXEC unexelf.o #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o #undef LIB_GCC #define LIB_GCC #define HAVE_GETLOADAVG 1 -#define HAVE_TERMIOS -#define NO_TERMIO #define DECLARE_GETPWUID_WITH_UID_T -/* freebsd uses OXTABS instead of the expected TAB3. */ -#define TABDLY OXTABS -#define TAB3 OXTABS - /* this silences a few compilation warnings */ #undef BSD_SYSTEM #if __FreeBSD__ == 1 @@ -84,14 +67,6 @@ ioctl TIOCSCTTY. */ #define DONT_REOPEN_PTY -/* If the system's imake configuration file defines `NeedWidePrototypes' - as `NO', we must define NARROWPROTO manually. Such a define is - generated in the Makefile generated by `xmkmf'. If we don't - define NARROWPROTO, we will see the wrong function prototypes - for X functions taking float or double parameters. */ - -#define NARROWPROTO 1 - /* The following is needed to make `configure' find Xpm, Xaw3d and image include and library files if using /usr/bin/gcc. That compiler seems to be modified to not find headers in === modified file 'src/s/gnu.h' --- src/s/gnu.h 2010-01-13 08:35:10 +0000 +++ src/s/gnu.h 2010-03-20 07:57:11 +0000 @@ -21,27 +21,13 @@ /* Get most of the stuff from bsd-common */ #include "bsd-common.h" -/* For mem-limits.h. */ -#define BSD4_2 - #undef SYSTEM_TYPE #define SYSTEM_TYPE "gnu" #undef NLIST_STRUCT -#undef KERNEL_FILE -#undef LDAV_SYMBOL #define SIGNALS_VIA_CHARACTERS -#define HAVE_TERMIOS -#define NO_TERMIO - -#define LIBS_DEBUG - -/* XXX emacs should not expect TAB3 to be defined. */ -#define TABDLY OXTABS -#define TAB3 OXTABS - /* Tell Emacs that we are a terminfo based system; disable the use of local termcap. (GNU uses ncurses.) */ #ifdef HAVE_LIBNCURSES @@ -49,11 +35,6 @@ #define LIBS_TERMCAP -lncurses #endif -#define SYSV_SYSTEM_DIR - -/* GNU has POSIX-style pgrp behavior. */ -#undef BSD_PGRPS - /* Use mmap directly for allocating larger buffers. */ #ifdef DOUG_LEA_MALLOC #undef REL_ALLOC @@ -63,17 +44,12 @@ #define ORDINARY_LINK #define DATA_START ({ extern int data_start; (char *) &data_start; }) -/* GNU now always uses the ELF format. */ -#define UNEXEC unexelf.o - /* Some losing code fails to include this and then assumes that because it is braindead that O_RDONLY==0. */ #ifndef NOT_C_CODE #include #endif -#define NARROWPROTO 1 - #ifdef emacs #include /* Get the definition of _IO_STDIO_H. */ #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) === modified file 'src/s/netbsd.h' --- src/s/netbsd.h 2010-03-20 05:18:05 +0000 +++ src/s/netbsd.h 2010-03-20 07:57:11 +0000 @@ -22,35 +22,17 @@ /* Get most of the stuff from bsd-common */ #include "bsd-common.h" -/* For mem-limits.h. */ -#define BSD4_2 - -#undef KERNEL_FILE -#undef LDAV_SYMBOL #define HAVE_GETLOADAVG 1 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -/* netbsd uses OXTABS instead of the expected TAB3. */ -#define TABDLY OXTABS -#define TAB3 OXTABS - -#define HAVE_TERMIOS -#define NO_TERMIO - -#define LIBS_DEBUG /* -lutil is not needed for NetBSD >0.9. */ /* #define LIBS_SYSTEM -lutil */ #define LIBS_TERMCAP -ltermcap #define NEED_ERRNO -#define SYSV_SYSTEM_DIR - -/* Netbsd has POSIX-style pgrp behavior. */ -#undef BSD_PGRPS #define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 /usr/lib/crtbegin.o -#define UNEXEC unexelf.o #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o END_FILES_1 #undef LIB_GCC #define LIB_GCC @@ -92,8 +74,6 @@ #define LINKER $(CC) -nostartfiles -#define NARROWPROTO 1 - #define DEFAULT_SOUND_DEVICE "/dev/audio" /* Greg A. Woods says we must include signal.h ------------------------------------------------------------ revno: 99702 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-03-20 00:09:31 -0700 message: Consolidate redundant definitions. * s/usg5-4.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not define, it's undefined in all files that include this one. (POSIX_SIGNALS): Define here instead of doing it in all files that include this one. * s/irix6-5.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef. (POSIX_SIGNALS): Do not define. * s/sol2-6.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef. (POSIX_SIGNALS): Do not define. * s/unixware.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef. (POSIX_SIGNALS): Do not define. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-20 06:48:13 +0000 +++ src/ChangeLog 2010-03-20 07:09:31 +0000 @@ -1,5 +1,17 @@ 2010-03-20 Dan Nicolaescu + Consolidate redundant definitions. + * s/usg5-4.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not define, + it's undefined in all files that include this one. + (POSIX_SIGNALS): Define here instead of doing it in all files that + include this one. + * s/irix6-5.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef. + (POSIX_SIGNALS): Do not define. + * s/sol2-6.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef. + (POSIX_SIGNALS): Do not define. + * s/unixware.h (sigsetmask, PTY_TTY_NAME_SPRINTF): Do not undef. + (POSIX_SIGNALS): Do not define. + Remove support for old UNIX System V systems. * s/unixware.h: Add the contents of s/usg-5-4-2.h. * s/usg-5-4-2.h: Remove. === modified file 'src/s/irix6-5.h' --- src/s/irix6-5.h 2010-01-13 08:35:10 +0000 +++ src/s/irix6-5.h 2010-03-20 07:09:31 +0000 @@ -22,7 +22,6 @@ #define IRIX6_5 /* used in m/iris4d */ #include "usg5-4.h" -#undef sigsetmask /* use sys_sigsetmask */ #undef _longjmp /* use system versions, not conservative aliases */ #undef _setjmp @@ -46,9 +45,6 @@ #define SIGNALS_VIA_CHARACTERS /* No need to use sprintf to get the tty name--we get that from _getpty. */ -#ifdef PTY_TTY_NAME_SPRINTF -#undef PTY_TTY_NAME_SPRINTF -#endif #define PTY_TTY_NAME_SPRINTF /* No need to get the pty name at all. */ #ifdef PTY_NAME_SPRINTF @@ -80,10 +76,6 @@ strcpy (pty_name, name); \ } -/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX - throughout. */ -#define POSIX_SIGNALS - /* Ulimit(UL_GMEMLIM) is busted... */ #define ULIMIT_BREAK_VALUE 0x14000000 === modified file 'src/s/sol2-6.h' --- src/s/sol2-6.h 2010-03-20 05:52:55 +0000 +++ src/s/sol2-6.h 2010-03-20 07:09:31 +0000 @@ -53,12 +53,6 @@ #define C_DEBUG_SWITCH -g -O #endif /* GCC */ -/* Info from fnf@cygnus.com suggests this is appropriate. */ -#define POSIX_SIGNALS - -/* We don't need the definition from usg5-4.h with POSIX_SIGNALS. */ -#undef sigsetmask - /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't work if POSIX_SIGNALS is defined. It may also be appropriate for SVR4.x @@ -68,7 +62,6 @@ intercepting that death. If any child but grantpt's should die within, it should be caught after sigrelse(2). */ -#undef PTY_TTY_NAME_SPRINTF #define PTY_TTY_NAME_SPRINTF \ { \ char *ptsname (), *ptyname; \ === modified file 'src/s/unixware.h' --- src/s/unixware.h 2010-03-20 06:48:13 +0000 +++ src/s/unixware.h 2010-03-20 07:09:31 +0000 @@ -26,11 +26,6 @@ /* #define HAVE_GETWD (appears to be buggy on SVR4.2) */ #undef HAVE_GETWD -/* Info from fnf@cygnus.com suggests this is appropriate. */ -#define POSIX_SIGNALS - -/* We don't need the definition from usg5-3.h with POSIX_SIGNALS. */ -#undef sigsetmask #undef HAVE_SYSV_SIGPAUSE /* Motif needs -lgen. */ @@ -45,7 +40,6 @@ intercepting that death. If any child but grantpt's should die within, it should be caught after sigrelse(2). */ -#undef PTY_TTY_NAME_SPRINTF #define PTY_TTY_NAME_SPRINTF \ { \ char *ptsname(), *ptyname; \ === modified file 'src/s/usg5-4.h' --- src/s/usg5-4.h 2010-01-13 08:35:10 +0000 +++ src/s/usg5-4.h 2010-03-20 07:09:31 +0000 @@ -63,13 +63,7 @@ /* Special hacks needed to make Emacs run on this system. */ -/* - * Make the sigsetmask function go away. Don't know what the - * ramifications of this are, but doesn't seem possible to - * emulate it properly anyway at this point. - */ - -#define sigsetmask(mask) /* Null expansion */ +#define POSIX_SIGNALS /* setjmp and longjmp can safely replace _setjmp and _longjmp, but they will run slower. */ @@ -176,27 +170,6 @@ #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx"); -/* This sets the name of the slave side of the PTY. On SysVr4, - grantpt(3) forks a subprocess, so keep sigchld_handler() from - intercepting that death. If any child but grantpt's should die - within, it should be caught after sigrelse(2). */ - -#define PTY_TTY_NAME_SPRINTF \ - { \ - char *ptsname (), *ptyname; \ - \ - sighold (SIGCLD); \ - if (grantpt (fd) == -1) \ - { emacs_close (fd); return -1; } \ - sigrelse (SIGCLD); \ - if (unlockpt (fd) == -1) \ - { emacs_close (fd); return -1; } \ - if (!(ptyname = ptsname (fd))) \ - { emacs_close (fd); return -1; } \ - strncpy (pty_name, ptyname, sizeof (pty_name)); \ - pty_name[sizeof (pty_name) - 1] = 0; \ - } - /* Push various streams modules onto a PTY channel. */ #define SETUP_SLAVE_PTY \ ------------------------------------------------------------ revno: 99701 committer: Dan Nicolaescu branch nick: trunk timestamp: Fri 2010-03-19 23:48:13 -0700 message: Remove support for old UNIX System V systems. * s/unixware.h: Add the contents of s/usg-5-4-2.h. * s/usg-5-4-2.h: Remove. * configure.in: Remove support for old UNIX System V systems and for Unixware on non-x86 machines. diff: === modified file 'ChangeLog' --- ChangeLog 2010-03-20 05:52:55 +0000 +++ ChangeLog 2010-03-20 06:48:13 +0000 @@ -1,6 +1,10 @@ 2010-03-20 Dan Nicolaescu + * configure.in: Remove support for old UNIX System V systems and + for Unixware on non-x86 machines. + * configure.in: Remove support for Solaris on PPC and for old versions. + * configure.in: Remove non-working lynxos port. 2010-03-19 Dan Nicolaescu === modified file 'configure.in' --- configure.in 2010-03-20 05:52:55 +0000 +++ configure.in 2010-03-20 06:48:13 +0000 @@ -639,22 +639,6 @@ if test x"${opsys}" = x; then case "${canonical}" in *-gnu* ) opsys=gnu ;; - *-sysv4.2uw* ) opsys=unixware ;; - *-sysv5uw* ) opsys=unixware ;; - *-sysv5OpenUNIX* ) opsys=unixware ;; - *-sysv4.1* | *-sysvr4.1* ) - NON_GNU_CPP=/usr/lib/cpp - opsys=usg5-4 ;; - *-sysv4.[2-9]* | *-sysvr4.[2-9]* ) - if [ x$NON_GNU_CPP = x ]; then - if [ -f /usr/ccs/lib/cpp ]; then - NON_GNU_CPP=/usr/ccs/lib/cpp - else - NON_GNU_CPP=/lib/cpp - fi - fi - opsys=usg5-4-2 ;; - *-sysv4* | *-sysvr4* ) opsys=usg5-4 ;; * ) unported=yes ;; === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-20 05:52:55 +0000 +++ src/ChangeLog 2010-03-20 06:48:13 +0000 @@ -1,5 +1,9 @@ 2010-03-20 Dan Nicolaescu + Remove support for old UNIX System V systems. + * s/unixware.h: Add the contents of s/usg-5-4-2.h. + * s/usg-5-4-2.h: Remove. + Remove support for Solaris on PPC and for old versions. * s/sol2-6.h: Add the contents of s/sol-2.3.h, s/sol-2.4.h, s/sol-2.5.h. (LD_SWITCH_SYSTEM, USE_MMAP_FOR_BUFFERS): Remove #defines/#undef === modified file 'src/s/unixware.h' --- src/s/unixware.h 2010-01-04 05:35:18 +0000 +++ src/s/unixware.h 2010-03-20 06:48:13 +0000 @@ -1,4 +1,77 @@ -#include "usg5-4-2.h" +/* s/ file for Unixware. + + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . */ + + +#include "usg5-4.h" + +/* fnf@cygnus.com says these exist. */ +#define HAVE_TCATTR +/* #define HAVE_GETWD (appears to be buggy on SVR4.2) */ +#undef HAVE_GETWD + +/* Info from fnf@cygnus.com suggests this is appropriate. */ +#define POSIX_SIGNALS + +/* We don't need the definition from usg5-3.h with POSIX_SIGNALS. */ +#undef sigsetmask +#undef HAVE_SYSV_SIGPAUSE + +/* Motif needs -lgen. */ +#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen + +/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock + rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't + work if POSIX_SIGNALS is defined. It may also be appropriate for SVR4.x + (x<2) but I'm not sure. fnf@cygnus.com */ +/* This sets the name of the slave side of the PTY. On SysVr4, + grantpt(3) forks a subprocess, so keep sigchld_handler() from + intercepting that death. If any child but grantpt's should die + within, it should be caught after sigrelse(2). */ + +#undef PTY_TTY_NAME_SPRINTF +#define PTY_TTY_NAME_SPRINTF \ + { \ + char *ptsname(), *ptyname; \ + \ + sigblock(sigmask(SIGCLD)); \ + if (grantpt(fd) == -1) \ + fatal("could not grant slave pty"); \ + sigunblock(sigmask(SIGCLD)); \ + if (unlockpt(fd) == -1) \ + fatal("could not unlock slave pty"); \ + if (!(ptyname = ptsname(fd))) \ + fatal ("could not enable slave pty"); \ + strncpy(pty_name, ptyname, sizeof(pty_name)); \ + pty_name[sizeof(pty_name) - 1] = 0; \ + } + +/* Use libw.a along with X11R6 Xt. */ +#define NEED_LIBW + +/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp + is needed in UNIX_SV ... 4.2 1.1.2. */ +#define LIB_MOTIF -lXm -lXimp + +/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6 + (do not change this comment) */ + #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base) === removed file 'src/s/usg5-4-2.h' --- src/s/usg5-4-2.h 2010-01-13 08:35:10 +0000 +++ src/s/usg5-4-2.h 1970-01-01 00:00:00 +0000 @@ -1,73 +0,0 @@ -/* s/ file for System V release 4.2. - - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - - -#include "usg5-4.h" - -/* fnf@cygnus.com says these exist. */ -#define HAVE_TCATTR -/* #define HAVE_GETWD (appears to be buggy on SVR4.2) */ -#undef HAVE_GETWD - -/* Info from fnf@cygnus.com suggests this is appropriate. */ -#define POSIX_SIGNALS - -/* We don't need the definition from usg5-3.h with POSIX_SIGNALS. */ -#undef sigsetmask -#undef HAVE_SYSV_SIGPAUSE - -/* Motif needs -lgen. */ -#define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen - -/* This is the same definition as in usg5-4.h, but with sigblock/sigunblock - rather than sighold/sigrelse, which appear to be BSD4.1 specific and won't - work if POSIX_SIGNALS is defined. It may also be appropriate for SVR4.x - (x<2) but I'm not sure. fnf@cygnus.com */ -/* This sets the name of the slave side of the PTY. On SysVr4, - grantpt(3) forks a subprocess, so keep sigchld_handler() from - intercepting that death. If any child but grantpt's should die - within, it should be caught after sigrelse(2). */ - -#undef PTY_TTY_NAME_SPRINTF -#define PTY_TTY_NAME_SPRINTF \ - { \ - char *ptsname(), *ptyname; \ - \ - sigblock(sigmask(SIGCLD)); \ - if (grantpt(fd) == -1) \ - fatal("could not grant slave pty"); \ - sigunblock(sigmask(SIGCLD)); \ - if (unlockpt(fd) == -1) \ - fatal("could not unlock slave pty"); \ - if (!(ptyname = ptsname(fd))) \ - fatal ("could not enable slave pty"); \ - strncpy(pty_name, ptyname, sizeof(pty_name)); \ - pty_name[sizeof(pty_name) - 1] = 0; \ - } - -/* Use libw.a along with X11R6 Xt. */ -#define NEED_LIBW - -/* ryanr@ellingtn.ftc.nrcs.usda.gov (Richard Anthony Ryan) says -lXimp - is needed in UNIX_SV ... 4.2 1.1.2. */ -#define LIB_MOTIF -lXm -lXimp - -/* arch-tag: 9bbfcfc1-19be-45a1-9699-af57b87da2c6 - (do not change this comment) */