CVS update by viteno MODIFIED: packages ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/12 18:08:49
Modified: packages ChangeLog
Log:
Package release
Revision Changes Path
1.494 +4 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- ChangeLog 2005/02/10 18:12:42 1.493
+++ ChangeLog 2005/02/12 17:08:48 1.494
＠＠ -1,3 +1,7 ＠＠
+2005-02-12 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: auctex.
+
2005-02-10 Norbert Koch <viteno(a)xemacs.org>
* Packages released: auctex edit-utils perl-modes text-modes.
- 1 participants
- 0 comments
CVS update by vins MODIFIED: xemacs/src ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: vins
Date: 05/02/12 03:56:54
Modified: xemacs/src Tag: release-21-4 ChangeLog process-unix.c
Log:
Make sure the last chunk of data gets written to another process.
Revision Changes Path
No revision
No revision
1.290.2.94 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.93
retrieving revision 1.290.2.94
diff -u -r1.290.2.93 -r1.290.2.94
--- ChangeLog 2005/02/06 19:23:46 1.290.2.93
+++ ChangeLog 2005/02/12 02:56:47 1.290.2.94
＠＠ -1,3 +1,8 ＠＠
+2005-02-03 David Evers <extsw(a)appliedgenerics.com>
+
+ * process-unix.c (unix_send_process): Flush the last chunk, even
+ when the pipe is blocked.
+
2005-02-06 Vin Shelton <acs(a)xemacs.org>
* XEmacs 21.4.17 is released
1.20.2.9 +28 -14 XEmacs/xemacs/src/process-unix.c
Index: process-unix.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-unix.c,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
diff -u -r1.20.2.8 -r1.20.2.9
--- process-unix.c 2005/01/31 02:55:26 1.20.2.8
+++ process-unix.c 2005/02/12 02:56:50 1.20.2.9
＠＠ -1293,26 +1293,38 ＠＠
Bufbyte chunkbuf[512];
Bytecount chunklen;
- while (1)
+ do
{
Lstream_data_count writeret;
chunklen = Lstream_read (lstream, chunkbuf, 512);
- if (chunklen <= 0)
- break; /* perhaps should ABORT() if < 0?
- This should never happen. */
old_sigpipe =
(SIGTYPE (*) (int)) signal (SIGPIPE, send_process_trap);
- /* Lstream_write() will never successfully write less than
- the amount sent in. In the worst case, it just buffers
- the unwritten data. */
- writeret = Lstream_write (XLSTREAM (DATA_OUTSTREAM(p)), chunkbuf,
- chunklen);
- signal (SIGPIPE, old_sigpipe);
- if (writeret < 0)
- /* This is a real error. Blocking errors are handled
- specially inside of the filedesc stream. */
- report_file_error ("writing to process", list1 (proc));
+ if (chunklen > 0)
+ {
+ int save_errno;
+
+ /* Lstream_write() will never successfully write less than
+ the amount sent in. In the worst case, it just buffers
+ the unwritten data. */
+ writeret = Lstream_write (XLSTREAM (DATA_OUTSTREAM(p)), chunkbuf,
+ chunklen);
+ save_errno = errno;
+ signal (SIGPIPE, old_sigpipe);
+ errno = save_errno;
+ if (writeret < 0)
+ /* This is a real error. Blocking errors are handled
+ specially inside of the filedesc stream. */
+ report_file_error ("writing to process", list1 (proc));
+ }
+ else
+ {
+ /* Need to make sure that everything up to and including the
+ last chunk is flushed, even when the pipe is currently
+ blocked. */
+ Lstream_flush (XLSTREAM (DATA_OUTSTREAM(p)));
+ signal (SIGPIPE, old_sigpipe);
+ }
while (Lstream_was_blocked_p (XLSTREAM (p->pipe_outstream)))
{
/* Buffer is full. Wait, accepting input;
＠＠ -1327,7 +1339,9 ＠＠
Lstream_flush (XLSTREAM (p->pipe_outstream));
signal (SIGPIPE, old_sigpipe);
}
+ /* Perhaps should abort() if < 0? This should never happen. */
}
+ while (chunklen > 0);
}
else
{ /* We got here from a longjmp() from the SIGPIPE handler */
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: xemacs ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/11 23:51:15
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1063 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1062
retrieving revision 1.1063
diff -u -r1.1062 -r1.1063
--- version.sh 2005/02/10 22:51:34 1.1062
+++ version.sh 2005/02/11 22:51:15 1.1063
＠＠ -8,4 +8,4 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050210)"
+xemacs_extra_name="(+CVS-20050211)"
- 1 participants
- 0 comments
CVS update by oub MODIFIED: packages/xemacs-packages/auctex/texi, changes.texi, wininstall.texi ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: oub
Date: 05/02/11 20:02:16
Modified: packages/xemacs-packages/auctex/texi auctex.texi
changes.texi install.texi tex-ref.tex todo.texi
wininstall.texi
Added: packages/xemacs-packages/auctex/etc jsarticle.el jsbook.el
Removed: packages/xemacs-packages/auctex/texi math-ref.tex
Log:
Sync with 11.55
Revision Changes Path
1.10 +32 -1 XEmacs/packages/xemacs-packages/auctex/CHANGES
Index: CHANGES
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/CHANGES,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CHANGES 2005/01/18 13:54:40 1.9
+++ CHANGES 2005/02/11 19:02:00 1.10
＠＠ -1,3 +1,34 ＠＠
+Changes and New Features in AUCTeX
+**********************************
+
+News in 11.55
+=============
+
+ * A bug was fixed which lead to the insertion of trailing whitespace
+ during filling. In particular extra spaces were added to sentence
+ endings at the end of lines. You can make this whitespace visible
+ by setting the variable `show-trailing-whitespace' to `t'. If you
+ want to delete all trailing whitespace in a buffer, type `M-x
+ delete-trailing-whitespace RET'.
+
+ * A bug was fixed which lead to a `*Compile-Log*' buffer popping up
+ when the first LaTeX file was loaded in an Emacs session.
+
+ * On some systems the presence of an outdated Emacspeak package lead
+ to the error message `File mode specification error: (error
+ "Variable binding depth exceeds max-specpdl-size")'. Precautions
+ were added which prevent this error from happening. But
+ nevertheless, it is advised to upgrade or uninstall the outdated
+ Emacspeak package.
+
+ * The value of `TeX-macro-global' is not determined during
+ configuration anymore but at load time of AUCTeX. Consequently the
+ associated configuration option `--with-tex-input-dirs' was
+ removed.
+
+ * Support for the LaTeX Japanese classes `jsarticle' and `jsbook'
+ was added.
+
News in 11.54
=============
＠＠ -163,7 +194,7 ＠＠
* Sectioning commands are now shown in a larger font on display
devices which support such fontification. The variable
- `font-latex-title-fontity' can be customized to restore the old
+ `font-latex-title-fontify' can be customized to restore the old
appearance, i.e. the usage of a different color instead of a
change in size.
1.57 +10 -0 XEmacs/packages/xemacs-packages/auctex/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog 2005/02/10 18:13:40 1.56
+++ ChangeLog 2005/02/11 19:02:00 1.57
＠＠ -1,3 +1,13 ＠＠
+2005-02-11 Uwe Brauer <oub(a)mat.ucm.es>
+
+ * tex-site.el: comment for the moment (defcustom TeX-macro-global
+
+ * tex.el: merge tex.el from 11.55 into version from Xemacs pkg.
+
+ * merge tex-jp.el from 11.55 into version from Xemacs pkg.
+
+ * add jsarticle.el and jsbook.el
+
2005-02-10 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.45 released.
1.5 +171 -0 XEmacs/packages/xemacs-packages/auctex/ChangeLog.auctex
Index: ChangeLog.auctex
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/ChangeLog.auctex,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog.auctex 2005/01/18 13:54:41 1.4
+++ ChangeLog.auctex 2005/02/11 19:02:01 1.5
＠＠ -1,3 +1,174 ＠＠
+2005-02-04 David Kastrup <dak(a)gnu.org>
+
+ * Version 11.55 released.
+
+ * Makefile.in (tar-ball):
+
+ * doc/Makefile.in (clean, html/auctex_toc.html, dist): Move HTML
+ stuff into html directory.
+
+2005-02-04 David Kastrup <dak(a)gnu.org>
+
+ * RELEASE: Some more Emacspeak blurb.
+
+2005-02-04 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * RELEASE: Make description of changes clearer.
+
+2005-02-04 David Kastrup <dak(a)gnu.org>
+
+ * RELEASE (Warning): warn about XEmacs 21.4.16.
+
+2005-02-01 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * tex.el (TeX-search-syntax-table): Give ?\" character punctuation
+ syntax. Prevents parenthetical characters from being hidden from
+ `TeX-find-opening-brace' if they happen to be enclosed between two
+ quotation marks.
+ Better use whitespace syntax for ?\" as this is the equivalent of
+ a nil entry in the syntax table.
+ (TeX-search-syntax-table): Remove superfluous possibility to
+ specify comment and escape characters as arguments.
+
+2005-02-01 Masayuki Ataka <ataka(a)milk.freemail.ne.jp>
+
+ * doc/changes.texi: Mention support for the jsarticle and jsbook
+ classes.
+
+ * tex-jp.el (japanese-LaTeX-style-list): Added
+ jsclasses (jsarticle and jsbook).
+
+2005-01-31 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * configure.ac: Bump version info to 11.55.
+
+ * auctex.spec (Version): Bump to 11.55.
+ (Release): Reset to 1.
+
+ * doc/tex-ref.tex: Bump version info to 11.55.
+ (Source Display): Adapt information about key bindings to current
+ implementation.
+
+ * doc/auctex.texi: Bump version info to 11.55.
+
+ * doc/changes.texi: Add information about changes in AUCTeX 11.55.
+
+ * RELEASE: Add information about fixed bugs in AUCTeX 11.55.
+
+ * latex.el (LaTeX-fill-region-as-para-do): Limit the search for
+ sentence ends. Fixes erroneous addition of spaces at places
+ following a paragraph to be filled.
+
+2005-01-31 Masayuki Ataka <ataka(a)milk.freemail.ne.jp>
+
+ * style/jsarticle.el: New file.
+
+ * style/jsbook.el: New file.
+
+ * Makefile.in (STYLESRC): Add them.
+
+2005-01-29 Masayuki Ataka <ataka(a)milk.freemail.ne.jp>
+
+ * tex-jp.el (LaTeX-fill-region-as-para-do): Removed.
+
+2005-01-28 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * tex.el (AUCTeX-date): Use ISO 8601 format.
+ (TeX-submit-bug-report): Include AUCTeX-date when using a
+ non-released version.
+
+2005-01-26 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * tex.el: Do not use whitespace syntax for ?~. Prevents these
+ characters from being deleted during filling.
+
+2005-01-25 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * tex-buf.el: Update header.
+ (TeX-view-output-file): Let `TeX-active-master' return file name
+ without directory. Fixes viewer not finding output file when
+ being called in a subdirectory.
+ (TeX-active-master): Add new parameter `nondirectory'. Doc fix.
+
+2005-01-21 David Kastrup <dak(a)gnu.org>
+
+ * auctex.spec (Conflicts): Mention the outdated emacspeak from
+ FC3.
+
+2005-01-20 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * font-latex.el (font-latex-set-syntactic-keywords): Do not call
+ `regexp-opt' on empty lists. Prevents `regexp-opt-group' from
+ entering a loop on installations with an outdated regexp-opt.el.
+
+ * tex-buf.el (TeX-command-region): Pass name of region file
+ without directory to `TeX-command-query' because a test in the
+ latter expects it like that.
+ (TeX-command-query): Doc fix.
+
+2005-01-19 Jan-Ake Larsson <jalar(a)mai.liu.se>
+
+ * aclocal.m4, configure.ac: A few small changes to allow sync with
+ preview-latex' aclocal.m4
+
+2005-01-19 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * tex.el (hack-one-local-variable): Make sure the byte compiler
+ does not barf on `minor-mode-list' by eliminating the reference to
+ this variable.
+
+2005-01-15 Ralf Angeli <angeli(a)iwi.uni-sb.de>
+
+ * doc/auctex.texi (top): Restrict to one content listing in HTML
+ output.
+
+ * doc/todo.texi (Wishlist): Remove bug regarding parsing of LaTeX
+ class files.
+
+ * tex.el (TeX-macro-global): New function.
+ (TeX-macro-global): (the variable) Moved here from tex-site.el.in.
+ Use new `TeX-macro-global' function.
+
+ * aclocal.m4 (library): Remove TEX_INPUT_DIRS function.
+
+ * configure.ac (auctexdir): Remove call to TEX_INPUT_DIRS.
+
+ * lpath.el: Setting `TeX-macro-global' is not necessary anymore as
+ it now is in tex.el.
+
+ * tex-site.el.in (TeX-macro-global): Move defcustom to tex.el.
+
+ * doc/install.texi (Configure): Remove documentation of
+ --with-tex-input-dirs.
+
+ * doc/wininstall.texi: Remove documentation of
+ --with-tex-input-dirs.
+
+ * latex.el (LaTeX-insert-environment): Insert a simple newline
+ character instead of using `newline'. Fixes insertion of
+ environment end at wrong place in XEmacs.
+ (LaTeX-fill-region): Remove superfluous `save-restriction'.
+ (LaTeX-auto-class-regexp-list): Add patterns for commands
+ described in "LaTeX2e font selection" (fntguide).
+
+2005-01-14 Reiner Steib <Reiner.Steib(a)gmx.de>
+
+ * doc/auctex.texi (European): Document all TeX-language-*-hook
+ variables. Don't document obsolete `dk.sty'.
+
+2005-01-14 David Kastrup <dak(a)gnu.org>
+
+ * auctex.spec: Add and remove auctex.info instead of auctex in
+ info dir. Bump release to 2 to match upload.
+
+2005-01-13 David Kastrup <dak(a)gnu.org>
+
+ * font-latex.el (font-latex-set-title-face)
+ (font-latex-title-fontify): font-latex-title-fontify, not
+ fontity. fontify, fontify, fontify.
+ * doc/changes.texi: Ditto.
+ * doc/auctex.texi (Font Locking): Ditto.
+
2005-01-12 David Kastrup <dak(a)gnu.org>
* Version 11.54 released.
1.58 +5 -5 XEmacs/packages/xemacs-packages/auctex/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/Makefile,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Makefile 2005/02/10 18:13:40 1.57
+++ Makefile 2005/02/11 19:02:01 1.58
＠＠ -19,7 +19,7 ＠＠
VERSION = 1.45
-AUTHOR_VERSION = 11.54
+AUTHOR_VERSION = 11.55
MAINTAINER = Uwe Brauer <oub(a)mat.ucm.es>
PACKAGE = auctex
PKG_TYPE = regular
＠＠ -41,8 +41,8 ＠＠
ETC_ELCS = etc/units.elc etc/nicefrac.elc etc/alltt.elc \
etc/slides.elc etc/foils.elc etc/subfigure.elc etc/amstex.elc \
etc/jurabib.elc etc/listings.elc etc/url.elc etc/csquotes.elc\
- etc/ltx-base.elc etc/ltxdoc.elc etc/captcont.elc \
- etc/emp.elc etc/paralist.elc etc/scrpage2.elc \
+ etc/ltx-base.elc etc/jsbook.elc etc/ltxdoc.elc etc/captcont.elc \
+ etc/emp.elc etc/jsarticle.elc etc/paralist.elc etc/scrpage2.elc \
etc/alphanum.elc etc/doc.elc etc/jura.elc etc/beamer.elc \
etc/italian.elc etc/prosper.elc etc/booktabs.elc \
etc/article.elc etc/book.elc etc/letter.elc \
＠＠ -62,8 +62,8 ＠＠
etc/verbatim.elc etc/scrbase.elc etc/scrartcl.elc \
etc/scrbook.elc etc/scrreprt.elc etc/scrlttr2.elc
-EXTRA_DEPENDENCIES = $(ETC_ELCS) texi/math-ref.dvi texi/tex-ref.dvi \
- texi/math-ref.log texi/tex-ref.log INSTALLATION README CHANGES
+EXTRA_DEPENDENCIES = $(ETC_ELCS) texi/tex-ref.dvi \
+ texi/tex-ref.log INSTALLATION README CHANGES
DATA_FILES = $(ETC_ELCS) $(ETC_ELCS:%.elc=%.el)
DATA_DEST = $(PACKAGE)/style
1.14 +19 -15 XEmacs/packages/xemacs-packages/auctex/font-latex.el
Index: font-latex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/font-latex.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- font-latex.el 2005/01/18 13:54:41 1.13
+++ font-latex.el 2005/02/11 19:02:01 1.14
＠＠ -192,15 +192,15 ＠＠
(defun font-latex-set-title-face (level)
"Set fontification of LaTeX titles at LEVEL."
(cond
- ((equal font-latex-title-fontity 'height)
+ ((equal font-latex-title-fontify 'height)
(set (intern (format "font-latex-title-%d-face" level))
(intern (format "font-latex-title-%d-face" level))))
- ((equal font-latex-title-fontity 'color)
+ ((equal font-latex-title-fontify 'color)
(set (intern (format "font-latex-title-%d-face" level))
'font-lock-type-face))))
-(defcustom font-latex-title-fontity 'height
- "Whether to fontity LaTeX titles with varying height faces or a color face."
+(defcustom font-latex-title-fontify 'height
+ "Whether to fontify LaTeX titles with varying height faces or a color face."
:type '(choice (const height)
(const color))
:set (lambda (symbol value)
＠＠ -660,16 +660,19 ＠＠
This function can be used to refresh the variable in case other
variables influencing its value, like `font-latex-verbatim-environments',
have changed."
- (let ((verb-envs (regexp-opt
- (append font-latex-verbatim-environments
- font-latex-verbatim-environments-local)))
- (verb-like-commands (regexp-opt
- (append font-latex-verb-like-commands
- font-latex-verb-like-commands-local)))
- (verb-macros (regexp-opt
- (append font-latex-verbatim-macros
- font-latex-verbatim-macros-local))))
- (setq font-latex-syntactic-keywords nil)
+ ;; Checks for non-emptiness of lists added in order to cater for
+ ;; installations where `(regexp-opt-group nil)' would enter a loop.
+ (let ((verb-envs (append font-latex-verbatim-environments
+ font-latex-verbatim-environments-local))
+ (verb-like-commands (append font-latex-verb-like-commands
+ font-latex-verb-like-commands-local))
+ (verb-macros (append font-latex-verbatim-macros
+ font-latex-verbatim-macros-local)))
+ (setq verb-envs (and verb-envs (regexp-opt verb-envs))
+ verb-like-commands (and verb-like-commands
+ (regexp-opt verb-like-commands))
+ verb-macros (and verb-macros (regexp-opt verb-macros))
+ font-latex-syntactic-keywords nil)
(unless (= (length verb-envs) 0)
(add-to-list 'font-latex-syntactic-keywords
`(,(concat "^\\\\begin *{\\(?:" verb-envs "\\)}.*\\(\n\\)")
＠＠ -937,7 +940,8 ＠＠
(defun font-latex-find-matching-close (openchar closechar)
"Skip over matching pairs of { } or [ ], ignoring comments.
OPENCHAR is the opening character and CLOSECHAR is the closing character."
- (let ((parse-sexp-ignore-comments t) ; scan-sexps ignores comments
+ (let ((parse-sexp-ignore-comments
+ (not (eq major-mode 'doctex-mode))) ; scan-sexps ignores comments
(init-point (point))
(mycount 1)
(esc-char (or (and (boundp 'TeX-esc) TeX-esc) "\\")))
1.11 +41 -30 XEmacs/packages/xemacs-packages/auctex/latex.el
Index: latex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/latex.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- latex.el 2005/01/18 13:54:42 1.10
+++ latex.el 2005/02/11 19:02:01 1.11
＠＠ -573,7 +573,9 ＠＠
(save-excursion
(goto-char (mark))
(unless (progn (skip-chars-forward " \t") (eolp))
- (if (bolp) (newline) (LaTeX-newline))
+ ;; Use `(insert "\n")' instead of `(newline)' because in contrast
+ ;; to Emacs, XEmacs moves the mark if `newline' is used.
+ (if (bolp) (insert "\n") (LaTeX-newline))
(indent-according-to-mode))))
(when (and LaTeX-insert-into-comments
(looking-at
＠＠ -1103,7 +1105,17 ＠＠
(1 2 3) LaTeX-auto-optional)
("\\\\DeclareRobustCommand\\*?{?\\\\\\([A-Za-z]+\\)}?\\[\\([0-9]+\\)\\]"
(1 2) LaTeX-auto-arguments)
- ("\\\\DeclareRobustCommand\\*?{?\\\\\\([A-Za-z]+\\)}?" 1 TeX-auto-symbol))
+ ("\\\\DeclareRobustCommand\\*?{?\\\\\\([A-Za-z]+\\)}?"
+ 1 TeX-auto-symbol)
+ ;; Patterns for commands described in "LaTeX2e font selection" (fntguide)
+ ("\\\\DeclareMath\\(?:Symbol\\|Delimiter\\|Accent\\|Radical\\)\
+{?\\\\\\([A-Za-z]+\\)}?"
+ 1 TeX-auto-symbol)
+ ("\\\\\\(Declare\\|Provide\\)Text\
+\\(?:Command\\|Symbol\\|Accent\\|Composite\\){?\\\\\\([A-Za-z]+\\)}?"
+ 1 TeX-auto-symbol)
+ ("\\\\Declare\\(?:Text\\|Old\\)FontCommand{?\\\\\\([A-Za-z]+\\)}?"
+ 1 TeX-auto-symbol))
"List of regular expressions matching macros in LaTeX classes and packages.")
(defvar LaTeX-auto-regexp-list
＠＠ -2419,7 +2431,7 ＠＠
sentence-end-double-space)
(progn
(goto-char from)
- (while (re-search-forward "[.?!][]})\"']*$" nil t)
+ (while (re-search-forward "[.?!][]})\"']*$" to t)
(insert ? ))))
;; Then change all newlines to spaces.
(let ((point-max (progn
＠＠ -2900,33 +2912,32 ＠＠
means justify as well. Fourth arg WHAT is a word to be displayed when
formatting."
(interactive "*r\nP")
- (save-restriction
- (save-excursion
- (let ((to (set-marker (make-marker) to))
- (next-par (make-marker)))
- (goto-char from)
- (beginning-of-line)
- (setq from (point))
- (catch 'end-of-buffer
- (while (and (< (point) to))
- (message "Formatting%s ... %d%%"
- (or what "")
- (/ (* 100 (- (point) from)) (- to from)))
- (save-excursion (LaTeX-fill-paragraph justify))
- (if (marker-position next-par)
- (goto-char (marker-position next-par))
- (LaTeX-forward-paragraph))
- (when (eobp) (throw 'end-of-buffer t))
- (LaTeX-forward-paragraph)
- (set-marker next-par (point))
- (LaTeX-backward-paragraph)
- (while (and (not (eobp))
- (looking-at
- (concat "^\\($\\|[ \t]+$\\|[ \t]*"
- TeX-comment-start-regexp "+[ \t]*$\\)")))
- (forward-line 1))))
- (set-marker to nil)))
- (message "Finished")))
+ (save-excursion
+ (let ((to (set-marker (make-marker) to))
+ (next-par (make-marker)))
+ (goto-char from)
+ (beginning-of-line)
+ (setq from (point))
+ (catch 'end-of-buffer
+ (while (and (< (point) to))
+ (message "Formatting%s ... %d%%"
+ (or what "")
+ (/ (* 100 (- (point) from)) (- to from)))
+ (save-excursion (LaTeX-fill-paragraph justify))
+ (if (marker-position next-par)
+ (goto-char (marker-position next-par))
+ (LaTeX-forward-paragraph))
+ (when (eobp) (throw 'end-of-buffer t))
+ (LaTeX-forward-paragraph)
+ (set-marker next-par (point))
+ (LaTeX-backward-paragraph)
+ (while (and (not (eobp))
+ (looking-at
+ (concat "^\\($\\|[ \t]+$\\|[ \t]*"
+ TeX-comment-start-regexp "+[ \t]*$\\)")))
+ (forward-line 1))))
+ (set-marker to nil)))
+ (message "Finished"))
(defun LaTeX-find-matching-end ()
"Move point to the \\end of the current environment.
1.3 +1 -2 XEmacs/packages/xemacs-packages/auctex/lpath.el
Index: lpath.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/lpath.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lpath.el 2004/09/13 15:34:06 1.2
+++ lpath.el 2005/02/11 19:02:01 1.3
＠＠ -5,5 +5,4 ＠＠
(setq load-path (cons "." load-path)
byte-compile-warnings nil
TeX-lisp-directory "<none>"
- TeX-auto-global "<none>"
- TeX-macro-global nil)
+ TeX-auto-global "<none>")
1.9 +17 -10 XEmacs/packages/xemacs-packages/auctex/tex-buf.el
Index: tex-buf.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/tex-buf.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tex-buf.el 2005/01/18 13:54:42 1.8
+++ tex-buf.el 2005/02/11 19:02:01 1.9
＠＠ -1,10 +1,11 ＠＠
;;; tex-buf.el --- External commands for AUCTeX.
-;; Copyright (C) 1993, 1996, 2001, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Copyright (C) 1991 Kresten Krab Thorup
;; Maintainer: auc-tex(a)sunsite.dk
-;; Keywords: tex
+;; Keywords: tex, wp
;; This file is part of AUCTeX.
＠＠ -25,7 +26,7 ＠＠
;;; Commentary:
-;; This file provides support external commands.
+;; This file provides support for external commands.
;;; Code:
＠＠ -176,7 +177,7 ＠＠
(buffer-substring begin end)
(file-name-nondirectory (buffer-file-name))
(TeX-current-offset begin)))
- (TeX-command (TeX-command-query (TeX-region-file)) 'TeX-region-file
+ (TeX-command (TeX-command-query (TeX-region-file nil t)) 'TeX-region-file
override-confirm))
(defun TeX-command-buffer (&optional override-confirm)
＠＠ -379,7 +380,7 ＠＠
(defvar TeX-command-history nil)
(defun TeX-command-query (name)
- "Query the user for a what TeX command to use."
+ "Query the user for what TeX command to use."
(let* ((default (cond ((if (string-equal name TeX-region)
(TeX-check-files (concat name "." (TeX-output-extension))
(list name)
＠＠ -470,7 +471,7 ＠＠
(defun TeX-view-output-file ()
"Get the name of the current TeX output file"
- (TeX-active-master (TeX-output-extension)))
+ (TeX-active-master (TeX-output-extension) t))
(defun TeX-view-mouse (event)
"Start `TeX-view' at mouse position."
＠＠ -1072,11 +1073,17 ＠＠
(TeX-process-buffer (TeX-region-file))
(TeX-process-buffer (TeX-master-file))))
-(defun TeX-active-master (&optional extension)
- "The master file currently being compiled."
+(defun TeX-active-master (&optional extension nondirectory)
+ "The master file currently being compiled.
+
+If optional argument EXTENSION is non-nil, add that file extension to
+the name. Special value t means use `TeX-default-extension'.
+
+If optional second argument NONDIRECTORY is non-nil, do not include
+the directory."
(if TeX-current-process-region-p
- (TeX-region-file extension)
- (TeX-master-file extension)))
+ (TeX-region-file extension nondirectory)
+ (TeX-master-file extension nondirectory)))
(defvar TeX-command-buffer nil
"The buffer from where the last TeX command was issued.")
1.11 +8 -296 XEmacs/packages/xemacs-packages/auctex/tex-jp.el
Index: tex-jp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/tex-jp.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tex-jp.el 2005/01/18 13:54:42 1.10
+++ tex-jp.el 2005/02/11 19:02:02 1.11
＠＠ -1,7 +1,7 ＠＠
;;; tex-jp.el --- Support for Japanese TeX.
;; Copyright (C) 1999, 2001 Hidenobu Nabetani <nabe(a)debian.or.jp>
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
;; Author: KOBAYASHI Shinji <koba(a)flab.fujitsu.co.jp>
;; Maintainer: Masayuki Ataka <ataka(a)milk.freemail.ne.jp>
＠＠ -130,13 +130,15 ＠＠
'(("j-article")
("j-report")
("j-book")
+ ("jslides")
("jarticle")
- ("jbook")
("jreport")
- ("jslides")
+ ("jbook")
("tarticle")
("treport")
- ("tbook"))
+ ("tbook")
+ ("jsarticle")
+ ("jsbook"))
"*List of Japanese document styles."
:group 'AUCTeX-jp
:type '(repeat (group (string :format "%v"))))
＠＠ -226,6 +228,7 ＠＠
(add-hook 'plain-TeX-mode-hook 'japanese-plain-tex-mode-initialization)
;;SY
;;;###autoload(autoload 'japanese-plain-tex-mode "tex-jp" nil t)
+
(TeX-defun japanese-plain-tex-mode ()
"Major mode in %s for editing Japanese plain TeX files.
Set japanese-TeX-mode to t, and enters plain-tex-mode."
＠＠ -240,6 +243,7 ＠＠
(add-hook 'LaTeX-mode-hook 'japanese-latex-mode-initialization)
+
;; SY
;;;###autoload(autoload 'japanese-latex-mode "tex-jp" nil t)
(TeX-defun japanese-latex-mode ()
＠＠ -258,298 +262,6 ＠＠
(setq TeX-command-BibTeX "jBibTeX")
(setq japanese-TeX-mode nil))))
-
-;;; MULE paragraph filling.
-
-;; This function is copied from
-;; fill-region-as-paragraph in fill.el --- fill commands for Emacs
-;; Copyright (C) 1985, 86, 92, 94, 95, 96, 1997 Free Software Foundation, Inc.
-(defun LaTeX-fill-region-as-para-do (from to justify)
- "Fill region as one paragraph: break lines to fit `fill-column'."
- (setq x justify)
- (unless (memq justify '(t nil none full center left right))
- (setq justify 'full))
- (setq y justify)
- ;; Arrange for undoing the fill to restore point.
- (if (and buffer-undo-list (not (eq buffer-undo-list t)))
- (setq buffer-undo-list (cons (point) buffer-undo-list)))
-
- ;; Make sure "to" is the endpoint.
- (goto-char (min from to))
- (setq to (max from to))
- ;; Ignore blank lines at beginning of region.
- (skip-chars-forward " \t\n")
-
- (let ((from-plus-indent (point))
- (oneleft nil))
-
- (beginning-of-line)
- (setq from (point))
-
- ;; Delete all but one soft newline at end of region.
- ;; And leave TO before that one.
- (goto-char to)
- (while (and (> (point) from) (eq ?\n (char-after (1- (point)))))
- (if (and oneleft
- (not (and use-hard-newlines
- (get-text-property (1- (point)) 'hard))))
- (delete-backward-char 1)
- (backward-char 1)
- (setq oneleft t)))
- (setq to (point))
-;;; ;; If there was no newline, and there is text in the paragraph, then
-;;; ;; create a newline.
-;;; (if (and (not oneleft) (> to from-plus-indent))
-;;; (newline))
- (goto-char from-plus-indent))
-
- (if (not (> to (point)))
- nil ; There is no paragraph, only whitespace: exit now.
-
- (or justify (setq justify (current-justification)))
-
- ;; Don't let Adaptive Fill mode alter the fill prefix permanently.
- (let ((fill-prefix fill-prefix))
- ;; Figure out how this paragraph is indented, if desired.
- (if (and adaptive-fill-mode
- (or (null fill-prefix) (string= fill-prefix "")))
- (setq fill-prefix (fill-context-prefix from to)))
-
- (save-restriction
- (goto-char from)
- (beginning-of-line)
- (narrow-to-region (point) to)
-
- (if (not justify) ; filling disabled: just check indentation
- (progn
- (goto-char from)
- (while (not (eobp))
- (if (and (not (eolp))
- (< (current-indentation) (current-left-margin)))
- (LaTeX-indent-line))
- (forward-line 1)))
-
- (if use-hard-newlines
- (remove-text-properties from (point-max) '(hard nil)))
- ;; Make sure first line is indented (at least) to left margin...
- (if (or (memq justify '(right center))
- (< (current-indentation) (current-left-margin)))
- (LaTeX-indent-line))
- ;; Delete the fill prefix from every line except the first.
- ;; The first line may not even have a fill prefix.
- (goto-char from)
- (let ((fpre (and fill-prefix (not (equal fill-prefix ""))
- (concat "[ \t]*"
- (regexp-quote fill-prefix)
- "[ \t]*"))))
- (and fpre
- (progn
- (if (>= (+ (current-left-margin) (length fill-prefix))
- (current-fill-column))
- (error "fill-prefix too long for specified width"))
- (goto-char from)
- (forward-line 1)
- (while (not (eobp))
- (if (looking-at fpre)
- (delete-region (point) (match-end 0)))
- (forward-line 1))
- (goto-char from)
- (if (looking-at fpre)
- (goto-char (match-end 0)))
- (setq from (point)))))
- ;; Remove indentation from lines other than the first.
- (beginning-of-line 2)
- (indent-region (point) (point-max) 0)
- (goto-char from)
-
- ;; FROM, and point, are now before the text to fill,
- ;; but after any fill prefix on the first line.
-
- ;; Make sure sentences ending at end of line get an extra space.
- ;; loses on split abbrevs ("Mr.\nSmith")
- (while (re-search-forward "[.?!][])}\"']*$" nil t)
- (or (eobp) (insert-and-inherit ?\ )))
- (goto-char from)
- ;; The character category `|' means that we can break a line
- ;; at the character. Since we don't need a space between
- ;; them, delete all newlines between them ...
- (while (re-search-forward "\\c|\n\\|\n\\c|" nil t)
- (if (bolp)
- (delete-char -1)
- (if (= (char-before (match-beginning 0)) ?\ )
- ;; ... except when there is end of sentence. The
- ;; variable `sentence-end-double-space' is handled
- ;; properly later.
- nil
- (delete-region (match-beginning 0) (1+ (match-beginning 0))))))
- (goto-char from)
- (skip-chars-forward " \t")
- ;; Then change all newlines to spaces.
- (subst-char-in-region from (point-max) ?\n ?\ )
- (if (not (eq justify 'full))
- nil
- (canonically-space-region (point) (point-max))
- (goto-char (point-max))
- (delete-horizontal-space)
- (insert-and-inherit " "))
- (goto-char (point-min))
-
- ;; This is the actual filling loop.
- (let ((prefixcol 0) linebeg)
- (while (not (eobp))
- (setq linebeg (point))
- (move-to-column (1+ (current-fill-column)))
- (if (eobp)
- (delete-horizontal-space)
- ;; Move back to the point where we can break the line
- ;; at. We break the line between word or after/before
- ;; the character which has character category `|'. We
- ;; search space, \c| followed by a character, or \c|
- ;; following a character. If not found, place
- ;; the point at linebeg.
- (if (re-search-backward " \\|\\c|.\\|.\\c|" linebeg 0)
- ;; In case of space, we place the point at next to
- ;; the point where the break occurs acutually,
- ;; because we don't want to change the following
- ;; logic of original Emacs. In case of \c|, the
- ;; point is at the place where the break occurs.
- (forward-char 1))
- ;; Don't break after a period followed by just one space.
- ;; Move back to the previous place to break.
- ;; The reason is that if a period ends up at the end of a line,
- ;; further fills will assume it ends a sentence.
- ;; If we now know it does not end a sentence,
- ;; avoid putting it at the end of the line.
- (while (or (and sentence-end-double-space
- (> (point) (+ linebeg 2))
- (eq (preceding-char) ?\ )
- (not (eq (following-char) ?\ ))
- (eq (char-after (- (point) 2)) ?\.)
- (progn (forward-char -2) t))
- (and fill-nobreak-predicate
- (funcall fill-nobreak-predicate)
- (goto-char (match-beginning 0))))
- (if (re-search-backward " \\|\\c|.\\|.\\c|" linebeg 0)
- (forward-char 1)))
- ;; If the left margin and fill prefix by themselves
- ;; pass the fill-column. or if they are zero
- ;; but we have no room for even one word,
- ;; keep at least one word or a character which has
- ;; category `|'anyway .
- ;; This handles ALL BUT the first line of the paragraph.
- (if (if (zerop prefixcol)
- (save-excursion
- (skip-chars-backward " \t" linebeg)
- (bolp))
- (>= prefixcol (current-column)))
- ;; Ok, skip at least one word or one \c| character.
- ;; Meanwhile, don't stop at a period followed by one space.
- (let ((first t))
- (move-to-column prefixcol)
- (while (and (not (eobp))
- (or first
- (and (not (bobp))
- sentence-end-double-space
- (save-excursion (forward-char -1)
- (and (looking-at "\\. ")
- (not (looking-at "\\. ")))))
- (and fill-nobreak-predicate
- (funcall fill-nobreak-predicate))))
- ;; Find a breakable point while ignoring the
- ;; following spaces.
- (skip-chars-forward " \t")
- (if (looking-at "\\c|")
- (forward-char 1)
- (let ((pos (save-excursion
- (skip-chars-forward "^ \n\t")
- (point))))
- (if (re-search-forward "\\c|" pos t)
- (forward-char -1)
- (goto-char pos))))
- (setq first nil)))
- ;; Normally, move back over the single space between the words.
- (if (= (preceding-char) ?\ ) (forward-char -1))
- ;; Do KINSOKU processing.
- (if (and enable-multibyte-characters enable-kinsoku
- (save-excursion
- (goto-char (point-min))
- (skip-chars-forward "\0-\177")
- (/= (point) (point-max))))
- (kinsoku linebeg)))
-
- ;; If the left margin and fill prefix by themselves
- ;; pass the fill-column, keep at least one word.
- ;; This handles the first line of the paragraph.
- (if (and (zerop prefixcol)
- (let ((fill-point (point)) nchars)
- (save-excursion
- (move-to-left-margin)
- (setq nchars (- fill-point (point)))
- (or (< nchars 0)
- (and fill-prefix
- (< nchars (length fill-prefix))
- (string= (buffer-substring (point) fill-point)
- (substring fill-prefix 0 nchars)))))))
- ;; Ok, skip at least one word. But
- ;; don't stop at a period followed by just one space.
- (let ((first t))
- (while (and (not (eobp))
- (or first
- (and (not (bobp))
- sentence-end-double-space
- (save-excursion (forward-char -1)
- (and (looking-at "\\. ")
- (not (looking-at "\\. ")))))
- (and fill-nobreak-predicate
- (funcall fill-nobreak-predicate))))
- ;; Find a breakable point while ignoring the
- ;; following spaces.
- (skip-chars-forward " \t")
- (if (looking-at "\\c|")
- (forward-char 1)
- (let ((pos (save-excursion
- (skip-chars-forward "^ \n\t")
- (point))))
- (if (re-search-forward "\\c|" pos t)
- (forward-char -1)
- (goto-char pos))))
- (setq first nil))))
- ;; Check again to see if we got to the end of the paragraph.
- (if (save-excursion (skip-chars-forward " \t") (eobp))
- (delete-horizontal-space)
- ;; Replace whitespace here with one newline, then indent to left
- ;; margin.
- (skip-chars-backward " \t")
- (if (and (= (following-char) ?\ )
- (or (aref (char-category-set (preceding-char)) ?|)
- (looking-at "[ \t]+\\c|")))
- ;; We need one space at end of line so that
- ;; further filling won't delete it. NOTE: We
- ;; intentionally leave this one space to
- ;; distingush the case that user wants to put
- ;; space between \c| characters.
- (forward-char 1))
- (insert ?\n)
- ;; Give newline the properties of the space(s) it replaces
- (set-text-properties (1- (point)) (point)
- (text-properties-at (point)))
- (LaTeX-indent-line)
- ;; Set prefixcol so whitespace in the prefix won't get lost.
- (and fill-prefix (not (equal fill-prefix ""))
- (setq prefixcol (current-column)))))
- ;; Justify the line just ended, if desired.
- (if justify
- (if (save-excursion (skip-chars-forward " \t") (eobp))
- (progn
- (delete-horizontal-space)
- (justify-current-line justify t t))
- (forward-line -1)
- (justify-current-line justify nil t)
- (forward-line 1))))))
- ;; Leave point after final newline.
- (goto-char (point-max)))
- (unless (eobp)
- (forward-char 1)))))
;;; Support for various self-insert-command
1.13 +42 -41 XEmacs/packages/xemacs-packages/auctex/tex-site.el
Index: tex-site.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/tex-site.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tex-site.el 2005/02/04 12:27:45 1.12
+++ tex-site.el 2005/02/11 19:02:02 1.13
＠＠ -84,51 +84,52 ＠＠
:group 'TeX-file
:type 'directory)
-
+;;; let us see whether the new function TeX-macro-global works.
+;;; <--- [HERE BEGINS A CHANGE] Feb 11, 2005 19:49 Uwe Brauer Feb 11, 2005
;; SY
-(defcustom TeX-macro-global nil
- "*The path to your global system wide TeX macro files.
-
-The directory names *must* end with a slash. If have system
-administration rights, you open tex-site.el via the find-library
-command in order to set the variable. Otherwise set it in the
-normal way via the custom interface.
-
-A typical value could be:
-
- '\(\"/usr/share/texmf/tex/\"
- \"/usr/share/texmf/bibtex/bst/\"\)
-
-You can possibly find these TeX directories on a GNU/Linux system
-with the command:
-
- kpsewhich --progname latex --expand-braces $TEXMFLOCAL
+;; (defcustom TeX-macro-global nil
+;; "*The path to your global system wide TeX macro files.
+;;
+;; The directory names *must* end with a slash. If have system
+;; administration rights, you open tex-site.el via the find-library
+;; command in order to set the variable. Otherwise set it in the
+;; normal way via the custom interface.
+;;
+;; A typical value could be:
+;;
+;; '\(\"/usr/share/texmf/tex/\"
+;; \"/usr/share/texmf/bibtex/bst/\"\)
+;;
+;; You can possibly find these TeX directories on a GNU/Linux system
+;; with the command:
+;;
+;; kpsewhich --progname latex --expand-braces $TEXMFLOCAL
+;;
+;; Or:
+;;
+;; kpsewhich --progname latex --expand-braces $TEXMFCNF
+;;
+;; Note that you may not need to set `TeX-macro-global' to anything and
+;; the default value of nil may be the correct setting for you.
+;;
+;; If you don't have administration rights contact your system
+;; administrator. If you are on MS Windows, look for the documentation
+;; of your tex system, such as MikTex."
+;; :group 'TeX-file
+;; :type '(repeat (directory :format "%v")))
-Or:
-
- kpsewhich --progname latex --expand-braces $TEXMFCNF
-
-Note that you may not need to set `TeX-macro-global' to anything and
-the default value of nil may be the correct setting for you.
-
-If you don't have administration rights contact your system
-administrator. If you are on MS Windows, look for the documentation
-of your tex system, such as MikTex."
- :group 'TeX-file
- :type '(repeat (directory :format "%v")))
-
;; Inform the user if `TeX-macro-global' isn't set and it is likely
;; that it needs to be.
-(eval-after-load "tex"
- '(if (and (not TeX-macro-global)
- (or (getenv "TEXMFCNF")
- (getenv "TEXMFLOCAL")))
- (progn
- (message "`TeX-macro-global' may not be set correctly.")
- (sit-for 3)
- (message "See `C-h v TeX-macro-global' for further information.")
- (sit-for 3))))
-
+;; (eval-after-load "tex"
+;; '(if (and (not TeX-macro-global)
+;; (or (getenv "TEXMFCNF")
+;; (getenv "TEXMFLOCAL")))
+;; (progn
+;; (message "`TeX-macro-global' may not be set correctly.")
+;; (sit-for 3)
+;; (message "See `C-h v TeX-macro-global' for further information.")
+;; (sit-for 3))))
+;;<--- [HERE END A CHANGE] Feb 11, 2005 19:49 Uwe Brauer Feb 11, 2005
;;; Autoloads:
1.13 +84 -38 XEmacs/packages/xemacs-packages/auctex/tex.el
Index: tex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/tex.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tex.el 2005/02/04 12:44:46 1.12
+++ tex.el 2005/02/11 19:02:02 1.13
＠＠ -633,7 +633,7 ＠＠
(defconst AUCTeX-version
(eval-when-compile
(let ((name "$Name: $")
- (rev "$Revision: 1.12 $"))
+ (rev "$Revision: 1.13 $"))
(or (when (string-match "\\`[$]Name: *\\(release_\\)?\\([^ ]+\\) *[$]\\'"
name)
(setq name (match-string 2 name))
＠＠ -648,15 +648,15 ＠＠
(defconst AUCTeX-date
(eval-when-compile
- (let ((date "$Date: 2005/02/04 12:44:46 $"))
+ (let ((date "$Date: 2005/02/11 19:02:02 $"))
(string-match
"\\`[$]Date: *\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)"
date)
- (format "%s.%s%s" (match-string 1 date) (match-string 2 date)
+ (format "%s-%s-%s" (match-string 1 date) (match-string 2 date)
(match-string 3 date))))
- "AUCTeX release date.
-In the form of yyyy.mmdd")
+ "AUCTeX release date using the ISO 8601 format, yyyy-mm-dd.")
+
(defconst AUC-TeX-version AUCTeX-version
"Obsolete. Replaced by `AUCTeX-version'.")
＠＠ -682,19 +682,17 ＠＠
(add-to-list 'Info-file-list-for-emacs
(cons elt "AUCTeX"))))
+
(defadvice hack-one-local-variable (after TeX-hack-one-local-variable-after
activate)
"Call minor mode function if minor mode variable is found."
(let ((var (ad-get-arg 0))
(val (ad-get-arg 1)))
- (when (if (boundp 'minor-mode-list)
- ;; Test which does not require maintenance but `minor-mode-list'.
- (and (memq var minor-mode-list)
- (string-match "^\\(La\\)*TeX-.+-mode$" (symbol-name var)))
- ;; "Manual" test requiring adaption when minor modes change.
- (memq var '(TeX-PDF-mode TeX-source-specials-mode
- TeX-interactive-mode TeX-Omega-mode
- TeX-fold-mode LaTeX-math-mode)))
+ ;; Instead of checking for each mode explicitely `minor-mode-list'
+ ;; could be used. But this may make the byte compiler pop up.
+ (when (memq var '(TeX-PDF-mode
+ TeX-source-specials-mode TeX-interactive-mode
+ TeX-Omega-mode TeX-fold-mode LaTeX-math-mode))
(if (symbol-value val) (funcall var 1) (funcall var 0)))))
＠＠ -1462,6 +1460,57 ＠＠
(setq answers (cons entry answers))))
answers))
+(defun TeX-macro-global ()
+ "Return directories containing the site's TeX macro and style files."
+ (let ((tree-list '("$SYSTEXMF" "$TEXMFLOCAL" "$TEXMFMAIN" "$TEXMFDIST"))
+ path-list path exit-status input-dir-list)
+ (condition-case nil
+ (catch 'success
+ (dotimes (i (safe-length tree-list))
+ (setq path (with-output-to-string
+ (setq exit-status
+ (call-process
+ "kpsewhich" nil
+ (list standard-output nil) nil
+ "--progname" "latex"
+ "--expand-braces" (nth i tree-list)))))
+ (if (zerop exit-status)
+ (progn (add-to-list 'path-list path)
+ (when (zerop i) (throw 'success nil)))
+ (setq path (with-output-to-string
+ (setq exit-status
+ (call-process
+ "kpsewhich" nil
+ (list standard-output nil) nil
+ "--progname" "latex"
+ "--expand-path" (nth i tree-list)))))
+ (when (zerop exit-status) (add-to-list 'path-list path)))))
+ (error nil))
+ (dolist (elt path-list)
+ (let ((separators (if (string-match "^[A-Za-z]:" elt)
+ "[\n\r;]"
+ "[\n\r:]")))
+ (dolist (item (condition-case nil
+ (split-string elt separators t)
+ ;; COMPATIBILITY for XEmacs <= 21.4.15
+ (error (delete "" (split-string elt separators)))))
+ (when (string-match "^!+" item)
+ (setq item (substring item (match-end 0) (length item))))
+ (when (string-match "/+$" item)
+ (setq item (substring item 0 (match-beginning 0))))
+ (dolist (subdir '("/tex/" "/bibtex/bst/"))
+ (when (file-exists-p (file-name-as-directory (concat item subdir)))
+ (add-to-list 'input-dir-list (concat item subdir)))))))
+ (or input-dir-list
+ '("/usr/share/texmf/tex/" "/usr/share/texmf/bibtex/bst/"))))
+
+(defcustom TeX-macro-global (TeX-macro-global)
+ "Directories containing the site's TeX macro and style files.
+The directory names *must* end with a directory separator."
+ :group 'TeX-file
+ :type '(repeat (directory :format "%v")))
+
+
(defcustom TeX-macro-private (append (TeX-parse-path "TEXINPUTS")
(TeX-parse-path "BIBINPUTS"))
"Directories where you store your personal TeX macros.
＠＠ -3758,8 +3807,12 ＠＠
(let ((table (make-syntax-table (make-char-table (if (featurep 'xemacs)
'syntax
'syntax-table)))))
- (modify-syntax-entry ?\f ">" table)
- (modify-syntax-entry ?\n ">" table)
+ ;; Preset mode-independent syntax entries. (Mode-dependent
+ ;; entries are set in the function `TeX-search-syntax-table'.)
+ ;; ?\" explicitely gets whitespace syntax because Emacs 21.3 and
+ ;; XEmacs don't generate a completely empty syntax table.
+ (dolist (elt '((?\f . ">") (?\n . ">") (?\" . " ")))
+ (modify-syntax-entry (car elt) (cdr elt) table))
table)
"Syntax table used for searching purposes.
It should be accessed through the function `TeX-search-syntax-table'.")
＠＠ -3769,32 +3822,22 ＠＠
ARGS may be a list of characters. For each of them the
respective predefined syntax is set. Currently the parenthetical
characters ?{, ?}, ?[, and ?] are supported. The syntax of each
-of these characters not specified will be reset to \" \".
-Besides the escape characters ?\\\\ and ?＠ as well as the comment
-character ?% may be specified. This should not be necessary as
-they are set automatically if they are omitted."
- (let ((char-syntax-alist '((?\\ . "\\")
- (?\＠ . "\\")
- (?\% . "<")
- (?\{ . "(}")
+of these characters not specified will be reset to \" \"."
+ (let ((char-syntax-alist '((?\{ . "(}")
(?\} . "){")
(?\[ . "(]")
(?\] . ")["))))
- ;; First clean up.
- (dolist (item char-syntax-alist)
- (modify-syntax-entry (car item) " " TeX-search-syntax-table))
- ;; Set the escape character automatically if it is not specified
- ;; explicitely. (This could be done as well once when the mode is
- ;; being initialized.)
- (unless (or (memq ?\\ args) (memq ?\＠ args))
- (modify-syntax-entry (string-to-char TeX-esc) "\\"
- TeX-search-syntax-table))
- ;; Same for comment character.
- (unless (and (memq ?\% args) (eq major-mode 'texinfo-mode))
+ ;; Preset mode-dependent syntax entries. (Mode-independent entries
+ ;; are set when the variable `TeX-search-syntax-table' is created.)
+ (modify-syntax-entry (string-to-char TeX-esc) "\\" TeX-search-syntax-table)
+ (unless (eq major-mode 'texinfo-mode)
(modify-syntax-entry ?\% "<" TeX-search-syntax-table))
+ ;; Clean up the entries which can be specified as arguments.
+ (dolist (elt char-syntax-alist)
+ (modify-syntax-entry (car elt) " " TeX-search-syntax-table))
;; Now set what we got.
- (dolist (item args)
- (modify-syntax-entry item (cdr (assoc item char-syntax-alist))
+ (dolist (elt args)
+ (modify-syntax-entry elt (cdr (assoc elt char-syntax-alist))
TeX-search-syntax-table))
;; Return the syntax table.
TeX-search-syntax-table))
＠＠ -4350,7 +4393,10 ＠＠
(require 'reporter)
(reporter-submit-bug-report
"auc-tex(a)sunsite.dk"
- (concat "AUCTeX " AUCTeX-version)
+ (concat "AUCTeX " AUCTeX-version
+ (if (string-match "^CVS-" AUCTeX-version)
+ (format " (%s)" AUCTeX-date)
+ ""))
(list 'window-system
'LaTeX-version
'TeX-style-path
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/article.el
Index: article.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/article.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- article.el 2005/01/18 13:54:48 1.7
+++ article.el 2005/02/11 19:02:07 1.8
＠＠ -1,6 +1,6 ＠＠
;;; article.el - Special code for article style.
-;; $Id: article.el,v 1.7 2005/01/18 13:54:48 oub Exp $
+;; $Id: article.el,v 1.8 2005/02/11 19:02:07 oub Exp $
;;; Code:
1.3 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/beamer.el
Index: beamer.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/beamer.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beamer.el 2005/01/18 13:54:48 1.2
+++ beamer.el 2005/02/11 19:02:07 1.3
＠＠ -5,7 +5,7 ＠＠
;; Author: Thomas Baumann <thomas.baumann(a)ch.tum.de>
;; Created: 2003-12-20
-;; Version: $Id: beamer.el,v 1.2 2005/01/18 13:54:48 oub Exp $
+;; Version: $Id: beamer.el,v 1.3 2005/02/11 19:02:07 oub Exp $
;; Keywords: tex
;;; Commentary:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/book.el
Index: book.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/book.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- book.el 2005/01/18 13:54:48 1.7
+++ book.el 2005/02/11 19:02:07 1.8
＠＠ -1,6 +1,6 ＠＠
;;; book.el - Special code for book style.
-;; $Id: book.el,v 1.7 2005/01/18 13:54:48 oub Exp $
+;; $Id: book.el,v 1.8 2005/02/11 19:02:07 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/danish.el
Index: danish.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/danish.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- danish.el 2005/01/18 13:54:48 1.7
+++ danish.el 2005/02/11 19:02:07 1.8
＠＠ -1,6 +1,6 ＠＠
;;; danish.el - Setup AUC TeX for editing Danish text.
-;; $Id: danish.el,v 1.7 2005/01/18 13:54:48 oub Exp $
+;; $Id: danish.el,v 1.8 2005/02/11 19:02:07 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/dk.el
Index: dk.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/dk.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dk.el 2005/01/18 13:54:48 1.7
+++ dk.el 2005/02/11 19:02:07 1.8
＠＠ -1,6 +1,6 ＠＠
;;; dk.el - Setup AUC TeX for editing Danish text.
-;; $Id: dk.el,v 1.7 2005/01/18 13:54:48 oub Exp $
+;; $Id: dk.el,v 1.8 2005/02/11 19:02:07 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/dutch.el
Index: dutch.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/dutch.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dutch.el 2005/01/18 13:54:48 1.7
+++ dutch.el 2005/02/11 19:02:07 1.8
＠＠ -1,6 +1,6 ＠＠
;;; dutch.el - Setup AUC TeX for editing Dutch text.
-;; $Id: dutch.el,v 1.7 2005/01/18 13:54:48 oub Exp $
+;; $Id: dutch.el,v 1.8 2005/02/11 19:02:07 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/foils.el
Index: foils.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/foils.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- foils.el 2005/01/18 13:54:48 1.7
+++ foils.el 2005/02/11 19:02:07 1.8
＠＠ -1,6 +1,6 ＠＠
;;; foils.el - Special code for FoilTeX.
-;; $Id: foils.el,v 1.7 2005/01/18 13:54:48 oub Exp $
+;; $Id: foils.el,v 1.8 2005/02/11 19:02:07 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/german.el
Index: german.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/german.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- german.el 2005/01/18 13:54:48 1.7
+++ german.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; german.el - Setup AUC TeX for editing German text.
-;; $Id: german.el,v 1.7 2005/01/18 13:54:48 oub Exp $
+;; $Id: german.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Commentary:
;;
1.9 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/harvard.el
Index: harvard.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/harvard.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- harvard.el 2005/01/18 13:54:49 1.8
+++ harvard.el 2005/02/11 19:02:08 1.9
＠＠ -2,7 +2,7 ＠＠
;; Harvard citation style is from Peter Williams
;; available on the CTAN servers
-;; Version: $Id: harvard.el,v 1.8 2005/01/18 13:54:49 oub Exp $
+;; Version: $Id: harvard.el,v 1.9 2005/02/11 19:02:08 oub Exp $
;; Copyright (C) 1994 Berwin Turlach <berwin(a)core.ucl.ac.be>
;; Copyright (C) 1997 Berwin Turlach <berwin.turlach(a)anu.edu.au>
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/j-article.el
Index: j-article.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/j-article.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- j-article.el 2005/01/18 13:54:49 1.7
+++ j-article.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; j-article.el - Special code for j-article style.
-;; $Id: j-article.el,v 1.7 2005/01/18 13:54:49 oub Exp $
+;; $Id: j-article.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/j-book.el
Index: j-book.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/j-book.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- j-book.el 2005/01/18 13:54:49 1.7
+++ j-book.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; j-book.el - Special code for j-book style.
-;; $Id: j-book.el,v 1.7 2005/01/18 13:54:49 oub Exp $
+;; $Id: j-book.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/j-report.el
Index: j-report.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/j-report.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- j-report.el 2005/01/18 13:54:49 1.7
+++ j-report.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; j-report.el - Special code for j-report style.
-;; $Id: j-report.el,v 1.7 2005/01/18 13:54:49 oub Exp $
+;; $Id: j-report.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/jarticle.el
Index: jarticle.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/jarticle.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jarticle.el 2005/01/18 13:54:49 1.7
+++ jarticle.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; jarticle.el - Special code for jarticle style.
-;; $Id: jarticle.el,v 1.7 2005/01/18 13:54:49 oub Exp $
+;; $Id: jarticle.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/jbook.el
Index: jbook.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/jbook.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jbook.el 2005/01/18 13:54:49 1.7
+++ jbook.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; jbook.el - Special code for jbook style.
-;; $Id: jbook.el,v 1.7 2005/01/18 13:54:49 oub Exp $
+;; $Id: jbook.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/jreport.el
Index: jreport.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/jreport.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jreport.el 2005/01/18 13:54:49 1.7
+++ jreport.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; jreport.el - Special code for jreport style.
-;; $Id: jreport.el,v 1.7 2005/01/18 13:54:49 oub Exp $
+;; $Id: jreport.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Code:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/latexinfo.el
Index: latexinfo.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/latexinfo.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- latexinfo.el 2005/01/18 13:54:49 1.7
+++ latexinfo.el 2005/02/11 19:02:08 1.8
＠＠ -3,7 +3,7 ＠＠
;; Copyright (C) 1993 Marc Gemis <makke(a)wins.uia.ac.be>
;; Author: Marc Gemis <makke(a)wins.uia.ac.be>
-;; Version: $Id: latexinfo.el,v 1.7 2005/01/18 13:54:49 oub Exp $
+;; Version: $Id: latexinfo.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/letter.el
Index: letter.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/letter.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- letter.el 2005/01/18 13:54:50 1.7
+++ letter.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; letter.el - Special code for letter style.
-;; $Id: letter.el,v 1.7 2005/01/18 13:54:50 oub Exp $
+;; $Id: letter.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Code:
1.6 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/ngerman.el
Index: ngerman.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/ngerman.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ngerman.el 2005/01/18 13:54:50 1.5
+++ ngerman.el 2005/02/11 19:02:08 1.6
＠＠ -1,6 +1,6 ＠＠
;;; ngerman.el - Setup AUC TeX for editing German text.
-;; $Id: ngerman.el,v 1.5 2005/01/18 13:54:50 oub Exp $
+;; $Id: ngerman.el,v 1.6 2005/02/11 19:02:08 oub Exp $
;;; Commentary:
;;
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/plfonts.el
Index: plfonts.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/plfonts.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plfonts.el 2005/01/18 13:54:50 1.7
+++ plfonts.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; plfonts.el - Setup AUC TeX for editing Polish text with plfonts.sty
-;; $Id: plfonts.el,v 1.7 2005/01/18 13:54:50 oub Exp $
+;; $Id: plfonts.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Commentary:
;;
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/plhb.el
Index: plhb.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/plhb.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plhb.el 2005/01/18 13:54:50 1.7
+++ plhb.el 2005/02/11 19:02:08 1.8
＠＠ -1,6 +1,6 ＠＠
;;; plhb.el - Setup AUC TeX for editing Polish text with plhb.sty
-;; $Id: plhb.el,v 1.7 2005/01/18 13:54:50 oub Exp $
+;; $Id: plhb.el,v 1.8 2005/02/11 19:02:08 oub Exp $
;;; Commentary:
;;
1.5 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/prosper.el
Index: prosper.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/prosper.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prosper.el 2005/01/18 13:54:50 1.4
+++ prosper.el 2005/02/11 19:02:09 1.5
＠＠ -62,7 +62,7 ＠＠
(defconst LaTeX-prosper-version
- "$Id: prosper.el,v 1.4 2005/01/18 13:54:50 oub Exp $"
+ "$Id: prosper.el,v 1.5 2005/02/11 19:02:09 oub Exp $"
"prosper.el version.")
(defconst LaTeX-prosper-transition-styles '("Split"
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/report.el
Index: report.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/report.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- report.el 2005/01/18 13:54:50 1.7
+++ report.el 2005/02/11 19:02:09 1.8
＠＠ -1,6 +1,6 ＠＠
;;; report.el - Special code for report style.
-;; $Id: report.el,v 1.7 2005/01/18 13:54:50 oub Exp $
+;; $Id: report.el,v 1.8 2005/02/11 19:02:09 oub Exp $
;;; Code:
1.5 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/scrartcl.el
Index: scrartcl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/scrartcl.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scrartcl.el 2005/01/18 13:54:50 1.4
+++ scrartcl.el 2005/02/11 19:02:09 1.5
＠＠ -6,7 +6,7 ＠＠
;; Author: Mark Trettin <Mark.Trettin(a)gmx.de>
;; Created: 2002-09-26
-;; Version: $Id: scrartcl.el,v 1.4 2005/01/18 13:54:50 oub Exp $
+;; Version: $Id: scrartcl.el,v 1.5 2005/02/11 19:02:09 oub Exp $
;; Keywords: tex
;;; Commentary:
1.5 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/scrbase.el
Index: scrbase.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/scrbase.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scrbase.el 2005/01/18 13:54:50 1.4
+++ scrbase.el 2005/02/11 19:02:09 1.5
＠＠ -5,7 +5,7 ＠＠
;; Author: Mark Trettin <Mark.Trettin(a)gmx.de>
;; Created: 2002-09-26
-;; Version: $Id: scrbase.el,v 1.4 2005/01/18 13:54:50 oub Exp $
+;; Version: $Id: scrbase.el,v 1.5 2005/02/11 19:02:09 oub Exp $
;; Keywords: tex
;; License: GPL, see the file COPYING in the base directory of AUCTeX
1.5 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/scrbook.el
Index: scrbook.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/scrbook.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scrbook.el 2005/01/18 13:54:50 1.4
+++ scrbook.el 2005/02/11 19:02:09 1.5
＠＠ -6,7 +6,7 ＠＠
;; Author: Mark Trettin <Mark.Trettin(a)gmx.de>
;; Created: 2002-09-26
-;; Version: $Id: scrbook.el,v 1.4 2005/01/18 13:54:50 oub Exp $
+;; Version: $Id: scrbook.el,v 1.5 2005/02/11 19:02:09 oub Exp $
;; Keywords: tex
;;; Commentary:
1.5 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/scrlttr2.el
Index: scrlttr2.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/scrlttr2.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scrlttr2.el 2005/01/18 13:54:51 1.4
+++ scrlttr2.el 2005/02/11 19:02:09 1.5
＠＠ -6,7 +6,7 ＠＠
;; Author: Mark Trettin <Mark.Trettin(a)gmx.de>
;; Created: 2002-10-26
-;; Version: $Id: scrlttr2.el,v 1.4 2005/01/18 13:54:51 oub Exp $
+;; Version: $Id: scrlttr2.el,v 1.5 2005/02/11 19:02:09 oub Exp $
;; Keywords: tex
;;; Commentary:
1.5 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/scrreprt.el
Index: scrreprt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/scrreprt.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scrreprt.el 2005/01/18 13:54:51 1.4
+++ scrreprt.el 2005/02/11 19:02:09 1.5
＠＠ -6,7 +6,7 ＠＠
;; Author: Mark Trettin <Mark.Trettin(a)gmx.de>
;; Created: 2002-09-26
-;; Version: $Id: scrreprt.el,v 1.4 2005/01/18 13:54:51 oub Exp $
+;; Version: $Id: scrreprt.el,v 1.5 2005/02/11 19:02:09 oub Exp $
;; Keywords: tex
;;; Commentary:
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/swedish.el
Index: swedish.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/swedish.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- swedish.el 2005/01/18 13:54:51 1.7
+++ swedish.el 2005/02/11 19:02:09 1.8
＠＠ -1,6 +1,6 ＠＠
;;; swedish.el - Setup AUC TeX for editing Swedish text.
-;; $Id: swedish.el,v 1.7 2005/01/18 13:54:51 oub Exp $
+;; $Id: swedish.el,v 1.8 2005/02/11 19:02:09 oub Exp $
;;; Commentary:
;;
1.8 +0 -0 XEmacs/packages/xemacs-packages/auctex/etc/virtex.el
Index: virtex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/etc/virtex.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- virtex.el 2005/01/18 13:54:51 1.7
+++ virtex.el 2005/02/11 19:02:09 1.8
＠＠ -1,6 +1,6 ＠＠
;;; virtex.el - Common code for all TeX formats.
-;; $Id: virtex.el,v 1.7 2005/01/18 13:54:51 oub Exp $
+;; $Id: virtex.el,v 1.8 2005/02/11 19:02:09 oub Exp $
;;; Code:
1.1 XEmacs/packages/xemacs-packages/auctex/etc/jsarticle.el
Index: jsarticle.el
===================================================================
;;; jsarticle.el - Special code for jsarticle style.
;; $Id: jsarticle.el,v 1.1 2005/02/11 19:02:08 oub Exp $
;;; Code:
(TeX-add-style-hook "jsarticle"
(function (lambda ()
(setq LaTeX-largest-level (LaTeX-section-level "section")))))
;;; jsarticle.el ends here
1.1 XEmacs/packages/xemacs-packages/auctex/etc/jsbook.el
Index: jsbook.el
===================================================================
;;; jsbook.el - Special code for jsbook style.
;; $Id: jsbook.el,v 1.1 2005/02/11 19:02:08 oub Exp $
;;; Code:
(TeX-add-style-hook "jsbook"
(function (lambda ()
(setq LaTeX-largest-level (LaTeX-section-level "chapter")))))
;;; jsbook.el ends here
1.3 +51 -16 XEmacs/packages/xemacs-packages/auctex/texi/auctex.texi
Index: auctex.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/texi/auctex.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- auctex.texi 2005/01/18 13:54:54 1.2
+++ auctex.texi 2005/02/11 19:02:14 1.3
＠＠ -19,7 +19,7 ＠＠
＠titlepage
＠title ＠AUCTeX{}
＠subtitle A much enhanced ＠TeX{}/＠LaTeX{} mode for Emacs.
-＠subtitle Version 11.54
+＠subtitle Version 11.55
＠author by Kresten Krab Thorup
＠author updates from 6.1 to 11.13 by Per Abrahamsen
＠＠ -69,7 +69,7 ＠＠
＠AUCTeX{} is an integrated environment for editing ＠LaTeX{} and
＠TeX{} files.
-This file documents ＠AUCTeX{} version 11.54.
+This file documents ＠AUCTeX{} version 11.55.
Although ＠AUCTeX{} contains a large number of features, there are no
reasons to despair. You can continue to write ＠TeX{} and ＠LaTeX{}
＠＠ -108,8 +108,10 ＠＠
＠end ifnottex
+＠ifnothtml
＠shortcontents
＠contents
+＠end ifnothtml
＠menu
* Copying:: Copying
＠＠ -1373,9 +1375,9 ＠＠
Sectioning commands are macros like ＠samp{\chapter} or ＠samp{\section}.
For these commands there are two fontification schemes which may be
-selected by customizing the variable ＠code{font-latex-title-fontity}.
+selected by customizing the variable ＠code{font-latex-title-fontify}.
-＠defopt font-latex-title-fontity
+＠defopt font-latex-title-fontify
Per default sectioning commands will be shown in a larger, proportional
font, which corresponds to the value ＠samp{height} for this variable.
The font size varies with the sectioning level, e.g. ＠samp{\part} will
＠＠ -2526,12 +2528,6 ＠＠
＠cindex ISO 8859 Latin 2
＠cindex Latin 2
＠cindex ANSI
-＠cindex Denmark
-＠cindex Danish
-＠cindex Holland
-＠cindex Dutch
-＠cindex Germany
-＠cindex Poland
First you will need a way to write non-ASCII characters. You can either
use macros, or teach ＠TeX{} about the ISO character sets. I prefer the
＠＠ -2566,13 +2562,14 ＠＠
＠end table
+＠cindex ispell
＠AUCTeX{} supports style files for several languages. Each style file
-may modify some ＠AUCTeX{} to better support the language, and will run
+may modify ＠AUCTeX{} to better support the language, and will run
a language specific hook that will allow you to for example change
ispell dictionary, or run code to change the keyboard remapping. The
following will for example choose a Danish dictionary for documents
-including the ＠file{dk.sty} file. This requires parsing to be enabled,
-＠pxref{Parsing Files}.
+including ＠samp{\usepackage[danish]＠{babel＠}}.
+This requires parsing to be enabled, ＠pxref{Parsing Files}.
＠lisp
(add-hook 'TeX-language-dk-hook
＠＠ -2580,14 +2577,43 ＠＠
＠end lisp
The following style files are recognized.
+＠c In alphabetic order of the hooks:
+＠vindex TeX-language-cz-hook
+＠vindex TeX-language-dk-hook
+＠vindex TeX-language-nl-hook
+＠vindex TeX-language-de-hook
+＠vindex TeX-language-it-hook
+＠vindex TeX-language-pl-hook
+＠vindex TeX-language-sk-hook
+＠vindex TeX-language-sv-hook
+＠cindex Czech
+＠cindex Italy
+＠cindex Denmark
+＠cindex Danish
+＠cindex Holland
+＠cindex Dutch
+＠cindex Germany
+＠cindex Poland
+＠cindex Slovakia
+＠cindex Sweden
＠table ＠file
-＠item dk
-Runs style hook ＠code{TeX-language-dk-hook}.
+＠item czech
+Runs style hook ＠code{TeX-language-cz-hook}. Pressing ＠key{"} will
+insert ＠samp{\uv＠{} and ＠samp{＠}} depending on context.
+
+＠c Is the difference between dk and danish really intented?
+＠item danish
+Runs style hook ＠code{TeX-language-dk-hook}. Pressing ＠key{"} will
+insert ＠samp{"`} and ＠samp{"'} depending on context.
+＠c dk.sty seems to be obsolete, so we don't want to encourage using it.
+＠c ＠item dk
+＠c Runs style hook ＠code{TeX-language-dk-hook}.
＠item dutch
Runs style hook ＠code{TeX-language-nl-hook}.
＠item german
+＠itemx ngerman
Runs style hook ＠code{TeX-language-de-hook}. Gives ＠samp{"} word
syntax, makes the ＠key{"} key insert a literal ＠samp{"}, and pressing it
twice will give you opening or closing german quotes (＠samp{"`} or
＠＠ -2596,7 +2622,8 ＠＠
＠item italian
Runs style hook ＠code{TeX-language-it-hook}. Pressing ＠key{"} will
-insert ＠samp{"<} and ＠samp{">} depending on context.
+insert ＠samp{"<} (＠code{LaTeX-italian-open-quote}) and ＠samp{">}
+(＠code{LaTeX-italian-close-quote}) depending on context.
＠item plfonts
＠itemx plhb
＠＠ -2604,6 +2631,14 ＠＠
Gives ＠samp{"} word syntax and makes the ＠key{"} key insert a literal
＠samp{"}. Pressing ＠key{"} twice will insert ＠samp{"<} or ＠samp{">}
depending on context.
+
+＠item slovak
+Runs style hook ＠code{TeX-language-sk-hook}. Pressing ＠key{"} will
+insert ＠samp{\uv＠{} and ＠samp{＠}} depending on context.
+
+＠item swedish
+Runs style hook ＠code{TeX-language-sv-hook}. Pressing ＠key{"} will
+insert ＠samp{''}.
＠end table
＠node Japanese
1.9 +34 -1 XEmacs/packages/xemacs-packages/auctex/texi/changes.texi
Index: changes.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/texi/changes.texi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- changes.texi 2005/01/18 13:54:54 1.8
+++ changes.texi 2005/02/11 19:02:15 1.9
＠＠ -4,6 +4,39 ＠＠
＠end ifset
+＠heading News in 11.55
+
+＠itemize ＠bullet
+＠item
+A bug was fixed which lead to the insertion of trailing whitespace
+during filling. In particular extra spaces were added to sentence
+endings at the end of lines. You can make this whitespace visible by
+setting the variable ＠code{show-trailing-whitespace} to ＠code{t}. If
+you want to delete all trailing whitespace in a buffer, type ＠kbd{M-x
+delete-trailing-whitespace RET}.
+
+＠item
+A bug was fixed which lead to a ＠samp{*Compile-Log*} buffer popping up
+when the first ＠LaTeX{} file was loaded in an Emacs session.
+
+＠item
+On some systems the presence of an outdated Emacspeak package lead to
+the error message ＠samp{File mode specification error: (error "Variable
+binding depth exceeds max-specpdl-size")}. Precautions were added which
+prevent this error from happening. But nevertheless, it is advised to
+upgrade or uninstall the outdated Emacspeak package.
+
+＠item
+The value of ＠code{TeX-macro-global} is not determined during
+configuration anymore but at load time of ＠AUCTeX{}. Consequently the
+associated configuration option ＠samp{--with-tex-input-dirs} was
+removed.
+
+＠item
+Support for the ＠LaTeX{} Japanese classes ＠samp{jsarticle} and
+＠samp{jsbook} was added.
+＠end itemize
+
＠heading News in 11.54
＠itemize ＠bullet
＠＠ -217,7 +250,7 ＠＠
＠item
Sectioning commands are now shown in a larger font on display devices
which support such fontification. The variable
-＠code{font-latex-title-fontity} can be customized to restore the old
+＠code{font-latex-title-fontify} can be customized to restore the old
appearance, i.e. the usage of a different color instead of a change in
size.
1.6 +2 -15 XEmacs/packages/xemacs-packages/auctex/texi/install.texi
Index: install.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/texi/install.texi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- install.texi 2005/01/18 13:54:55 1.5
+++ install.texi 2005/02/11 19:02:15 1.6
＠＠ -97,7 +97,8 ＠＠
path if necessary.
＠item --with-lispdir=＠var{/dir}
-This tells where to install Emacs Lisp files. Normally, this option is
+This tells where to install the lisp files, note that most of ＠AUCTeX{}
+will be installed in a subdirectory. Normally, this option is
unnecessary, but may be used if you don't like the directory that
configure is suggesting.
＠＠ -113,20 +114,6 ＠＠
(that it cannot write to), causing installation to fail. In that case,
a good value for this option is ＠file{~/.xemacs/xemacs-packages}, as
XEmacs looks there for per-user packages by default.
-
-＠item --with-tex-input-dirs=＠var{"/dir-1/;/dir-2/;...;/dir-N/"}
-This option allows to specify the directories to be used for file
-searches, e.g. for completion of ＠LaTeX{} or Bib＠TeX{} style file names.
-They will be used in the variable ＠code{TeX-macro-global}.
-
-Normally only the subdirectories ＠file{tex/} and ＠file{bibtex/bst/}
-below the used texmf trees should be relevant. Putting the roots of
-texmf trees here is possible but may slow down file searching.
-
-The directories should be separated by semicolons and each has to end
-with a directory separator, i.e. a slash or a backslash respectively.
-If more than one directory is specified or spaces are used in the name
-of a directory the whole string has to be quoted.
＠item --with-auto-dir=＠var{/dir}
You can use this option to specify the directory containing
1.8 +9 -4 XEmacs/packages/xemacs-packages/auctex/texi/tex-ref.tex
Index: tex-ref.tex
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/texi/tex-ref.tex,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tex-ref.tex 2005/01/18 13:54:55 1.7
+++ tex-ref.tex 2005/02/11 19:02:15 1.8
＠＠ -1,5 +1,5 ＠＠
% -*- plain-tex -*-
-% Reference Card for AUCTeX version 11.54
+% Reference Card for AUCTeX version 11.55
%**start of header
\newcount\columnsperpage
＠＠ -40,7 +40,7 ＠＠
% Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
% for creating the GNU Emacs Reference Card from which this was mutated
-\def\versionnumber{11.54}
+\def\versionnumber{11.55}
\def\year{2004}
\def\version{August \year\ v\versionnumber}
＠＠ -328,10 +328,15 ＠＠
\key{Toggle folding mode}{C-c C-o C-f}
\key{Hide all items in buffer}{C-c C-o C-b}
+\key{Hide all items in region}{C-c C-o C-r}
+\key{Hide all items in paragraph}{C-c C-o C-p}
\key{Hide current macro}{C-c C-o C-m}
\key{Hide current environment}{C-c C-o C-e}
-\key{Show all items in buffer permanently}{C-c C-o C-x}
-\key{Show current item permanently}{C-c C-o C-c}
+\key{Show all items in buffer}{C-c C-o b}
+\key{Show all items in region}{C-c C-o r}
+\key{Show all items in paragraph}{C-c C-o p}
+\key{Show current item}{C-c C-o i}
+\key{Hide or show current item}{C-c C-o C-o}
\copyrightnotice
\penalty-9000
1.3 +0 -24 XEmacs/packages/xemacs-packages/auctex/texi/todo.texi
Index: todo.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/texi/todo.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- todo.texi 2005/01/18 13:54:55 1.2
+++ todo.texi 2005/02/11 19:02:15 1.3
＠＠ -141,30 +141,6 ＠＠
Suggest ＠samp{makindex} when appropriate.
＠item
-＠AUCTeX{} should be able to parse ＠LaTeX{}2e ＠file{.cls} files. Here
-are the regexps by ＠samp{<thiemann＠(a)informatik.uni-tuebingen.de>} Peter
-Thiemann.
-
-＠example
- ("\\\\DeclareRobustCommand＠{?\\\\\\([a-zA-Z]+\\)＠}?\\[\\([0-9]+\\)\\]\
-\\[\\([^\]\\\\\n\r]+\\)\\]"
- (1 2 3) LaTeX-auto-optional)
- ("\\\\DeclareRobustCommand＠{?\\\\\\([a-zA-Z]+\\)＠}?\\[\\([0-9]+\\)\\]"
- (1 2) LaTeX-auto-arguments)
- ("\\\\DeclareRobustCommand＠{?\\\\\\([a-zA-Z]+\\)＠}?" 1 TeX-auto-symbol)
- ("\\\\DeclareFixedFont＠{?\\\\\\([a-zA-Z]+\\)＠}?"
- 1 TeX-auto-symbol)
- ("\\\\Declare\\(Text\\|Old\\)FontCommand＠{?\\\\\\([a-zA-Z]+\\)＠}?"
- 2 TeX-auto-symbol)
- ("\\\\DeclareMath\\(Symbol\\|Delimiter\\|Accent\\|Radical\\)＠{?\\\\\\([a-zA-Z]+\\)＠}?"
- 2 TeX-auto-symbol)
- ;;; it is also valid to declare just a single symbol, e.g. <,
- ;;; with \DeclareMathSymbol but it is not necessary to register that here
- ("\\\\DeclareText\\(Command\\|Symbol\\|Accent\\|Composite\\)＠{?\\\\\\([a-zA-Z]+\\)＠}?"
- 2 TeX-auto-symbol)
-＠end example
-
-＠item
Use index files (when available) to speed up ＠kbd{C-c C-m include
＠key{RET}}.
1.3 +0 -10 XEmacs/packages/xemacs-packages/auctex/texi/wininstall.texi
Index: wininstall.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/texi/wininstall.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wininstall.texi 2005/01/18 13:54:55 1.2
+++ wininstall.texi 2005/02/11 19:02:15 1.3
＠＠ -85,16 +85,6 ＠＠
which gives the location of the package directory for XEmacs where stuff
should be installed. Again, hopefully this is not necessary to specify.
-＠item --with-tex-input-dirs=＠var{"/dir-1/;/dir-2/;...;/dir-N/"}
-This option allows to specify the directories to be used for file
-searches, e.g. for completion of LaTeX or BibTeX style file names. They
-will be used in the variable ＠code{TeX-macro-global}.
-
-＠command{configure} will usually figure out the right value for this option
-but will only succeed if it finds the necessary programs of the ＠TeX{}
-system in the system path. Which should be there for running ＠AUCTeX{},
-anyway.
-
＠item --with-auto-dir=＠var{/dir}
Directory containing automatically generated information. You should
not normally need to set this, as ＠samp{--prefix} should take care of
- 1 participants
- 0 comments
CVS update by eric MODIFIED: xemacs/src ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: eric
Date: 05/02/11 16:50:45
Modified: xemacs/src Tag: sjt-xft ChangeLog xft-fonts.c
Log:
throw away original code from xft reloaded #3
Revision Changes Path
No revision
No revision
1.758.2.8 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.758.2.7
retrieving revision 1.758.2.8
diff -u -r1.758.2.7 -r1.758.2.8
--- ChangeLog 2005/02/11 15:39:04 1.758.2.7
+++ ChangeLog 2005/02/11 15:50:40 1.758.2.8
＠＠ -1,5 +1,10 ＠＠
2005-02-11 Eric Knauel <eric(a)xemacs.org>
+ * xft-fonts.c: throw away old code that was wrapped inside
+ comments
+
+2005-02-11 Eric Knauel <eric(a)xemacs.org>
+
* xft-fonts.h: New prototype
* xft-fonts.c (Ffc_name_parse, Ffc_pattern_add, Ffc_pattern_del)
1.1.2.6 +0 -841 XEmacs/xemacs/src/Attic/xft-fonts.c
Index: xft-fonts.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- xft-fonts.c 2005/02/11 15:39:07 1.1.2.5
+++ xft-fonts.c 2005/02/11 15:50:43 1.1.2.6
＠＠ -1106,844 +1106,3 ＠＠
);
Vxlfd_font_name_regexp = make_xlfd_font_regexp();
}
-
-
-/* Original code from xft reloaded #3 */
-/* #### throw this away soon */
-#if 0
-#include "xft-fonts.h"
-
-Lisp_Object Qfc_patternp; /* Do I really have to do this ??? */
-Lisp_Object Qfc_objectsetp;
-Lisp_Object Qfc_fontsetp;
-Lisp_Object Qfc_result_no_match; /* XftResultNoMatch */
-Lisp_Object Qfc_result_no_id; /* XftResultNoId */
-Lisp_Object Qfc_internal_error;
-Lisp_Object Qfc_unimplemented;
-Lisp_Object Vxft_xlfd_font_regexp;
-
-Lisp_Object Vxft_version;
-
-static const struct memory_description xftpattern_description [] = {
- { XD_LISP_OBJECT, offsetof (struct fc_pattern, fontset) },
- { XD_END }
-};
-
-DEFINE_LRECORD_IMPLEMENTATION("xft-pattern", fc_pattern,
- 0, 0, 0, 0, 0, 0,
- xftpattern_description,
- struct fc_pattern);
-
-static const struct memory_description xftobjset_description [] = {
- { XD_END }
-};
-
-DEFINE_LRECORD_IMPLEMENTATION("xft-objectset", fc_objectset,
- 0, 0, 0, 0, 0, 0,
- xftobjset_description,
- struct fc_objectset);
-
-static const struct memory_description xftfontset_description [] = {
- { XD_END }
-};
-
-DEFINE_LRECORD_IMPLEMENTATION("xft-fontset", fc_fontset,
- 0, 0, 0, 0, 0, 0,
- xftfontset_description,
- struct fc_fontset);
-
-DEFUN("xft-pattern-p", Fxft_pattern_p, 1, 1, 0, /*
-Returns t if OBJECT is of type xft-pattern, nil otherwise.
- */
- (object))
-{
- return XFTPATTERNP(object) ? Qt : Qnil;
-}
-
-DEFUN("xft-objectset-p", Fxft_objectset_p, 1, 1, 0, /*
-Returns t if OBJECT is of type xft-objectset, nil otherwise.
- */
- (object))
-{
- return XFTOBJECTSETP(object) ? Qt : Qnil;
-}
-
-DEFUN("xft-fontset-p", Fxft_fontset_p, 1, 1, 0, /*
-Returns t if OBJECT is of type xft-fontset, nil otherwise.
- */
- (object))
-{
- return XFTFONTSETP(object) ? Qt : Qnil;
-}
-
-DEFUN("xft-pattern-create", Fxft_pattern_create, 0, 0, 0, /*
- Create a fresh and empty xft-pattern object.
- */
- ())
-{
- fc_pattern *xftpat =
- alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern);
-
- xftpat->xftpatPtr = XftPatternCreate();
- xftpat->fontset = Qnil;
- return wrap_fcpattern(xftpat);
-}
-
-DEFUN("xft-name-parse", Fxft_name_parse, 1, 1, 0, /*
-Parse an Xft font name an return its representation as a xft pattern object.
- */
- (name))
-{
- struct fc_pattern *xftpat =
- alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern);
-
- CHECK_STRING(name);
-
- xftpat->xftpatPtr = XftNameParse(XSTRING_DATA(name));
- xftpat->fontset = Qnil;
- return wrap_fcpattern(xftpat);
-}
-
-DEFUN("xft-name-unparse", Fxft_name_unparse, 1, 1, 0, /*
-Unparse an xft pattern object to a string.
- */
- (xftpat))
- {
- char temp[XFTSTRLEN];
- Bool res;
-
- CHECK_XFTPATTERN(xftpat);
- res = XftNameUnparse(XXFTPATTERN(xftpat)->xftpatPtr, temp, XFTSTRLEN-1);
- return res ? make_string(temp, strlen(temp)) : Qnil;
- }
-
-DEFUN("xft-pattern-duplicate", Fxft_pattern_duplicate, 1, 1, 0, /*
-Make a copy of the xft pattern object XFTPAT an return it.
- */
- (xftpat))
-{
- struct fc_pattern *copy = NULL;
- CHECK_XFTPATTERN(xftpat);
-
- copy = alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern);
- copy->xftpatPtr = XftPatternDuplicate(XXFTPATTERN(xftpat)->xftpatPtr);
- XXFTPATTERN(xftpat)->fontset = Qnil;
- return wrap_fcpattern(copy);
-}
-
-DEFUN("xft-pattern-add", Fxft_pattern_add, 3, 3, 0, /*
-Add attributes to the xft pattern object XFTPAT. OBJECT is the name
-of the attribute to add, VALUE the value for this attribute.
- */
- (xftpat, object, value))
-{
- Bool res;
-
- CHECK_XFTPATTERN(xftpat);
- CHECK_STRING(object);
-
- if (STRINGP(value))
- {
- res = XftPatternAddString(XXFTPATTERN(xftpat)->xftpatPtr,
- XSTRING_DATA(object),
- XSTRING_DATA(value));
- return res ? Qt : Qnil;
- }
-
- if (INTP(value))
- {
- res = XftPatternAddInteger(XXFTPATTERN(xftpat)->xftpatPtr,
- XSTRING_DATA(object),
- XINT(value));
- return res ? Qt : Qnil;
- }
-
- if (FLOATP(value))
- {
- res = XftPatternAddDouble(XXFTPATTERN(xftpat)->xftpatPtr,
- XSTRING_DATA(object),
- (double) XFLOAT_DATA(value));
- return res ? Qt : Qnil;
- }
-
- if (SYMBOLP(value))
- {
- res = XftPatternAddBool(XXFTPATTERN(xftpat)->xftpatPtr,
- XSTRING_DATA(object),
- !NILP(value));
- return res ? Qt : Qnil;
- }
-
- return Qnil;
-}
-
-DEFUN("xft-pattern-del", Fxft_pattern_del, 2, 2, 0, /*
-Remove attribute OBJECT from xft pattern object OBJECT.
- */
- (xftpat, object))
-{
- Bool res;
-
- CHECK_XFTPATTERN(xftpat);
- CHECK_STRING(object);
-
- res = XftPatternDel(XXFTPATTERN(xftpat)->xftpatPtr, XSTRING_DATA(object));
- return res ? Qt : Qnil;
-}
-
-/****************************************************************************
- * generic property access for Lisp Xft pattern objects *
- ****************************************************************************/
-
-/* primitives for XftPatternGet() -- returning strings */
-static Lisp_Object
-xft_get_pattern_string(Lisp_Object xftpat, Lisp_Object id, const char* objid)
-{
- char *temp;
- XftResult res;
-
- CHECK_XFTPATTERN(xftpat);
-
- res = XftPatternGetString(XXFTPATTERN(xftpat)->xftpatPtr,
- objid, XINT(id), &temp);
- switch (res) {
- case XE_XFT_RESULT_MATCH:
- return make_string(temp, strlen(temp));
- case XE_XFT_RESULT_NOMATCH:
- return Qfc_result_no_match;
- case XE_XFT_RESULT_NOID:
- return Qfc_result_no_id;
- default:
- return Qfc_internal_error;
- }
-}
-
-/* primitives for XftPatternGet() -- returning doubles */
-static Lisp_Object
-xft_get_pattern_double(Lisp_Object xftpat, Lisp_Object id, const char* objid)
-{
- double d;
- XftResult res;
-
- CHECK_XFTPATTERN(xftpat);
- CHECK_INT(id);
-
-#if XFT_VERSION > 1
- res = FcPatternGetDouble(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &d);
-#else
- res = XftPatternGetDouble(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &d);
-#endif
-
- switch (res) {
- case XE_XFT_RESULT_MATCH:
- return make_float(d);
- case XE_XFT_RESULT_NOMATCH:
- return Qfc_result_no_match;
- case XE_XFT_RESULT_NOID:
- return Qfc_result_no_id;
- default:
- return Qfc_internal_error;
- }
-}
-
-/* primitives for XftPatternGet() -- returning integers */
-static Lisp_Object
-xft_get_pattern_integer(Lisp_Object xftpat, Lisp_Object id, const char* objid)
-{
- int i;
- XftResult res;
-
- CHECK_XFTPATTERN(xftpat);
- CHECK_INT(id);
-
-#if XFT_VERSION > 1
- res = FcPatternGetInteger(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &i);
-#else
- res = XftPatternGetInteger(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &i);
-#endif
-
- switch (res) {
- case XE_XFT_RESULT_MATCH:
- return make_int(i);
- case XE_XFT_RESULT_NOMATCH:
- return Qfc_result_no_match;
- case XE_XFT_RESULT_NOID:
- return Qfc_result_no_id;
- default:
- return Qfc_internal_error;
- }
-}
-
-/* primitives for XftPatternGet() -- returning bools */
-static Lisp_Object
-xft_get_pattern_bool(Lisp_Object xftpat, Lisp_Object id, const char* objid)
-{
- Bool b;
- XftResult res;
-
- CHECK_XFTPATTERN(xftpat);
- CHECK_INT(id);
-
- res = XftPatternGetBool(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &b);
- switch (res) {
- case XE_XFT_RESULT_MATCH:
- return b ? Qt : Qnil;
- case XE_XFT_RESULT_NOMATCH:
- return Qfc_result_no_match;
- case XE_XFT_RESULT_NOID:
- return Qfc_result_no_id;
- default:
- /* FIXME */
- return Fsignal(Qwrong_type_argument, Qnil);
- }
-}
-
-enum xft_pattern_get_return_type {
- XE_XFT_INVALID,
- XE_XFT_UNIMPLEMENTED,
- XE_XFT_STRING,
- XE_XFT_DOUBLE,
- XE_XFT_INTEGER,
- XE_XFT_BOOLEAN
-};
-
-struct xft_pattern_property {
- char *name;
- Lisp_Object symbol;
- enum xft_pattern_get_return_type type;
-};
-
-/* #### should these be updated for use of fontconfig? */
-static struct xft_pattern_property xft_pattern_property_tbl [] = {
- { XFT_FAMILY, (Lisp_Object) 0, XE_XFT_STRING },
- { XFT_STYLE, (Lisp_Object) 0, XE_XFT_STRING },
-#if XFT_VERSION < 2
- { XFT_ENCODING, (Lisp_Object) 0, XE_XFT_STRING },
-#else
- { XFT_ENCODING, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED },
-#endif
- { XFT_FOUNDRY, (Lisp_Object) 0, XE_XFT_STRING },
- { XFT_XLFD, (Lisp_Object) 0, XE_XFT_STRING },
- { XFT_FILE, (Lisp_Object) 0, XE_XFT_STRING },
- { XFT_RASTERIZER, (Lisp_Object) 0, XE_XFT_STRING },
- { XFT_SIZE, (Lisp_Object) 0, XE_XFT_DOUBLE },
- { XFT_PIXEL_SIZE, (Lisp_Object) 0, XE_XFT_DOUBLE },
- { XFT_SCALE, (Lisp_Object) 0, XE_XFT_DOUBLE },
- { XFT_DPI, (Lisp_Object) 0, XE_XFT_DOUBLE },
- { XFT_SLANT, (Lisp_Object) 0, XE_XFT_INTEGER },
- { XFT_WEIGHT, (Lisp_Object) 0, XE_XFT_INTEGER },
- { XFT_SPACING, (Lisp_Object) 0, XE_XFT_INTEGER },
- { XFT_INDEX, (Lisp_Object) 0, XE_XFT_INTEGER },
- { XFT_RGBA, (Lisp_Object) 0, XE_XFT_INTEGER },
-#if XFT_VERSION < 2
- { XFT_CHAR_WIDTH, (Lisp_Object) 0, XE_XFT_INTEGER },
- { XFT_CHAR_HEIGHT,(Lisp_Object) 0, XE_XFT_INTEGER },
- { XFT_CORE, (Lisp_Object) 0, XE_XFT_BOOLEAN },
-#else
- { XFT_CHAR_WIDTH, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED },
- { XFT_CHAR_HEIGHT,(Lisp_Object) 0, XE_XFT_UNIMPLEMENTED },
- { XFT_CORE, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED },
-#endif
- { XFT_ANTIALIAS, (Lisp_Object) 0, XE_XFT_BOOLEAN },
- { XFT_OUTLINE, (Lisp_Object) 0, XE_XFT_BOOLEAN },
- { XFT_SCALABLE, (Lisp_Object) 0, XE_XFT_BOOLEAN },
-#if XFT_VERSION < 2
- { XFT_RENDER, (Lisp_Object) 0, XE_XFT_BOOLEAN },
-#else
- { XFT_RENDER, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED },
-#endif
- { XFT_MINSPACE, (Lisp_Object) 0, XE_XFT_BOOLEAN },
- { NULL, (Lisp_Object) 0, XE_XFT_INVALID }
-};
-
-static char *xft_pattern_property_names[] = {
- "family", "style", "encoding", "foundry", "xlfd", "file", "rasterizer",
- "size", "pixelsize", "scale", "dpi", "slant", "weight", "spacing",
- "index", "rgba", "charwidth", "charheight", "core", "antialias",
- "outline", "scalable", "render", "minspace", NULL};
-
-DEFUN("xft-pattern-get", Fxft_pattern_get, 3, 3, 0, /*
-Return Xft pattern object XFTPAT's value in slot ID of PROPERTY.
-
-Normal returns are strings, floats, integers, or Boolean values, depending
-on the property.
-
-Error codes are symbols: `x-xft-result-no-match' if there is no such
-attribute associated with XFTPAT, `x-xft-result-no-id' if there is no
-value with number ID for this attribute, or `x-xft-internal-error' if
-Xft returns an unexpected value. (The value `x-xft-unimplemented' may
-be added for properties not implemented in all versions of Xft.)
-
-Implemented properties and their types are:
-
- family string
- style string
- encoding string (Xft1 only)
- foundry string
- xlfd string
- file string
- rasterizer string
- size double
- pixelsize double
- scale double
- dpi double
- slant integer
- weight integer
- spacing integer
- index integer
- rgba integer
- charwidth integer (Xft1 only)
- charheight integer (Xft1 only)
- core boolean (Xft1 only)
- antialias boolean
- outline boolean
- scalable boolean
- render boolean (Xft1 only)
- minspace boolean" */
- (xftpat, id, property))
-{
- struct xft_pattern_property *tbl;
- char *str = "Xft pattern property";
- int i;
-
- CHECK_XFTPATTERN(xftpat);
- CHECK_INT(id);
- CHECK_SYMBOL(property);
-
- /* FIXME: move me to a better place!!! */
- for (i = 0; xft_pattern_property_names[i] != NULL; i++)
- xft_pattern_property_tbl[i].symbol =
- Fintern(make_string(xft_pattern_property_names[i], strlen(xft_pattern_property_names[i])), Qnil);
-
- for (tbl = &xft_pattern_property_tbl[0]; tbl->type != XE_XFT_INVALID; tbl++)
- {
- assert (tbl - xft_pattern_property_tbl
- < (ptrdiff_t) (sizeof(xft_pattern_property_tbl)
- / sizeof(struct xft_pattern_property)));
- if (EQ(tbl->symbol,property)) break;
- }
-
- switch (tbl->type) {
- case XE_XFT_STRING:
- return xft_get_pattern_string (xftpat, id, tbl->name);
- case XE_XFT_DOUBLE:
- return xft_get_pattern_double (xftpat, id, tbl->name);
- case XE_XFT_INTEGER:
- return xft_get_pattern_integer (xftpat, id, tbl->name);
- case XE_XFT_BOOLEAN:
- return xft_get_pattern_bool (xftpat, id, tbl->name);
- case XE_XFT_UNIMPLEMENTED:
- return Qfc_unimplemented;
- default:
- args_out_of_range (make_string (str, sizeof(str)), property);
- }
-}
-
-DEFUN("xft-pattern-destroy", Fxft_pattern_destroy, 1, 1, 0, /*
-This function is used internally to deallocate a xft pattern
-object. */
- (xftpat))
-{
- CHECK_XFTPATTERN(xftpat);
- XXFTPATTERN(xftpat)->fontset = Qnil;
-
- XftPatternDestroy(XXFTPATTERN(xftpat)->xftpatPtr);
- return Qnil;
-}
-
-DEFUN("xft-font-match", Fxft_font_match, 2, 2, 0, /*
-Check whether there are fonts available that match the xft pattern
-XFTPAT. DEVICE is X Windows device. Returns a xft pattern object
-representing the closest match to the given pattern or an error
-code. Error codes are `x-xft-result-no-match' and
-`x-xft-result-no-id'. */
- (device, xftpat))
-{
- Display *dpy;
- XftResult res;
-
- struct fc_pattern *res_xftpat =
- alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern);
-
- CHECK_XFTPATTERN(xftpat);
- if (NILP(device))
- return Qnil;
- CHECK_X_DEVICE(device);
- if (!DEVICE_LIVE_P(XDEVICE(device)))
- return Qnil;
-
- res_xftpat->fontset = Qnil;
- dpy = DEVICE_X_DISPLAY(XDEVICE(device));
- res_xftpat->xftpatPtr = XftFontMatch(dpy, DefaultScreen (dpy),
- XXFTPATTERN(xftpat)->xftpatPtr,
- &res);
-
- if (res_xftpat->xftpatPtr == NULL)
- switch (res) {
- case XE_XFT_RESULT_NOMATCH:
- return Qfc_result_no_match;
- case XE_XFT_RESULT_NOID:
- return Qfc_result_no_id;
- default:
- return Qfc_internal_error;
- }
- else
- return wrap_fcpattern(res_xftpat);
-}
-
-DEFUN("xft-objectset-create", Fxft_objectset_create, 0, 0, 0, /*
-Create a fresh and empty xft object set object. */
- ())
-{
- struct fc_objectset *objset =
- alloc_lcrecord_type(struct fc_objectset, &lrecord_fc_objectset);
-
- objset->objsetPtr = XftObjectSetCreate();
- return wrap_fcobjset(objset);
-}
-
-DEFUN("xft-objectset-add", Fxft_objectset_add, 2, 2, 0, /*
-Add OBJECT (a string) to the xft object set XFTOBJECTSET. Returns t on
-success, nil on failure. */
- (xftobjset, object))
-{
- Bool r;
-
- CHECK_XFTOBJECTSET(xftobjset);
- CHECK_STRING(object);
-
- r = XftObjectSetAdd(XXFTOBJECTSET(xftobjset)->objsetPtr,
- XSTRING_DATA(object));
- return r ? Qt : Qnil;
-}
-
-DEFUN("xft-objectset-destroy", Fxft_objectset_destroy, 1, 1, 0, /*
-Used internally to deallocate xft objectset objects. */
- (xftobjset))
-{
- CHECK_XFTOBJECTSET(xftobjset);
-
- XftObjectSetDestroy(XXFTOBJECTSET(xftobjset)->objsetPtr);
- return Qnil;
-}
-
-DEFUN("xft-list-fonts-pattern-objects", Fxft_list_fonts_pattern_objects,
- 3, 3, 0, /*
-Given a xft pattern object XFTPAT, a xft object set object XFTOBJSET
-and an X Windows device find all fonts that match XFTPAT. The result
-is a xft fontset object. */
- (device, xftpat, xftobjset))
-{
- Display *dpy;
- int screen;
- struct fc_fontset *fontset =
- alloc_lcrecord_type(struct fc_fontset, &lrecord_fc_fontset);
-
-#if XFT_VERSION > 1
- FcConfig *fcc;
-#endif
-
- CHECK_XFTPATTERN(xftpat);
- CHECK_XFTOBJECTSET(xftobjset);
- if (NILP(device))
- return Qnil;
- CHECK_X_DEVICE(device);
- if (!DEVICE_LIVE_P(XDEVICE(device)))
- return Qnil;
-
-#if XFT_VERSION > 1
- FcInit();
- fcc = FcConfigGetCurrent();
-
- fontset->fontsetPtr =
- FcFontList(fcc,
- XXFTPATTERN(xftpat)->xftpatPtr,
- XXFTOBJECTSET(xftobjset)->objsetPtr);
-#else
- dpy = DEVICE_X_DISPLAY(XDEVICE(device));
- screen = DefaultScreen(dpy);
-
- fontset->fontsetPtr =
- XftListFontsPatternObjects(dpy, screen,
- XXFTPATTERN(xftpat)->xftpatPtr,
- XXFTOBJECTSET(xftobjset)->objsetPtr);
-#endif
- return wrap_fcfontset(fontset);
-}
-
-DEFUN("xft-fontset-count", Fxft_fontset_count, 1, 1, 0, /*
-Counts the number of xft pattern objects stored in the xft fontset
-object XFTFONTSET. */
- (xftfontset))
-{
- CHECK_XFTFONTSET(xftfontset);
- return make_int(XXFTFONTSET(xftfontset)->fontsetPtr->nfont);
-}
-
-DEFUN("xft-fontset-ref", Fxft_fontset_ref, 2, 2, 0, /*
-Return the xft pattern object at index I in xft fontset object
-XFTFONTSET. Return nil if the index exceeds the bounds of
-XFTFONTSET. */
- (xftfontset, i))
-{
- int idx;
- fc_pattern *xftpat =
- alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern);
-
- CHECK_XFTFONTSET(xftfontset);
- CHECK_INT(i);
-
- idx = XINT(i);
- if ((idx >= 0) && (idx < XXFTFONTSET(xftfontset)->fontsetPtr->nfont))
- {
- xftpat->xftpatPtr = XXFTFONTSET(xftfontset)->fontsetPtr->fonts[idx];
- xftpat->fontset = xftfontset;
- return wrap_fcpattern(xftpat);
- }
- else
- return Qnil;
-}
-
-DEFUN("xft-fontset-destroy", Fxft_fontset_destroy, 1, 1, 0, /*
-Used internally to deallocate xft fontset objects. */
- (xftfontset))
-{
- CHECK_XFTFONTSET(xftfontset);
-
- XftFontSetDestroy(XXFTFONTSET(xftfontset)->fontsetPtr);
- return Qnil;
-}
-
-DEFUN("xft-font-real-pattern", Fxft_font_real_pattern, 2, 2, 0, /*
-Open the fontname (a string) FONTNAME testwise an return the actual
-xft pattern matched by the Xft library. */
- (fontname, xdevice))
-{
- XftPattern *copy;
- Display *dpy;
- XftFont *font;
- struct fc_pattern *xftpat =
- alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern);
-
- CHECK_STRING (fontname);
- if (NILP(xdevice))
- return Qnil;
- CHECK_X_DEVICE (xdevice);
- if (!DEVICE_LIVE_P(XDEVICE(xdevice)))
- return Qnil;
-
- dpy = DEVICE_X_DISPLAY (XDEVICE (xdevice));
- font = XftFontOpenName (dpy, DefaultScreen(dpy),
- XSTRING_DATA(fontname));
- if (font == NULL)
- return Qnil;
- copy = XftPatternDuplicate(font->pattern);
- XftFontClose(dpy, font);
- if (copy == NULL)
- return Qnil;
- xftpat->xftpatPtr = copy;
- xftpat->fontset = Qnil;
- return wrap_fcpattern(xftpat);
-}
-
-
-DEFUN("xft-xlfd-font-name-p", Fxft_xlfd_font_name_p, 1, 1, 0, /*
-Check whether the string FONTNAME is a XLFD font name. */
- (fontname))
-{
- CHECK_STRING(fontname);
- return Fstring_match(Vxft_xlfd_font_regexp, fontname, Qnil, Qnil);
-}
-
-Lisp_Object make_xlfd_font_regexp (void)
-{
- struct gcpro gcpro1;
- int i;
- Lisp_Object reg = Qnil;
- const char re[XFT_XLFD_RE_COUNT][XFTSTRLEN] =
- { XFT_XLFD_RE_PREFIX,
- XFT_XLFD_RE_FOUNDRY,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_FAMILY,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_WEIGHT,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_SLANT,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_SWIDTH,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_ADSTYLE,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_PIXELSIZE,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_POINTSIZE,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_RESX,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_RESY,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_SPACING,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_AVGWIDTH,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_REGISTRY,
- XFT_XLFD_RE_MINUS,
- XFT_XLFD_RE_ENCODING
- };
-
- GCPRO1 (reg);
- for (i = 0; i <= XFT_XLFD_RE_COUNT; i++)
- reg = concat2(reg, make_string(re[i], strlen((char *) re[i])));
-
- RETURN_UNGCPRO (reg);
-}
-
-/* for debugging purposes only */
-DEFUN("xft-pattern-print", Fxft_pattern_print, 1, 1, 0, /*
-Print a xft pattern object to stdout. For debugging only. */
- (xftpat))
-{
- CHECK_XFTPATTERN(xftpat);
-
-#if XFT_VERSION > 1
- FcPatternPrint(XXFTPATTERN(xftpat)->xftpatPtr);
-#else
- XftPatternPrint(XXFTPATTERN(xftpat)->xftpatPtr);
-#endif
- return Qnil;
-}
-
-/* #### NB the guts of this have moved to lwlib-fonts.c */
-/* helper function to correctly open Xft/core fonts by name */
-XftFont*
-xft_font_open_name (Display *dpy, char *name)
-{
- XftFont *res;
-
- if (NILP (Fxft_xlfd_font_name_p (make_string (name, strlen (name)))))
- res = XftFontOpenName (dpy, DefaultScreen (dpy), name);
- else
- {
- XftPattern *pat = XftPatternCreate ();
- /* This is the magic pattern to open core fonts ... */
- /* Dudes, I love Xft!!! */
- XftPatternAddString (pat, XFT_XLFD, name);
- XftPatternAddBool (pat, XFT_CORE, True);
- XftPatternAddBool (pat, XFT_SCALABLE, False);
- res = XftFontOpenPattern (dpy, pat);
- }
-
- if (res)
- return res;
- else
- {
- /* this is out last try ... */
- res = XftFontOpenName (dpy, DefaultScreen (dpy), "");
-
- if (res)
- return res;
- else
- {
- /* sorry folks ... */
- abort ();
- return 0;
- }
- }
-}
-
-/* color conversion to xft colors */
-/* XXX: is this the right place */
-#define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \
- ? ((unsigned long) (x)) : ((unsigned long) (y)))
-
-XftColor
-xft_convert_color (Display *dpy, Colormap cmap, int c, int dim)
-{
- static XColor color;
- XftColor result;
-
- color.pixel = c;
- XQueryColor(dpy, cmap, &color);
-
- if (dim)
- {
- Screen *screen = DefaultScreenOfDisplay (dpy); /* XXX */
- Visual *visual = DefaultVisualOfScreen (screen);
- color.red = MINL (65535, color.red * 1.5);
- color.green = MINL (65535, color.green * 1.5);
- color.blue = MINL (65535, color.blue * 1.5);
- x_allocate_nearest_color (dpy, cmap, visual, &color);
- }
-
- result.pixel = color.pixel;
- result.color.red = color.red;
- result.color.green = color.green;
- result.color.blue = color.blue;
- result.color.alpha = 0xffff;
-
- return result;
-}
-
-XftColor
-xft_get_color (Display *dpy, Colormap cmap, Lisp_Object c, int dim)
-{
- if (COLOR_INSTANCEP (c))
- return COLOR_INSTANCE_FC_COLOR (XCOLOR_INSTANCE (c));
- else
- return xft_convert_color (dpy, cmap, XINT (c), dim);
-}
-
-void
-syms_of_xft_fonts (void)
-{
- INIT_LRECORD_IMPLEMENTATION(fc_pattern);
- INIT_LRECORD_IMPLEMENTATION(fc_objectset);
- INIT_LRECORD_IMPLEMENTATION(fc_fontset);
-
- DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_patternp);
- DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_objectsetp);
- DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_fontsetp);
-
- DEFSYMBOL(Qfc_result_no_match);
- DEFSYMBOL(Qfc_result_no_id);
- DEFSYMBOL(Qfc_internal_error);
- DEFSYMBOL(Qfc_unimplemented);
-
- DEFSUBR(Fxft_pattern_p);
- DEFSUBR(Fxft_objectset_p);
- DEFSUBR(Fxft_fontset_p);
- DEFSUBR(Fxft_pattern_create);
- DEFSUBR(Fxft_name_parse);
- DEFSUBR(Fxft_name_unparse);
- DEFSUBR(Fxft_pattern_duplicate);
- DEFSUBR(Fxft_pattern_add);
- DEFSUBR(Fxft_pattern_del);
- DEFSUBR(Fxft_pattern_get);
- DEFSUBR(Fxft_pattern_destroy);
- DEFSUBR(Fxft_objectset_create);
- DEFSUBR(Fxft_objectset_add);
- DEFSUBR(Fxft_objectset_destroy);
- DEFSUBR(Fxft_list_fonts_pattern_objects);
- DEFSUBR(Fxft_fontset_count);
- DEFSUBR(Fxft_fontset_ref);
- DEFSUBR(Fxft_fontset_destroy);
- DEFSUBR(Fxft_font_match);
- DEFSUBR(Fxft_font_real_pattern);
- DEFSUBR(Fxft_pattern_print);
- DEFSUBR(Fxft_xlfd_font_name_p);
-}
-
-void
-vars_of_xft_fonts (void)
-{
- DEFVAR_LISP("xft-xlfd-font-regexp", &Vxft_xlfd_font_regexp /*
-The regular expression used to match XLFD font names. */
- );
- Vxft_xlfd_font_regexp = make_xlfd_font_regexp();
-
- DEFVAR_LISP("xft-version", &Vxft_version /*
-The major version number of the Xft library being used */
- );
- Vxft_version = make_int(XFT_VERSION);
-}
-#endif
- 1 participants
- 0 comments
CVS update by eric MODIFIED: xemacs/src ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: eric
Date: 05/02/11 16:39:12
Modified: xemacs/src Tag: sjt-xft ChangeLog xft-fonts.c xft-fonts.h
Log:
encode fontconfig property and fontnames as Qnative
Revision Changes Path
No revision
No revision
1.758.2.7 +9 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.758.2.6
retrieving revision 1.758.2.7
diff -u -r1.758.2.6 -r1.758.2.7
--- ChangeLog 2005/02/09 12:53:01 1.758.2.6
+++ ChangeLog 2005/02/11 15:39:04 1.758.2.7
＠＠ -1,3 +1,12 ＠＠
+2005-02-11 Eric Knauel <eric(a)xemacs.org>
+
+ * xft-fonts.h: New prototype
+
+ * xft-fonts.c (Ffc_name_parse, Ffc_pattern_add, Ffc_pattern_del)
+ (Ffc_pattern_get, fc_font_real_pattern)
+ (string_list_to_fcobjectset): Use extract_fcapi_string()
+ (extract_fcapi_string): New function
+
2005-02-09 Eric Knauel <eric(a)xemacs.org>
* xft-fonts.c (string_list_to_fcobjectset): Use loop macro instead
1.1.2.5 +24 -10 XEmacs/xemacs/src/Attic/xft-fonts.c
Index: xft-fonts.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- xft-fonts.c 2005/02/09 12:53:04 1.1.2.4
+++ xft-fonts.c 2005/02/11 15:39:07 1.1.2.5
＠＠ -139,7 +139,7 ＠＠
CHECK_STRING(name);
- fcpat->fcpatPtr = FcNameParse(XSTRING_DATA(name));
+ fcpat->fcpatPtr = FcNameParse (extract_fcapi_string (name));
fcpat->fontset = Qnil;
return wrap_fcpattern(fcpat);
}
＠＠ -186,14 +186,14 ＠＠
if (STRINGP(value))
{
res = FcPatternAddString (XFCPATTERN_PTR(fcpat),
- XSTRING_DATA(object),
- (FcChar8 *) XSTRING_DATA(value));
+ extract_fcapi_string (object),
+ (FcChar8 *) extract_fcapi_string (value));
return res ? Qt : Qnil;
}
if (INTP(value))
{
res = FcPatternAddInteger (XFCPATTERN_PTR(fcpat),
- XSTRING_DATA(object),
+ extract_fcapi_string (object),
XINT(value));
return res ? Qt : Qnil;
}
＠＠ -201,7 +201,7 ＠＠
if (FLOATP(value))
{
res = FcPatternAddDouble (XFCPATTERN_PTR(fcpat),
- XSTRING_DATA(object),
+ extract_fcapi_string (object),
(double) XFLOAT_DATA(value));
return res ? Qt : Qnil;
}
＠＠ -209,7 +209,7 ＠＠
if (SYMBOLP(value))
{
res = FcPatternAddBool (XFCPATTERN_PTR(fcpat),
- XSTRING_DATA(object),
+ extract_fcapi_string (object),
!NILP(value));
return res ? Qt : Qnil;
}
＠＠ -227,7 +227,8 ＠＠
CHECK_FCPATTERN(fcpat);
CHECK_STRING(object);
- res = FcPatternDel(XFCPATTERN_PTR(fcpat), XSTRING_DATA(object));
+ res = FcPatternDel(XFCPATTERN_PTR(fcpat),
+ extract_fcapi_string (object));
return res ? Qt : Qnil;
}
＠＠ -326,7 +327,7 ＠＠
if (STRINGP (property))
{
/* #### need to Mule-ize */
- fc_property = (FcChar8 *) XSTRING_DATA (property);
+ fc_property = (FcChar8 *) extract_fcapi_string (property);
}
else
{
＠＠ -840,7 +841,7 ＠＠
dpy = DEVICE_X_DISPLAY (XDEVICE (xdevice));
font = XftFontOpenName (dpy, DefaultScreen(dpy),
- XSTRING_DATA(fontname));
+ extract_fcapi_string (fontname));
if (font == NULL)
return Qnil;
copy = FcPatternDuplicate(font->pattern);
＠＠ -1006,8 +1007,21 ＠＠
EXTERNAL_LIST_LOOP_2 (elt, list)
{
CHECK_STRING (elt);
- FcObjectSetAdd (os, XSTRING_DATA (elt));
+ FcObjectSetAdd (os, extract_fcapi_string (elt));
}
+}
+
+/*
+ extract the C representation of the Lisp string STR and convert it
+ to the encoding used by the Fontconfig API for property and font
+ names. I suppose that Qnative is the right encoding, the manual
+ doesn't say much about this topic. This functions assumes that STR
+ is a Lisp string.
+*/
+inline static char *
+extract_fcapi_string (Lisp_Object str)
+{
+ return NEW_LISP_STRING_TO_EXTERNAL (str, Qnative);
}
void
1.1.2.4 +3 -0 XEmacs/xemacs/src/Attic/xft-fonts.h
Index: xft-fonts.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- xft-fonts.h 2005/02/04 16:05:38 1.1.2.3
+++ xft-fonts.h 2005/02/11 15:39:08 1.1.2.4
＠＠ -93,4 +93,7 ＠＠
static void
string_list_to_fcobjectset (Lisp_Object, FcObjectSet*);
+inline static char *
+extract_fcapi_string (Lisp_Object str);
+
#endif /* INCLUDED_xft_fonts_h_ */
- 1 participants
- 0 comments
CVS update by malcolmp MODIFIED: xemacs ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: malcolmp
Date: 05/02/11 13:19:55
Modified: xemacs Tag: sjt-xft ChangeLog configure configure.ac
Log:
configure.ac: Added keyword option support and converted command line args.
Revision Changes Path
No revision
No revision
1.418.2.6 +7 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.418.2.5
retrieving revision 1.418.2.6
diff -u -r1.418.2.5 -r1.418.2.6
--- ChangeLog 2005/02/09 03:40:18 1.418.2.5
+++ ChangeLog 2005/02/11 12:19:31 1.418.2.6
＠＠ -1,3 +1,10 ＠＠
+2005-02-11 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * configure.ac: Added keyword option support. Converted database,
+ sound, athena, xim, bignum, error-checking, menubars, scrollbars,
+ dialogs and widgets command line arguments to use keyword option
+ and complex option macros.
+
2005-02-09 Malcolm Purvis <malcolmp(a)xemacs.org>
* configure.ac (XE_COMPLEX_OPTION):
1.232.2.5 +348 -264 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.232.2.4
retrieving revision 1.232.2.5
diff -u -r1.232.2.4 -r1.232.2.5
--- configure 2005/02/09 03:40:18 1.232.2.4
+++ configure 2005/02/11 12:19:31 1.232.2.5
＠＠ -1110,7 +1110,6 ＠＠
--with-system-malloc Use the system malloc, not the one distributed with
XEmacs.
--with-athena Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).
- --with-xim
--with-mail-locking Specify the locking to be used by movemail to
prevent concurrent updates of mail spool files.
Valid types are `lockf', `flock', `dot', `locking'
＠＠ -1658,6 +1657,7 ＠＠
+
MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$extra_verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR lib-src" && if test "$extra_verbose" = "yes"; then echo " Appending \"lib-src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
with_dragndrop_default="no"
＠＠ -1818,7 +1818,6 ＠＠
-
with_xft_types="emacs menubars tabs gauges"
with_xft_default="emacs,menubars,tabs,gauges"
＠＠ -1869,7 +1868,6 ＠＠
fi;
-
if test \( "$with_xft_menubars" = "yes" -o "$with_xft_tabs" = "yes" \
-o "$with_xft_gauges" = "yes" \) -a "$with_xft_emacs" = "no"; then
{ echo "$as_me:$LINENO: WARNING: Forcing --with-xft=emacs because Xft is enabled" >&5
＠＠ -2305,112 +2303,177 ＠＠
#Enable code.
+enable_database_notfirst=""
+enable_database_berkdb=""
+
+
+enable_database_dbm=""
+
+
+enable_database_gdbm=""
+
+
+
+enable_database_types="berkdb dbm gdbm"
+enable_database_default="berkdb,dbm,gdbm"
+
+
+
# Check whether --enable-database or --disable-database was given.
if test "${enable_database+set}" = set; then
enableval="$enable_database"
+ for x in `echo "$enable_database" | sed -e 's/,/ /g'` ; do
+ enable_database_all_default=""
+ enable_database_found=""
+ case "$x" in
+ n | no | non | none ) enable_database_all_default=no ;;
+ a | al | all | both ) enable_database_all_default=yes ;;
+ esac
-with_database_berkdb=no
-with_database_dbm=no
-with_database_gdbm=no
-for x in `echo "$enable_database" | sed -e 's/,/ /g'` ; do
- case "$x" in
- no ) ;;
- b | be | ber | berk | berkd | berkdb ) with_database_berkdb=yes ;;
- d | db | dbm ) with_database_dbm=yes ;;
- g | gn | gnu | gnud | gnudb | gnudbm | gdbm) with_database_gdbm=yes ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option value
-must be either \`no' or a comma-separated list
-of one or more of \`berkdb' and either \`dbm' or \`gnudbm'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
- esac
+ if test -z "$enable_database_all_default"; then
+ for y in $enable_database_types; do
+ if test "$x" = "$y"; then
+ enable_database_found=yes
+ eval "enable_database_$y=yes"
+ elif test "$x" = "no$y"; then
+ enable_database_found=yes
+ eval "enable_database_$y=no"
+ fi
+ done
+ test -z "$enable_database_found" && enable_database_bogus=yes
+ fi
+ if test "$enable_database_bogus" = "yes" -o \
+ \( -n "$enable_database_all_default" -a -n "$enable_database_notfirst" \) ; then
+ (echo "$progname: Usage error:"
+echo " " "Valid values for the --enable-database option are:
+$enable_database_types. With prefix \"no\", switch it off.
+Defaults may be overridden with \`all' or \`none' first in the list.
+Hardcoded default is: $enable_database_default."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ elif test -n "$enable_database_all_default" ; then
+ for y in $enable_database_types; do
+ eval "enable_database_$y=$enable_database_all_default"
+ done
+ fi
+ enable_database_notfirst=yes
done
-if test "$with_database_dbm" = "yes" -a "$with_database_gdbm" = "yes"; then
+unset enable_database_bogus enable_database_found enable_database_notfirst enable_database_types
+unset enable_database_default enable_database_all_default x y
+
+
+if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
(echo "$progname: Usage error:"
echo " " "Only one of \`dbm' and \`gnudbm' may be specified
with the \`--$optname' option."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
+
fi;
-# Check whether --enable-sound or --disable-sound was given.
-if test "${enable_sound+set}" = set; then
- enableval="$enable_sound"
+enable_sound_notfirst=""
+enable_sound_native=""
-for x in `echo "$enable_sound" | sed -e 's/,/ /g'` ; do
- case "$x" in
- n | no | non | none ) new_sdefault=no ;;
- a | al | all | both ) new_sdefault=yes ;;
- native ) with_native_sound=yes ;;
- nonative ) with_native_sound=no ;;
+enable_sound_nas=""
- nas ) with_nas_sound=yes ;;
- nonas ) with_nas_sound=no ;;
- esd ) with_esd_sound=yes ;;
- noesd ) with_esd_sound=no ;;
+enable_sound_esd=no
- * ) bogus_sound=yes ;;
- esac
- if test "$bogus_sound" -o \
- \( -n "$new_sdefault" -a -n "$sound_notfirst" \) ; then
- types="\`all', \`none', \`(no)native', \`no(nas)', \`(no)esd'."
- (echo "$progname: Usage error:"
-echo " " "Valid types for the \`--$optname' option are:
-$types.
-Option \`all' or \`none' must be first in the list.
-The default is to autodetect native and NAS sound support."
+
+
+enable_sound_types="native nas esd"
+enable_sound_default="native,nas,noesd"
+
+
+
+# Check whether --enable-sound or --disable-sound was given.
+if test "${enable_sound+set}" = set; then
+ enableval="$enable_sound"
+ for x in `echo "$enable_sound" | sed -e 's/,/ /g'` ; do
+ enable_sound_all_default=""
+ enable_sound_found=""
+ case "$x" in
+ n | no | non | none ) enable_sound_all_default=no ;;
+ a | al | all | both ) enable_sound_all_default=yes ;;
+ esac
+
+ if test -z "$enable_sound_all_default"; then
+ for y in $enable_sound_types; do
+ if test "$x" = "$y"; then
+ enable_sound_found=yes
+ eval "enable_sound_$y=yes"
+ elif test "$x" = "no$y"; then
+ enable_sound_found=yes
+ eval "enable_sound_$y=no"
+ fi
+ done
+ test -z "$enable_sound_found" && enable_sound_bogus=yes
+ fi
+ if test "$enable_sound_bogus" = "yes" -o \
+ \( -n "$enable_sound_all_default" -a -n "$enable_sound_notfirst" \) ; then
+ (echo "$progname: Usage error:"
+echo " " "Valid values for the --enable-sound option are:
+$enable_sound_types. With prefix \"no\", switch it off.
+Defaults may be overridden with \`all' or \`none' first in the list.
+Hardcoded default is: $enable_sound_default."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
- elif test -n "$new_sdefault" ; then
- with_native_sound=$new_sdefault
- with_nas_sound=$new_sdefault
- with_esd_sound=$new_sdefault
- new_sdefault= # reset this
- fi
- sound_notfirst=true
+ elif test -n "$enable_sound_all_default" ; then
+ for y in $enable_sound_types; do
+ eval "enable_sound_$y=$enable_sound_all_default"
+ done
+ fi
+ enable_sound_notfirst=yes
done
+unset enable_sound_bogus enable_sound_found enable_sound_notfirst enable_sound_types
+unset enable_sound_default enable_sound_all_default x y
+
+
else
- with_esd_sound=no
+ enable_sound_nas=""
fi;
+
# Check whether --with-athena or --without-athena was given.
if test "${with_athena+set}" = set; then
withval="$with_athena"
- case "$with_athena" in
- xa | xaw ) val=xaw ;;
- 3 | 3d | xaw3d ) val=3d ;;
- ne | nex | next | naxtaw) val=next ;;
- 9 | 95 | xaw95 ) val=95 ;;
- xp | xpm | xawxpm ) val=xpm ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--with-athena' option must have one of these values:
- \`xaw', \`3d', \`next', \`95', or \`xpm'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
- esac
-eval "with_athena=\"$val\""
+ with_athena_bogus=yes
+ for x in xaw xaw3d next 95 xpm ; do
+ if test $x = $with_athena ; then
+ with_athena_bogus=no
+ fi
+ done
+ if test "$with_athena_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-athena option must have one of these values: \`xaw',\`xaw3d',\`next',\`95',\`xpm'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset with_athena_bogus
+
fi;
+
# Check whether --with-xim or --without-xim was given.
if test "${with_xim+set}" = set; then
withval="$with_xim"
+ with_xim_bogus=yes
+ for x in yes no xlib motif ; do
+ if test $x = $with_xim ; then
+ with_xim_bogus=no
+ fi
+ done
+ if test "$with_xim_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-xim option must have one of these values: \`yes',\`no',\`xlib',\`motif'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset with_xim_bogus
-case "$with_xim" in
- y | ye | yes ) val=yes ;;
- n | no | non | none ) val=no ;;
- x | xl | xli | xlib ) val=xlib ;;
- m | mo | mot | moti | motif ) val=motif ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option must have one of these values:
- \`motif', \`xlib', \`yes', or \`no'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
-esac
-eval "with_xim=\"$val\""
+
fi;
＠＠ -2418,191 +2481,206 ＠＠
# Check whether --with-mail-locking or --without-mail-locking was given.
if test "${with_mail_locking+set}" = set; then
withval="$with_mail_locking"
+ with_mail_locking_bogus=yes
+ for x in lockf flock file locking mmdf pop ; do
+ if test $x = $with_mail_locking ; then
+ with_mail_locking_bogus=no
+ fi
+ done
+ if test "$with_mail_locking_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --with-mail-locking option must have one of these values: \`lockf',\`flock',\`file',\`locking',\`mmdf',\`pop'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset with_mail_locking_bogus
-case "$with_mail_locking" in
- lockf ) val=lockf ;;
- flock ) val=flock ;;
- file | dot ) val=file ;;
- locking ) val=locking ;;
- mmdf ) val=mmdf ;;
- pop ) val=pop ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option must have one of these values:
- \`lockf', \`flock', \`file', \`dot', \`locking', \`mmdf', or \`pop'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
-esac
-eval "with_mail_locking=\"$val\""
+
fi;
+
# Check whether --enable-bignum or --disable-bignum was given.
if test "${enable_bignum+set}" = set; then
enableval="$enable_bignum"
+ enable_bignum_bogus=yes
+ for x in no gmp mp ; do
+ if test $x = $enable_bignum ; then
+ enable_bignum_bogus=no
+ fi
+ done
+ if test "$enable_bignum_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --enable-bignum option must have one of these values: \`no',\`gmp',\`mp'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset enable_bignum_bogus
-case "$enable_bignum" in
- gmp ) val=gmp ;;
- mp ) val=mp ;;
- no|non|none ) val=no ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option must have one of these values:
-\`gmp', \`mp', or \`no'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
-esac
-eval "enable_bignum=\"$val\""
+
else
enable_bignum="no"
fi;
-# Check whether --enable-error-checking or --disable-error-checking was given.
-if test "${enable_error_checking+set}" = set; then
- enableval="$enable_error_checking"
+enable_error_checking_notfirst=""
+enable_error_checking_extents=""
-for x in `echo "$enable_error_checking" | sed -e 's/,/ /g'` ; do
- case "$x" in
- n | no | non | none ) new_default=no ;;
- a | al | all ) new_default=yes ;;
+enable_error_checking_types=""
- extents ) error_check_extents=yes ;;
- noextents ) error_check_extents=no ;;
- types ) error_check_types=yes ;;
- notypes ) error_check_types=no ;;
+enable_error_checking_text=""
- text ) error_check_text=yes ;;
- notext ) error_check_text=no ;;
- gc ) error_check_gc=yes ;;
- nogc ) error_check_gc=no ;;
+enable_error_checking_gc=""
- malloc ) error_check_malloc=yes ;;
- nomalloc ) error_check_malloc=no ;;
- byte_code ) error_check_byte_code=yes ;;
- nobyte_code ) error_check_byte_code=no ;;
+enable_error_checking_malloc=""
- glyphs ) error_check_glyphs=yes ;;
- noglyphs ) error_check_glyphs=no ;;
- display ) error_check_display=yes ;;
- nodisplay ) error_check_display=no ;;
+enable_error_checking_byte_code=""
- structures ) error_check_structures=yes ;;
- nostructures ) error_check_structures=no ;;
- * ) bogus_error_check=yes ;;
- esac
+enable_error_checking_glyphs=""
- if test "$bogus_error_check" -o \
- \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then
- if test "$error_check_default" = yes ; then
- types="\`all' (default), \`none', \`noextents', \`notypes', \`notext', \`nogc', \`nomalloc', \`noglyphs', \`nobyte-code', \`nodisplay', \`nostructures'."
- else
- types="\`all', \`none' (default), \`extents', \`types', \`text', \`gc', \`malloc', \`glyphs', \`byte-code', \`display', \`structures'."
- fi
- (echo "$progname: Usage error:"
-echo " " "Valid types for the \`--$optname' option are:
-$types."
+
+enable_error_checking_display=""
+
+
+enable_error_checking_structures=""
+
+
+
+enable_error_checking_types="extents types text gc malloc byte_code glyphs display structures"
+enable_error_checking_default="extents,types,text,gc,malloc,byte_code,glyphs,display,structures"
+
+
+
+# Check whether --enable-error-checking or --disable-error-checking was given.
+if test "${enable_error_checking+set}" = set; then
+ enableval="$enable_error_checking"
+ for x in `echo "$enable_error_checking" | sed -e 's/,/ /g'` ; do
+ enable_error_checking_all_default=""
+ enable_error_checking_found=""
+ case "$x" in
+ n | no | non | none ) enable_error_checking_all_default=no ;;
+ a | al | all | both ) enable_error_checking_all_default=yes ;;
+ esac
+
+ if test -z "$enable_error_checking_all_default"; then
+ for y in $enable_error_checking_types; do
+ if test "$x" = "$y"; then
+ enable_error_checking_found=yes
+ eval "enable_error_checking_$y=yes"
+ elif test "$x" = "no$y"; then
+ enable_error_checking_found=yes
+ eval "enable_error_checking_$y=no"
+ fi
+ done
+ test -z "$enable_error_checking_found" && enable_error_checking_bogus=yes
+ fi
+ if test "$enable_error_checking_bogus" = "yes" -o \
+ \( -n "$enable_error_checking_all_default" -a -n "$enable_error_checking_notfirst" \) ; then
+ (echo "$progname: Usage error:"
+echo " " "Valid values for the --enable-error-checking option are:
+$enable_error_checking_types. With prefix \"no\", switch it off.
+Defaults may be overridden with \`all' or \`none' first in the list.
+Hardcoded default is: $enable_error_checking_default."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
- elif test -n "$new_default" ; then
- error_check_extents=$new_default
- error_check_types=$new_default
- error_check_text=$new_default
- error_check_gc=$new_default
- error_check_malloc=$new_default
- error_check_byte_code=$new_default
- error_check_glyphs=$new_default
- error_check_display=$new_default
- error_check_structures=$new_default
- new_default= # reset this
- fi
- echeck_notfirst=true
- done
+ elif test -n "$enable_error_checking_all_default" ; then
+ for y in $enable_error_checking_types; do
+ eval "enable_error_checking_$y=$enable_error_checking_all_default"
+ done
+ fi
+ enable_error_checking_notfirst=yes
+done
+unset enable_error_checking_bogus enable_error_checking_found enable_error_checking_notfirst enable_error_checking_types
+unset enable_error_checking_default enable_error_checking_all_default x y
+
+
fi;
+
# Check whether --enable-menubars or --disable-menubars was given.
if test "${enable_menubars+set}" = set; then
enableval="$enable_menubars"
+ enable_menubars_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $enable_menubars ; then
+ enable_menubars_bogus=no
+ fi
+ done
+ if test "$enable_menubars_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --enable-menubars option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset enable_menubars_bogus
-case "$enable_menubars" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
-esac
-eval "enable_menubars=\"$val\""
+
fi;
+
# Check whether --enable-scrollbars or --disable-scrollbars was given.
if test "${enable_scrollbars+set}" = set; then
enableval="$enable_scrollbars"
+ enable_scrollbars_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $enable_scrollbars ; then
+ enable_scrollbars_bogus=no
+ fi
+ done
+ if test "$enable_scrollbars_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --enable-scrollbars option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset enable_scrollbars_bogus
-case "$enable_scrollbars" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
-esac
-eval "enable_scrollbars=\"$val\""
+
fi;
+
# Check whether --enable-dialogs or --disable-dialogs was given.
if test "${enable_dialogs+set}" = set; then
enableval="$enable_dialogs"
+ enable_dialogs_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $enable_dialogs ; then
+ enable_dialogs_bogus=no
+ fi
+ done
+ if test "$enable_dialogs_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --enable-dialogs option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset enable_dialogs_bogus
-case "$enable_dialogs" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
-esac
-eval "enable_dialogs=\"$val\""
+
fi;
+
# Check whether --enable-widgets or --disable-widgets was given.
if test "${enable_widgets+set}" = set; then
enableval="$enable_widgets"
+ enable_widgets_bogus=yes
+ for x in yes no lucid motif athena gtk msw ; do
+ if test $x = $enable_widgets ; then
+ enable_widgets_bogus=no
+ fi
+ done
+ if test "$enable_widgets_bogus" = "yes" ; then
+ (echo "$progname: Usage error:"
+echo " " "The --enable-widgets option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1
+ fi
+unset enable_widgets_bogus
-case "$enable_widgets" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) (echo "$progname: Usage error:"
-echo " " "The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
-esac
-eval "enable_widgets=\"$val\""
+
fi;
＠＠ -2886,39 +2964,39 ＠＠
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-test "${error_check_extents=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_extents=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_EXTENTS 1
_ACEOF
-test "${error_check_types=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_types=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_TYPES 1
_ACEOF
-test "${error_check_text=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_text=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_TEXT 1
_ACEOF
-test "${error_check_gc=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_gc=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_GC 1
_ACEOF
-test "${error_check_malloc=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_malloc=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_MALLOC 1
_ACEOF
-test "${error_check_byte_code=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_byte_code=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_BYTE_CODE 1
_ACEOF
-test "${error_check_glyphs=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_glyphs=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_GLYPHS 1
_ACEOF
-test "${error_check_display=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_display=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_DISPLAY 1
_ACEOF
-test "${error_check_structures=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_structures=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_STRUCTURES 1
_ACEOF
＠＠ -7762,10 +7840,9 ＠＠
elif test "$CC" = "xlc"; then
with_cflags_warning="-qinfo"
elif test "$GCC" = "yes"; then
- with_cflags_warning="-Wall -Wno-switch -Wmissing-prototypes"
+ with_cflags_warning="-Wall -Wno-switch -Wundef"
with_cflags_warning="$with_cflags_warning -Wsign-compare -Wno-char-subscripts"
- with_cflags_warning="$with_cflags_warning -Wundef -Wstrict-prototypes"
test "$__GCC3" = "yes" && with_cflags_warning="$with_cflags_warning -Wpacked"
test "$have_glibc" != "yes" && \
with_cflags_warning="$with_cflags_warning -Wpointer-arith"
＠＠ -7775,6 +7852,7 ＠＠
xe_cflags_warning="$with_cflags_warning -Wunused-parameter"
fi
with_cflags_warning="$with_cflags_warning -Wshadow -Wmissing-declarations"
+ with_cflags_warning="$with_cflags_warning -Wmissing-prototypes -Wstrict-prototypes"
elif test "$__ICC" = "yes"; then
with_cflags_warning="-Wall -w1 -we147"
fi
＠＠ -18472,13 +18550,13 ＠＠
fi
if test "$with_x11" != "yes"; then
- for feature in tooltalk cde offix wmcommand xim xmu nas_sound
+ for feature in with_tooltalk with_cde with_offix with_wmcommand with_xim with_xmu enable_sound_nas
do
- if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
- { echo "$as_me:$LINENO: WARNING: --with-$feature ignored: Not valid without X support" >&5
-echo "$as_me: WARNING: --with-$feature ignored: Not valid without X support" >&2;}
+ if eval "test -n \"\${feature}\" -a \"\${feature}\" != no" ; then
+ { echo "$as_me:$LINENO: WARNING: --$feature ignored: Not valid without X support" >&5
+echo "$as_me: WARNING: --$feature ignored: Not valid without X support" >&2;}
fi
- eval "with_${feature}=no"
+ eval "${feature}=no"
done
fi
＠＠ -33180,9 +33258,9 ＠＠
{ echo "$as_me:$LINENO: checking \"for sound support\"..." >&5
echo "$as_me: checking \"for sound support\"..." >&6;}
-test -z "$with_native_sound" -a -n "$with_native_sound_lib" && with_native_sound=yes
+test -n "$with_native_sound_lib" && enable_sound_native=yes
-if test "$with_native_sound" != "no"; then
+if test "$enable_sound_native" != "no"; then
if test -n "$with_native_sound_lib"; then
if test "${ac_cv_header_multimedia_audio_device_h+set}" = set; then
echo "$as_me:$LINENO: checking for multimedia/audio_device.h" >&5
＠＠ -33687,7 +33765,7 ＠＠
fi
if test "$sound_found" = "yes"; then
- with_native_sound=yes
+ enable_sound_native=yes
if test "$opsys" = "netbsd" ; then
echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
＠＠ -33759,10 +33837,16 ＠＠
fi
fi
+ else
+ if test "$enable_sound_native" = "yes" ; then
+ { echo "$as_me:$LINENO: WARNING: No native libraries found. Disabling native sound support." >&5
+echo "$as_me: WARNING: No native libraries found. Disabling native sound support." >&2;}
+ fi
+ enable_sound_native=no
fi
fi
-if test "$with_native_sound" = "yes"; then
+if test "$enable_sound_native" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_NATIVE_SOUND 1
_ACEOF
＠＠ -33770,7 +33854,7 ＠＠
test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$with_native_sound_lib\" to \$LIBS"; fi
fi
-if test "$with_nas_sound" != "no"; then
+if test "$enable_sound_nas" != "no"; then
if test "${ac_cv_header_audio_audiolib_h+set}" = set; then
echo "$as_me:$LINENO: checking for audio/audiolib.h" >&5
echo $ECHO_N "checking for audio/audiolib.h... $ECHO_C" >&6
＠＠ -33982,7 +34066,7 ＠＠
if test "$have_nas_sound" = "yes"; then
- with_nas_sound=yes
+ enable_sound_nas=yes
cat >>confdefs.h <<\_ACEOF
#define HAVE_NAS_SOUND 1
_ACEOF
＠＠ -34012,13 +34096,13 ＠＠
rm -f conftest*
else
- test "$with_nas_sound" = "yes" && \
+ test "$enable_sound_nas" = "yes" && \
{ echo "Error:" "Required NAS sound support cannot be provided." >&2; exit 1; }
- with_nas_sound=no
+ enable_sound_nas=no
fi
fi
-if test "$with_esd_sound" != "no"; then
+if test "$enable_sound_esd" != "no"; then
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
＠＠ -34158,7 +34242,7 ＠＠
fi
if test "$have_esd_sound" = "yes"; then
- with_esd_sound=yes
+ enable_sound_esd=yes
need_miscplay=yes
extra_objs="$extra_objs esd.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"esd.o\""
＠＠ -34168,9 +34252,9 ＠＠
_ACEOF
else
- test "$with_esd_sound" = "yes" && \
+ test "$enable_sound_esd" = "yes" && \
{ echo "Error:" "Required ESD sound support cannot be provided." >&2; exit 1; }
- with_esd_sound=no
+ enable_sound_esd=no
fi
fi
＠＠ -35179,11 +35263,11 ＠＠
done
fi
-test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
+test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
!= "no no no" && { echo "$as_me:$LINENO: checking for database support..." >&5
echo "$as_me: checking for database support..." >&6;}
-if test "$with_database_gdbm $with_database_dbm" != "no no"; then
+if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then
if test "${ac_cv_header_ndbm_h+set}" = set; then
echo "$as_me:$LINENO: checking for ndbm.h" >&5
echo $ECHO_N "checking for ndbm.h... $ECHO_C" >&6
＠＠ -35325,16 +35409,16 ＠＠
:
else
- test "$with_database_gdbm" = "yes" -o \
- "$with_database_dbm" = "yes" && \
+ test "$enable_database_gdbm" = "yes" -o \
+ "$enable_database_dbm" = "yes" && \
{ echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
- with_database_gdbm=no with_database_dbm=no
+ enable_database_gdbm=no enable_database_dbm=no
fi
fi
-if test "$with_database_gdbm" != "no"; then
+if test "$enable_database_gdbm" != "no"; then
echo "$as_me:$LINENO: checking for dbm_open in -lgdbm" >&5
echo $ECHO_N "checking for dbm_open in -lgdbm... $ECHO_C" >&6
if test "${ac_cv_lib_gdbm_dbm_open+set}" = set; then
＠＠ -35401,18 +35485,18 ＠＠
echo "${ECHO_T}$ac_cv_lib_gdbm_dbm_open" >&6
if test $ac_cv_lib_gdbm_dbm_open = yes; then
- with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm
+ enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm
else
- if test "$with_database_gdbm" = "yes"; then
+ if test "$enable_database_gdbm" = "yes"; then
{ echo "Error:" "Required GNU DBM support cannot be provided." >&2; exit 1; }
fi
- with_database_gdbm=no
+ enable_database_gdbm=no
fi
fi
-if test "$with_database_dbm" != "no"; then
+if test "$enable_database_dbm" != "no"; then
echo "$as_me:$LINENO: checking for dbm_open" >&5
echo $ECHO_N "checking for dbm_open... $ECHO_C" >&6
if test "${ac_cv_func_dbm_open+set}" = set; then
＠＠ -35504,7 +35588,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_func_dbm_open" >&5
echo "${ECHO_T}$ac_cv_func_dbm_open" >&6
if test $ac_cv_func_dbm_open = yes; then
- with_database_dbm=yes libdbm=
+ enable_database_dbm=yes libdbm=
else
echo "$as_me:$LINENO: checking for dbm_open in -ldbm" >&5
＠＠ -35572,12 +35656,12 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_dbm_dbm_open" >&5
echo "${ECHO_T}$ac_cv_lib_dbm_dbm_open" >&6
if test $ac_cv_lib_dbm_dbm_open = yes; then
- with_database_dbm=yes libdbm=-ldbm
+ enable_database_dbm=yes libdbm=-ldbm
else
- test "$with_database_dbm" = "yes" && \
+ test "$enable_database_dbm" = "yes" && \
{ echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
- with_database_dbm=no
+ enable_database_dbm=no
fi
fi
＠＠ -35585,14 +35669,14 ＠＠
fi
test -n "$libdbm" && LIBS=""$libdbm" $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libdbm"\" to \$LIBS"; fi
-test "$with_database_gdbm" = "yes" -o \
- "$with_database_dbm" = "yes" && \
+test "$enable_database_gdbm" = "yes" -o \
+ "$enable_database_dbm" = "yes" && \
cat >>confdefs.h <<\_ACEOF
#define HAVE_DBM 1
_ACEOF
-if test "$with_database_berkdb" != "no"; then
+if test "$enable_database_berkdb" != "no"; then
echo "$as_me:$LINENO: checking for Berkeley db.h" >&5
echo $ECHO_N "checking for Berkeley db.h... $ECHO_C" >&6
for header in "db/db.h" "db.h"; do
＠＠ -35658,12 +35742,12 ＠＠
done
if test -z "$db_h_file"
then echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; with_database_berkdb=no
+echo "${ECHO_T}no" >&6; enable_database_berkdb=no
else echo "$as_me:$LINENO: result: $db_h_file" >&5
echo "${ECHO_T}$db_h_file" >&6
fi
- if test "$with_database_berkdb" != "no"; then
+ if test "$enable_database_berkdb" != "no"; then
echo "$as_me:$LINENO: checking for Berkeley DB version" >&5
echo $ECHO_N "checking for Berkeley DB version... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
＠＠ -35823,7 +35907,7 ＠＠
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
- with_database_berkdb=yes need_libdb=no
+ enable_database_berkdb=yes need_libdb=no
else
as_ac_Lib=`echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
＠＠ -35892,14 +35976,14 ＠＠
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- with_database_berkdb=yes need_libdb=yes
+ enable_database_berkdb=yes need_libdb=yes
fi
fi
fi
- if test "$with_database_berkdb" != "yes" -a "$dbver" = "4"; then
+ if test "$enable_database_berkdb" != "yes" -a "$dbver" = "4"; then
rm -f $tempcname
echo "#include <$db_h_file>" > $tempcname
echo "configure___ dbfunc=db_create" >> $tempcname
＠＠ -35974,12 +36058,12 ＠＠
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- with_database_berkdb=yes need_libdb=yes
+ enable_database_berkdb=yes need_libdb=yes
fi
fi
- if test "$with_database_berkdb" = "yes"; then
+ if test "$enable_database_berkdb" = "yes"; then
cat >>confdefs.h <<_ACEOF
#define DB_H_FILE "$db_h_file"
_ACEOF
＠＠ -35989,11 +36073,11 ＠＠
_ACEOF
test "$need_libdb" = "yes" && LIBS="-ldb $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldb\" to \$LIBS"; fi
- else with_database_berkdb=no
+ else enable_database_berkdb=no
fi
fi
-if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
+if test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
!= "no no no"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DATABASE 1
＠＠ -37532,16 +37616,16 ＠＠
echo "
Sound:"
-test "$with_native_sound" = yes && echo " Compiling in support for sound (native)."
-test "$with_nas_sound" = yes && echo " Compiling in support for NAS (network audio system)."
+test "$enable_sound_native" = yes && echo " Compiling in support for sound (native)."
+test "$enable_sound_nas" = yes && echo " Compiling in support for NAS (network audio system)."
test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously."
-test "$with_esd_sound" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)."
+test "$enable_sound_esd" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)."
echo "
Databases:"
-test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley database."
-test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
-test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
+test "$enable_database_berkdb" = yes && echo " Compiling in support for Berkeley database."
+test "$enable_database_dbm" = yes && echo " Compiling in support for DBM."
+test "$enable_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
test "$with_ldap" = yes && echo " Compiling in support for LDAP."
if test "$with_postgresql" = yes; then
echo " Compiling in support for PostgreSQL."
＠＠ -37593,7 +37677,7 ＠＠
test "$enable_pdump" = yes && echo " Using the new portable dumper."
test "$enable_debug" = yes && echo " Compiling in support for extra debugging code."
test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)."
-if test "$error_check_extents $error_check_types $error_check_text $error_check_gc $error_check_malloc $error_check_glyphs $error_check_byte_code $error_check_display $error_check_structures" \
+if test "$enable_error_checking_extents $enable_error_checking_types $enable_error_checking_text $enable_error_checking_gc $enable_error_checking_malloc $enable_error_checking_glyphs $enable_error_checking_byte_code $enable_error_checking_display $enable_error_checking_structures" \
!= "no no no no no no no no no"; then
echo " Compiling in support for runtime error checking."
echo " WARNING: ---------------------------------------------------------"
1.1.14.4 +200 -306 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.1.14.3
retrieving revision 1.1.14.4
diff -u -r1.1.14.3 -r1.1.14.4
--- configure.ac 2005/02/09 03:40:30 1.1.14.3
+++ configure.ac 2005/02/11 12:19:44 1.1.14.4
＠＠ -227,7 +227,86 ＠＠
$1="$T"
])dnl XE_SPACE
+dnl XEmacs keyword option support
+dnl =============================
+dnl
+dnl A "keyword" option is one that accepts one of a number of pre-defined
+dnl values (if more than one value is needed see "complex options" below).
+dnl For example --with-mail-locking=flock.
+dnl
+dnl Complex options used an expanded forms of AC_ARG_[WITH|ENABLE] called
+dnl XE_KEYWORD_ARG_[WITH|ENABLE] both taking 5 parameters. The first 4
+dnl parameters of these macros are the same as original macros with the
+dnl exception that all four paramaters are REQUIRED. The ACTION-IF-TRUE code
+dnl is run after the argument list has been parsed.
+dnl
+dnl The 5th parameter is a list keywords. The list must be quoted but the
+dnl individual macros should not.
+dnl
+dnl If the option value is a not a valid keyword then an error message is
+dnl generated, otherwise rthe value is left untouched.
+dnl
+dnl XE_PARSE_KEYWORD_OPTION(prefix, cmdline-flag)
+dnl ---------------------------------------------
+dnl
+dnl Internal macro to parse the option values. If an undeclared option is
+dnl found then an error is generated.
+dnl
+define([XE_PARSE_KEYWORD_OPTION],
+[[$1]_bogus=yes
+ for x in XE_KEYWORD_LIST ; do
+ if test $x = $[$1] ; then
+ [$1]_bogus=no
+ fi
+ done
+ if test "$[$1]_bogus" = "yes" ; then
+ USAGE_ERROR(["The [$2] option must have one of these values: m4_translit(XE_KEYWORD_VALUES,[:],[,])."])
+ fi
+unset [$1]_bogus
+undefine([XE_KEYWORD_LIST])dnl
+undefine([XE_KEYWORD_VALUES])])
+dnl
+dnl XE_KEYWORD(keyword)
+dnl --------------------------------
+dnl
+dnl
+define([XE_KEYWORD],
+[m4_append([XE_KEYWORD_LIST],[$1],[ ])dnl
+dnl Separate with a ':' instead of a ',' (see the parsing code above) to avoid
+dnl confusion with marco parameter lists.
+m4_append([XE_KEYWORD_VALUES],[\`$1'],[:])dnl
+])
+dnl
+dnl XE_KEYWORD_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
+dnl [XE_KEYWORD(keyword), ....])
+dnl --------------------------------------------------------------------------
+dnl
+dnl Expanded version of AC_ARG_WITH for keyword options. All the parameters
+dnl are required.
+dnl
+define([XE_KEYWORD_ARG_WITH],
+[m4_map([XE_KEYWORD],m4_shiftn(4, $＠))
+AC_ARG_WITH([$1],[$2],
+[XE_PARSE_KEYWORD_OPTION([with_]patsubst([$1], -, _), [--with-$1])
+$3
+],[$4])])
+dnl
+dnl XE_KEYWORD_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
+dnl [XE_KEYWORD(keyword), ....])
+dnl --------------------------------------------------------------------------
+dnl
+dnl Expanded version of AC_ARG_ENABLE for keyword options. All the parameters
+dnl are required.
+dnl
+define([XE_KEYWORD_ARG_ENABLE],
+[m4_map([XE_KEYWORD],m4_shiftn(4, $＠))
+AC_ARG_ENABLE([$1],[$2],
+[XE_PARSE_KEYWORD_OPTION([enable_]patsubst([$1], -, _), [--enable-$1])
+$3
+],[$4])])
+dnl
dnl XEmacs complex option support
+dnl =============================
dnl
dnl A "complex option" is one that takes a number of related values.
dnl For example, we might use "--with-xft=all,nomenubars" for compatibility
＠＠ -245,7 +324,14 ＠＠
dnl the individual macros should not.
dnl
dnl Option values are stored in the variables with_<package>_<component> or
-dnl enable_<feature>_<component> (eg with_xft_menubars)
+dnl enable_<feature>_<component> (eg with_xft_menubars).
+dnl
+dnl Option values are either 'yes' which means that the option must be used
+dnl and an error must occur if there is a configuration problems (such as a
+dnl missing library) or 'no' which means that the option must not be used.
+dnl The default value can also be "", meaning maybe, which means 'yes' if the
+dnl configuration is present otherwise no. Users cannot specify 'maybe' from
+dnl the command line.
dnl
dnl There are two possible uses in XEmacs for this kind of facility. One is
dnl exemplified by sound: there are alternative protocols (native, ESD, NAS)
＠＠ -254,7 +340,7 ＠＠
dnl XEmacs, as exemplified by Xft. This latter usage may be more common
dnl during development of a feature. Perhaps specialized APIs should be
dnl provided, see comment on XE_COMPLEX_OPTION_HELP_STRING below.
-
+dnl
dnl XE_COMPLEX_OPTION_DEFAULT(prefix, component, yesno)
dnl ---------------------------------------------------
dnl
＠＠ -268,7 +354,7 ＠＠
dnl confusion with marco parameter lists.
m4_append([XE_COMPONENT_DEFAULT],[m4_if([$3],no,no)[$2]],[:])
])
-
+dnl
dnl XE_EXPAND_COMPLEX_OPTIONS(prefix, option_list)
dnl ----------------------------------------------
dnl
＠＠ -353,7 +439,7 ＠＠
dnl --------------------------------
dnl
dnl Declare a complex option and its default value. The value MUST be either
-dnl yes or no.
+dnl yes or no or "" (which means maybe).
dnl
define([XE_COMPLEX_OPTION],[[$1,$2]])
＠＠ -379,8 +465,7 ＠＠
AC_ARG_WITH([$1],[$2],
[XE_PARSE_COMPLEX_OPTION([with_]patsubst([$1], -, _), [--with-$1])
$3
-],[$4])
-])
+],[$4])])
dnl XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
dnl [XE_COMPLEX_OPTION, ....])
＠＠ -394,9 +479,8 ＠＠
AC_ARG_ENABLE([$1],[$2],
[XE_PARSE_COMPLEX_OPTION([enable_]patsubst([$1], -, _), [--enable-$1])
$3
-],[$4])
-])
-
+],[$4])])
+dnl
dnl -------------------------------------------------------------------------
XE_APPEND(lib-src, MAKE_SUBDIR)
XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBDIR)
＠＠ -504,8 +588,7 ＠＠
[XE_COMPLEX_OPTION([emacs],[yes]),
XE_COMPLEX_OPTION([menubars],[yes]),
XE_COMPLEX_OPTION([tabs],[yes]),
- XE_COMPLEX_OPTION([gauges],[yes])]
-)
+ XE_COMPLEX_OPTION([gauges],[yes])])
dnl sanity checking
dnl #### Maybe we should XE_DIE here instead? Or fix the UI so that
dnl emacs is always implicit? (I worry that --without-xft would be weird.)
＠＠ -753,32 +836,22 ＠＠
#Enable code.
-AC_ARG_ENABLE([database],
+XE_COMPLEX_ARG_ENABLE([database],
AC_HELP_STRING([--enable-database],[Compile with database support. Valid types are
`no' or a comma-separated list of one or more
of `berkdb' and either `dbm' or `gnudbm'.]),
[
-with_database_berkdb=no
-with_database_dbm=no
-with_database_gdbm=no
-for x in `echo "$enable_database" | sed -e 's/,/ /g'` ; do
- case "$x" in
- no ) ;;
- b | be | ber | berk | berkd | berkdb ) with_database_berkdb=yes ;;
- d | db | dbm ) with_database_dbm=yes ;;
- g | gn | gnu | gnud | gnudb | gnudbm | gdbm) with_database_gdbm=yes ;;
- * ) USAGE_ERROR(["The \`--$optname' option value
-must be either \`no' or a comma-separated list
-of one or more of \`berkdb' and either \`dbm' or \`gnudbm'."]) ;;
- esac
-done
-if test "$with_database_dbm" = "yes" -a "$with_database_gdbm" = "yes"; then
+if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified
with the \`--$optname' option.")
fi
-], [])
+],
+[],
+[XE_COMPLEX_OPTION([berkdb],[""]),
+ XE_COMPLEX_OPTION([dbm],[""]),
+ XE_COMPLEX_OPTION([gdbm],[""])])
-AC_ARG_ENABLE([sound],
+XE_COMPLEX_ARG_ENABLE([sound],
AC_HELP_STRING([--enable-sound],[Compile with sound support.
Valid types are `native', `nas' and `esd'.
Prefix a type with 'no' to disable.
＠＠ -787,254 +860,70 ＠＠
Later options override earlier ones for the same TYPE.
The default is to autodetect all sound support except
for ESD which defaults to off.]),
- [
-dnl values is a subset of all,native,nas,esd
-dnl or their negatives: none,nonative,nonas,noesd
-for x in `echo "$enable_sound" | sed -e 's/,/ /g'` ; do
- case "$x" in
- dnl all and none are only permitted as the first in the list.
- n | no | non | none ) new_sdefault=no ;;
- a | al | all | both ) new_sdefault=yes ;;
-
- native ) with_native_sound=yes ;;
- nonative ) with_native_sound=no ;;
-
- nas ) with_nas_sound=yes ;;
- nonas ) with_nas_sound=no ;;
-
- esd ) with_esd_sound=yes ;;
- noesd ) with_esd_sound=no ;;
-
- * ) bogus_sound=yes ;;
- esac
- if test "$bogus_sound" -o \
- \( -n "$new_sdefault" -a -n "$sound_notfirst" \) ; then
- types="\`all', \`none', \`(no)native', \`no(nas)', \`(no)esd'."
- USAGE_ERROR(["Valid types for the \`--$optname' option are:
-$types.
-Option \`all' or \`none' must be first in the list.
-The default is to autodetect native and NAS sound support."])
- elif test -n "$new_sdefault" ; then
- with_native_sound=$new_sdefault
- with_nas_sound=$new_sdefault
- with_esd_sound=$new_sdefault
- new_sdefault= # reset this
- fi
- sound_notfirst=true
-done
-], [with_esd_sound=no])
+ [],
+ [enable_sound_nas=""],
+ [XE_COMPLEX_OPTION([native],[""]),
+ XE_COMPLEX_OPTION([nas],[""]),
+ XE_COMPLEX_OPTION([esd],[no])])
-AC_ARG_WITH([athena],
+XE_KEYWORD_ARG_WITH([athena],
AC_HELP_STRING([--with-athena],[Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).]),
-[case "$with_athena" in
- xa | xaw ) val=xaw ;;
- 3 | 3d | xaw3d ) val=3d ;;
- dnl No `n' for next, someone may try `no'
- ne | nex | next | naxtaw) val=next ;;
- dnl Have not tested the next two...
- 9 | 95 | xaw95 ) val=95 ;;
- xp | xpm | xawxpm ) val=xpm ;;
- * ) USAGE_ERROR(["The \`--with-athena' option must have one of these values:
- \`xaw', \`3d', \`next', \`95', or \`xpm'."]) ;;
- esac
-dnl #### I don't think this needs to be an `eval'
-eval "with_athena=\"$val\""
-]
-)dnl
+[],[],[xaw,xaw3d,next,95,xpm])dnl
-AC_ARG_WITH([xim],
- AC_HELP_STRING([--with-xim],[]),
- [
-case "$with_xim" in
- y | ye | yes ) val=yes ;;
- n | no | non | none ) val=no ;;
- x | xl | xli | xlib ) val=xlib ;;
- m | mo | mot | moti | motif ) val=motif ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`motif', \`xlib', \`yes', or \`no'."]) ;;
-esac
-eval "with_xim=\"$val\""
-], [])
+XE_KEYWORD_ARG_WITH([xim],[],[],[],[yes,no,xlib,motif])dnl
-AC_ARG_WITH([mail-locking],
+XE_KEYWORD_ARG_WITH([mail-locking],
AC_HELP_STRING([--with-mail-locking],[Specify the locking to be used by movemail to prevent
concurrent updates of mail spool files. Valid types
are `lockf', `flock', `dot', `locking' or `mmdf'.]),
- [
-case "$with_mail_locking" in
- lockf ) val=lockf ;;
- flock ) val=flock ;;
- file | dot ) val=file ;;
- locking ) val=locking ;;
- mmdf ) val=mmdf ;;
- pop ) val=pop ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`lockf', \`flock', \`file', \`dot', \`locking', \`mmdf', or \`pop'."]) ;;
-esac
-eval "with_mail_locking=\"$val\""
-], [])
+[],[],[lockf,flock,file,locking,mmdf,pop])dnl
+
-AC_ARG_ENABLE([bignum],
+XE_KEYWORD_ARG_ENABLE([bignum],
AC_HELP_STRING([--enable-bignum=TYPE],[Compile in support for bignums, ratios, or bigfloats
using library support. TYPE must be one of "gmp"
(for GNU MP), "mp" (for BSD MP), or "no" (disabled).]),
- [
-case "$enable_bignum" in
- gmp ) val=gmp ;;
- mp ) val=mp ;;
- no|non|none ) val=no ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
-\`gmp', \`mp', or \`no'."]) ;;
-esac
-eval "enable_bignum=\"$val\""
-], [enable_bignum="no"])
+ [], [enable_bignum="no"],[no,gmp,mp])
-AC_ARG_ENABLE([error-checking],
+XE_COMPLEX_ARG_ENABLE([error-checking],
AC_HELP_STRING([--enable-error-checking],[Compile with internal error-checking added.
Causes noticeable loss of speed. Valid types
are extents, bufpos, malloc, gc, types, text, byte_code, glyphs, display, structures.]),
- [
-dnl value can be all, none, and/or a list of categories to check.
-dnl Example: --enable-error-checking=all,noextents,nocharbpos
-dnl Example: --enable-error-checking=none,malloc,gc
-
-for x in `echo "$enable_error_checking" | sed -e 's/,/ /g'` ; do
- case "$x" in
- dnl all and none are only permitted as the first in the list.
- n | no | non | none ) new_default=no ;;
- a | al | all ) new_default=yes ;;
-
- extents ) error_check_extents=yes ;;
- noextents ) error_check_extents=no ;;
-
- types ) error_check_types=yes ;;
- notypes ) error_check_types=no ;;
-
- text ) error_check_text=yes ;;
- notext ) error_check_text=no ;;
-
- gc ) error_check_gc=yes ;;
- nogc ) error_check_gc=no ;;
-
- malloc ) error_check_malloc=yes ;;
- nomalloc ) error_check_malloc=no ;;
-
- byte_code ) error_check_byte_code=yes ;;
- nobyte_code ) error_check_byte_code=no ;;
-
- glyphs ) error_check_glyphs=yes ;;
- noglyphs ) error_check_glyphs=no ;;
+ [], [],
+[XE_COMPLEX_OPTION([extents],[""]),
+ XE_COMPLEX_OPTION([types],[""]),
+ XE_COMPLEX_OPTION([text],[""]),
+ XE_COMPLEX_OPTION([gc],[""]),
+ XE_COMPLEX_OPTION([malloc],[""]),
+ XE_COMPLEX_OPTION([byte_code],[""]),
+ XE_COMPLEX_OPTION([glyphs],[""]),
+ XE_COMPLEX_OPTION([display],[""]),
+ XE_COMPLEX_OPTION([structures],[""])])
- display ) error_check_display=yes ;;
- nodisplay ) error_check_display=no ;;
-
- structures ) error_check_structures=yes ;;
- nostructures ) error_check_structures=no ;;
-
- * ) bogus_error_check=yes ;;
- esac
-
- if test "$bogus_error_check" -o \
- \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then
- if test "$error_check_default" = yes ; then
- types="\`all' (default), \`none', \`noextents', \`notypes', \`notext', \`nogc', \`nomalloc', \`noglyphs', \`nobyte-code', \`nodisplay', \`nostructures'."
- else
- types="\`all', \`none' (default), \`extents', \`types', \`text', \`gc', \`malloc', \`glyphs', \`byte-code', \`display', \`structures'."
- fi
- USAGE_ERROR(["Valid types for the \`--$optname' option are:
-$types."])
- elif test -n "$new_default" ; then
- error_check_extents=$new_default
- error_check_types=$new_default
- error_check_text=$new_default
- error_check_gc=$new_default
- error_check_malloc=$new_default
- error_check_byte_code=$new_default
- error_check_glyphs=$new_default
- error_check_display=$new_default
- error_check_structures=$new_default
- new_default= # reset this
- fi
- echeck_notfirst=true
- done
-], [])
-
-AC_ARG_ENABLE([menubars],
+XE_KEYWORD_ARG_ENABLE([menubars],
AC_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars (lucid, motif, or no). The Lucid
widgets emulate Motif (mostly) but are faster.
*WARNING* The Motif menubar is currently broken.
Lucid menubars are the default.]),
- [
-case "$enable_menubars" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
-esac
-eval "enable_menubars=\"$val\""
-], [])
+ [], [],[yes,no,lucid,motif,athena,gtk,msw])
-AC_ARG_ENABLE([scrollbars],
+XE_KEYWORD_ARG_ENABLE([scrollbars],
AC_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars (lucid, motif, athena, or no).
Lucid scrollbars are the default.]),
- [
-case "$enable_scrollbars" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
-esac
-eval "enable_scrollbars=\"$val\""
-], [])
+ [], [],[yes,no,lucid,motif,athena,gtk,msw])
-AC_ARG_ENABLE([dialogs],
+XE_KEYWORD_ARG_ENABLE([dialogs],
AC_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes (lucid, motif, athena, or no).
There are no true Lucid dialogs; Motif dialogs will be
used if Motif can be found, else Athena is used.]),
- [
-case "$enable_dialogs" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
-esac
-eval "enable_dialogs=\"$val\""
-], [])
+ [], [],[yes,no,lucid,motif,athena,gtk,msw])
-AC_ARG_ENABLE([widgets],
+XE_KEYWORD_ARG_ENABLE([widgets],
AC_HELP_STRING([--enable-widgets],[Use TYPE native widgets (lucid, motif, athena, or no).
Other widget types are currently unsupported.
There are no true Lucid widgets; Motif widgets will be
used if Motif can be found, else Athena is used.]),
- [
-case "$enable_widgets" in
- l | lu | luc | luci | lucid ) val=lucid ;;
- mo | mot | moti | motif ) val=motif ;;
- a | at | ath | athe | athen | athena ) val=athena ;;
- n | no | non | none ) val=no ;;
- y | ye | yes ) val=yes ;;
- g | gt | gtk ) val=gtk ;;
- ms | msw ) val=msw ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
-esac
-eval "enable_widgets=\"$val\""
-], [])
+ [], [],[yes,no,lucid,motif,athena,gtk,msw])
dnl -------------------------------------------------------------------------
dnl Final command line argument checks.
＠＠ -1205,15 +1094,15 ＠＠
dnl Error checking default to "yes" in beta versions, to "no" in releases.
dnl Same goes for --enable-debug and --extra-verbosity.
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
-test "${error_check_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES)
-test "${error_check_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT)
-test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC)
-test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
-test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
-test "${error_check_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS)
-test "${error_check_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY)
-test "${error_check_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES)
+test "${enable_error_checking_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
+test "${enable_error_checking_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES)
+test "${enable_error_checking_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT)
+test "${enable_error_checking_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC)
+test "${enable_error_checking_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
+test "${enable_error_checking_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
+test "${enable_error_checking_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS)
+test "${enable_error_checking_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY)
+test "${enable_error_checking_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES)
dnl enable_debug=yes must be set when error checking is present. This should be
dnl fixed up.
dnl enable_debug implies other options
＠＠ -2263,7 +2152,7 ＠＠
elif test "$CC" = "xlc"; then
with_cflags_warning="-qinfo"
elif test "$GCC" = "yes"; then
- with_cflags_warning="-Wall -Wno-switch -Wmissing-prototypes"
+ with_cflags_warning="-Wall -Wno-switch -Wundef"
dnl This is not very useful, as it issues warnings that may appear
dnl or disappear rather randomly, cannot easily be fixed, and are
dnl not a big deal. If you want it, add it yourself.
＠＠ -2273,7 +2162,6 ＠＠
dnl Warnings about char subscripts are pretty pointless, though,
dnl and we use them in various places.
with_cflags_warning="$with_cflags_warning -Wsign-compare -Wno-char-subscripts"
- with_cflags_warning="$with_cflags_warning -Wundef -Wstrict-prototypes"
test "$__GCC3" = "yes" && with_cflags_warning="$with_cflags_warning -Wpacked"
dnl glibc is intentionally not `-Wpointer-arith'-clean.
dnl Ulrich Drepper has rejected patches to fix the glibc header files.
＠＠ -2294,6 +2182,7 ＠＠
xe_cflags_warning="$with_cflags_warning -Wunused-parameter"
fi
with_cflags_warning="$with_cflags_warning -Wshadow -Wmissing-declarations"
+ with_cflags_warning="$with_cflags_warning -Wmissing-prototypes -Wstrict-prototypes"
dnl **** If more gcc/g++ flags are added, from here on must handle
dnl **** with_cflags_warning and xe_cflags_warning in parallel
elif test "$__ICC" = "yes"; then
＠＠ -2785,7 +2674,7 ＠＠
dnl Try this again when 2.1 hits the streets.
dnl Avoid using free-hook.c if support exists for malloc debugging in libc
dnl have_libmcheck=no
-dnl if test "$error_check_malloc" = "yes" -a \
+dnl if test "$enable_error_checking_malloc" = "yes" -a \
dnl "$have_glibc" = "yes" -a \
dnl "$doug_lea_malloc" = "yes"; then
dnl AC_CHECK_HEADERS(mcheck.h)
＠＠ -3508,12 +3397,12 ＠＠
dnl if test "$with_tty" = "no" ; then
dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.])
dnl fi
- for feature in tooltalk cde offix wmcommand xim xmu nas_sound
+ for feature in with_tooltalk with_cde with_offix with_wmcommand with_xim with_xmu enable_sound_nas
do
- if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
- AC_MSG_WARN([--with-$feature ignored: Not valid without X support])
+ if eval "test -n \"\${feature}\" -a \"\${feature}\" != no" ; then
+ AC_MSG_WARN([--$feature ignored: Not valid without X support])
fi
- eval "with_${feature}=no"
+ eval "${feature}=no"
done
fi
＠＠ -4846,9 +4735,9 ＠＠
dnl Autodetect native sound
AC_CHECKING("for sound support")
-test -z "$with_native_sound" -a -n "$with_native_sound_lib" && with_native_sound=yes
+test -n "$with_native_sound_lib" && enable_sound_native=yes
-if test "$with_native_sound" != "no"; then
+if test "$enable_sound_native" != "no"; then
dnl Maybe sound is already on include path...
if test -n "$with_native_sound_lib"; then
AC_CHECK_HEADER(multimedia/audio_device.h,
＠＠ -4928,7 +4817,7 ＠＠
fi
if test "$sound_found" = "yes"; then
- with_native_sound=yes
+ enable_sound_native=yes
dnl NetBSD can use Linux's sound API, but it needs an extra library at
dnl link time to do so. (OpenBSD apparently needs the same; not written
＠＠ -4936,20 +4825,25 ＠＠
if test "$opsys" = "netbsd" ; then
AC_CHECK_LIB(ossaudio, _oss_ioctl, native_sound_lib="-lossaudio")
fi
+ else
+ if test "$enable_sound_native" = "yes" ; then
+ AC_MSG_WARN([No native libraries found. Disabling native sound support.])
+ fi
+ enable_sound_native=no
fi
fi
-if test "$with_native_sound" = "yes"; then
+if test "$enable_sound_native" = "yes"; then
AC_DEFINE(HAVE_NATIVE_SOUND)
test -n "$with_native_sound_lib" && XE_PREPEND($with_native_sound_lib, LIBS)
fi
dnl NAS Sound support
-if test "$with_nas_sound" != "no"; then
+if test "$enable_sound_nas" != "no"; then
AC_CHECK_HEADER(audio/audiolib.h, [
AC_CHECK_LIB(audio, AuOpenServer, have_nas_sound=yes)])
if test "$have_nas_sound" = "yes"; then
- with_nas_sound=yes
+ enable_sound_nas=yes
AC_DEFINE(HAVE_NAS_SOUND)
XE_ADD_OBJS(nas.o)
XE_PREPEND(-laudio, libs_x)
＠＠ -4957,14 +4851,14 ＠＠
dnl then we force safer behavior.
AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[old_nas=yes; AC_DEFINE(NAS_NO_ERROR_JUMP)])
else
- test "$with_nas_sound" = "yes" && \
+ test "$enable_sound_nas" = "yes" && \
XE_DIE("Required NAS sound support cannot be provided.")
- with_nas_sound=no
+ enable_sound_nas=no
fi
fi
dnl ESD Sound support
-if test "$with_esd_sound" != "no"; then
+if test "$enable_sound_esd" != "no"; then
AC_CHECK_PROG(have_esd_config, esd-config, yes, no)
if test "$have_esd_config" = "yes"; then
save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
＠＠ -4976,14 +4870,14 ＠＠
fi
if test "$have_esd_sound" = "yes"; then
- with_esd_sound=yes
+ enable_sound_esd=yes
need_miscplay=yes
XE_ADD_OBJS(esd.o)
AC_DEFINE(HAVE_ESD_SOUND)
else
- test "$with_esd_sound" = "yes" && \
+ test "$enable_sound_esd" = "yes" && \
XE_DIE("Required ESD sound support cannot be provided.")
- with_esd_sound=no
+ enable_sound_esd=no
fi
fi
＠＠ -5080,45 +4974,45 ＠＠
dnl On FreeBSD, both DB and DBM are part of libc.
dnl By default, we check for DBM support in libgdbm, then libc, then libdbm.
-test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
+test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
!= "no no no" && AC_CHECKING(for database support)
dnl Check for ndbm.h, required for either kind of DBM support.
-if test "$with_database_gdbm $with_database_dbm" != "no no"; then
+if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then
AC_CHECK_HEADER(ndbm.h, [:], [
- test "$with_database_gdbm" = "yes" -o \
- "$with_database_dbm" = "yes" && \
+ test "$enable_database_gdbm" = "yes" -o \
+ "$enable_database_dbm" = "yes" && \
XE_DIE("Required DBM support cannot be provided.")
- with_database_gdbm=no with_database_dbm=no])
+ enable_database_gdbm=no enable_database_dbm=no])
fi
dnl Check for DBM support in libgdbm.
-if test "$with_database_gdbm" != "no"; then
+if test "$enable_database_gdbm" != "no"; then
AC_CHECK_LIB(gdbm, dbm_open, [
- with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
- if test "$with_database_gdbm" = "yes"; then
+ enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm], [
+ if test "$enable_database_gdbm" = "yes"; then
XE_DIE("Required GNU DBM support cannot be provided.")
fi
- with_database_gdbm=no])
+ enable_database_gdbm=no])
fi
dnl Check for DBM support in libc and libdbm.
-if test "$with_database_dbm" != "no"; then
- AC_CHECK_FUNC(dbm_open, [with_database_dbm=yes libdbm=], [
- AC_CHECK_LIB(dbm, dbm_open, [with_database_dbm=yes libdbm=-ldbm], [
- test "$with_database_dbm" = "yes" && \
+if test "$enable_database_dbm" != "no"; then
+ AC_CHECK_FUNC(dbm_open, [enable_database_dbm=yes libdbm=], [
+ AC_CHECK_LIB(dbm, dbm_open, [enable_database_dbm=yes libdbm=-ldbm], [
+ test "$enable_database_dbm" = "yes" && \
XE_DIE("Required DBM support cannot be provided.")
- with_database_dbm=no])])
+ enable_database_dbm=no])])
fi
dnl Tell make about the DBM support we detected.
test -n "$libdbm" && XE_PREPEND("$libdbm", LIBS)
-test "$with_database_gdbm" = "yes" -o \
- "$with_database_dbm" = "yes" && \
+test "$enable_database_gdbm" = "yes" -o \
+ "$enable_database_dbm" = "yes" && \
AC_DEFINE(HAVE_DBM)
dnl Check for Berkeley DB.
-if test "$with_database_berkdb" != "no"; then
+if test "$enable_database_berkdb" != "no"; then
AC_MSG_CHECKING(for Berkeley db.h)
for header in "db/db.h" "db.h"; do
AC_TRY_COMPILE([
＠＠ -5139,11 +5033,11 ＠＠
],[], db_h_file="$header"; break)
done
if test -z "$db_h_file"
- then AC_MSG_RESULT(no); with_database_berkdb=no
+ then AC_MSG_RESULT(no); enable_database_berkdb=no
else AC_MSG_RESULT($db_h_file)
fi
- if test "$with_database_berkdb" != "no"; then
+ if test "$enable_database_berkdb" != "no"; then
AC_MSG_CHECKING(for Berkeley DB version)
AC_EGREP_CPP(yes,
[#include <$db_h_file>
＠＠ -5164,12 +5058,12 ＠＠
AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
- AC_CHECK_FUNC($dbfunc, with_database_berkdb=yes need_libdb=no, [
- AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)])
+ AC_CHECK_FUNC($dbfunc, enable_database_berkdb=yes need_libdb=no, [
+ AC_CHECK_LIB(db, $dbfunc, enable_database_berkdb=yes need_libdb=yes)])
fi
dnl Berk db 4.1 decorates public functions with version information
- if test "$with_database_berkdb" != "yes" -a "$dbver" = "4"; then
+ if test "$enable_database_berkdb" != "yes" -a "$dbver" = "4"; then
rm -f $tempcname
echo "#include <$db_h_file>" > $tempcname
echo "configure___ dbfunc=db_create" >> $tempcname
＠＠ -5178,18 +5072,18 ＠＠
| sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"`
rm -f $tempcname
AC_MSG_WARN("db_create is really $dbfunc")
- AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)
+ AC_CHECK_LIB(db, $dbfunc, enable_database_berkdb=yes need_libdb=yes)
fi
- if test "$with_database_berkdb" = "yes"; then
+ if test "$enable_database_berkdb" = "yes"; then
AC_DEFINE_UNQUOTED(DB_H_FILE, "$db_h_file")
AC_DEFINE(HAVE_BERKELEY_DB)
test "$need_libdb" = "yes" && XE_PREPEND(-ldb, LIBS)
- else with_database_berkdb=no
+ else enable_database_berkdb=no
fi
fi
-if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
+if test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
!= "no no no"; then
AC_DEFINE(HAVE_DATABASE)
fi
＠＠ -5830,16 +5724,16 ＠＠
echo "
Sound:"
-test "$with_native_sound" = yes && echo " Compiling in support for sound (native)."
-test "$with_nas_sound" = yes && echo " Compiling in support for NAS (network audio system)."
+test "$enable_sound_native" = yes && echo " Compiling in support for sound (native)."
+test "$enable_sound_nas" = yes && echo " Compiling in support for NAS (network audio system)."
test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously."
-test "$with_esd_sound" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)."
+test "$enable_sound_esd" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)."
echo "
Databases:"
-test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley database."
-test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
-test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
+test "$enable_database_berkdb" = yes && echo " Compiling in support for Berkeley database."
+test "$enable_database_dbm" = yes && echo " Compiling in support for DBM."
+test "$enable_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
test "$with_ldap" = yes && echo " Compiling in support for LDAP."
if test "$with_postgresql" = yes; then
echo " Compiling in support for PostgreSQL."
＠＠ -5891,7 +5785,7 ＠＠
test "$enable_pdump" = yes && echo " Using the new portable dumper."
test "$enable_debug" = yes && echo " Compiling in support for extra debugging code."
test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)."
-if test "$error_check_extents $error_check_types $error_check_text $error_check_gc $error_check_malloc $error_check_glyphs $error_check_byte_code $error_check_display $error_check_structures" \
+if test "$enable_error_checking_extents $enable_error_checking_types $enable_error_checking_text $enable_error_checking_gc $enable_error_checking_malloc $enable_error_checking_glyphs $enable_error_checking_byte_code $enable_error_checking_display $enable_error_checking_structures" \
!= "no no no no no no no no no"; then
echo " Compiling in support for runtime error checking."
echo " WARNING: ---------------------------------------------------------"
- 1 participants
- 0 comments
Notice of CVSROOT-commit by viteno in CVSROOT
19 years, 10 months
CVS Monitor
CVS Monitor
Commit done by viteno
Fri Feb 11 13:17:08 CET 2005
Update of /pack/xemacscvs/CVSROOT
In directory sunsite.dk:/tmp/cvs-serv11432
Modified Files:
ChangeLog modules
Log Message:
Additions to the packages module
Malcolm Purvis <malcolmp(a)xemacs.org>
<m2zmyiuejm.fsf(a)silver.local>
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: xemacs ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/10 23:51:35
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1062 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1061
retrieving revision 1.1062
diff -u -r1.1061 -r1.1062
--- version.sh 2005/02/09 22:51:28 1.1061
+++ version.sh 2005/02/10 22:51:34 1.1062
＠＠ -8,4 +8,4 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050209)"
+xemacs_extra_name="(+CVS-20050210)"
- 1 participants
- 0 comments
CVS update by scop MODIFIED: packages/unsupported/scop/vc, vc-mcvs.el ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: scop
Date: 05/02/10 23:34:15
Modified: packages/unsupported/scop/vc ChangeLog vc-cvs.el vc-hooks.el
vc-mcvs.el vc-svn.el vc.el
Log:
Sync vc with upstream.
Revision Changes Path
1.37 +2 -2 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- STATUS 2005/01/19 21:42:18 1.36
+++ STATUS 2005/02/10 22:34:10 1.37
＠＠ -13,9 +13,9 ＠＠
- Compiles, I have no idea whether it works or not.
generic-modes: generic.el and generic-x.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2005-01-19.
+- Up to date with GNU Emacs CVS HEAD as of 2005-02-11.
- Compiles, seems to work, auto-mode-alist and autoloads need spanking.
vc: vc*.el from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2005-01-19.
+- Up to date with GNU Emacs CVS HEAD as of 2005-02-11.
- Compiles, something even works.
1.22 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 2005/01/19 21:42:20 1.21
+++ ChangeLog 2005/02/10 22:34:13 1.22
＠＠ -1,3 +1,7 ＠＠
+2005-02-11 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc*.el: Sync with upstream.
+
2005-01-19 Ville Skyttä <scop(a)xemacs.org>
* vc*.el: Sync with upstream.
1.8 +4 -4 XEmacs/packages/unsupported/scop/vc/vc-cvs.el
Index: vc-cvs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-cvs.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vc-cvs.el 2005/01/19 21:42:20 1.7
+++ vc-cvs.el 2005/02/10 22:34:13 1.8
＠＠ -49,7 +49,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-cvs-register-switches nil
＠＠ -113,7 +113,7 ＠＠
Format is according to `format-time-string'. Only used if
`vc-cvs-sticky-tag-display' is t."
:type '(string)
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-cvs-sticky-tag-display t
＠＠ -152,7 +152,7 ＠＠
See also variable `vc-cvs-sticky-date-format-string'."
:type '(choice boolean function)
- :version "21.4"
+ :version "22.1"
:group 'vc)
;;;
＠＠ -555,7 +555,7 ＠＠
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
1)
- (let* ((async (and (not vc-disable-async-diff)
+ (let* ((async (and (not vc-disable-async-diff)
(vc-stay-local-p file)
(fboundp 'start-process)))
(status (apply 'vc-cvs-command (or buffer "*vc-diff*")
1.6 +10 -3 XEmacs/packages/unsupported/scop/vc/vc-hooks.el
Index: vc-hooks.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-hooks.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vc-hooks.el 2004/12/06 19:26:11 1.5
+++ vc-hooks.el 2005/02/10 22:34:13 1.6
＠＠ -156,7 +156,7 ＠＠
(set :format "%v" :inline t (const :format "%t" :tag "don't" except))
(regexp :format " stay local,\n%t: %v" :tag "if it matches")
(repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defun vc-stay-local-p (file)
＠＠ -643,8 +643,15 ＠＠
(unless (and (fboundp 'msdos-long-file-names)
(not (with-no-warnings (msdos-long-file-names))))
(vc-delete-automatic-version-backups file)
- (copy-file file (vc-version-backup-file-name file)
- nil 'keep-date)))
+ (condition-case nil
+ (copy-file file (vc-version-backup-file-name file)
+ nil 'keep-date)
+ ;; It's ok if it doesn't work (e.g. directory not writable),
+ ;; since this is just for efficiency.
+ (file-error
+ (message
+ (concat "Warning: Cannot make version backup; "
+ "diff/revert therefore not local"))))))
(defun vc-before-save ()
"Function to be called by `basic-save-buffer' (in files.el)."
1.6 +6 -6 XEmacs/packages/unsupported/scop/vc/vc-mcvs.el
Index: vc-mcvs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-mcvs.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vc-mcvs.el 2005/01/19 21:42:20 1.5
+++ vc-mcvs.el 2005/02/10 22:34:13 1.6
＠＠ -70,7 +70,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-mcvs-register-switches nil
＠＠ -82,7 +82,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-mcvs-diff-switches nil
＠＠ -92,13 +92,13 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist))
vc-cvs-header)
"*Header keywords to be inserted by `vc-insert-headers'."
- :version "21.4"
+ :version "22.1"
:type '(repeat string)
:group 'vc)
＠＠ -107,7 +107,7 ＠＠
This is only meaningful if you don't use the implicit checkout model
\(i.e. if you have $CVSREAD set)."
:type 'boolean
- :version "21.4"
+ :version "22.1"
:group 'vc)
;;;
＠＠ -451,7 +451,7 ＠＠
;; Even if it's empty, it's locally modified.
1)
(let* ((async (and (not vc-disable-async-diff)
- (vc-stay-local-p file)
+ (vc-stay-local-p file)
(fboundp 'start-process)))
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
1.9 +5 -5 XEmacs/packages/unsupported/scop/vc/vc-svn.el
Index: vc-svn.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-svn.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vc-svn.el 2005/01/19 21:42:20 1.8
+++ vc-svn.el 2005/02/10 22:34:14 1.9
＠＠ -52,7 +52,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-svn-register-switches nil
＠＠ -64,7 +64,7 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-svn-diff-switches
＠＠ -78,12 +78,12 ＠＠
(repeat :tag "Argument List"
:value ("")
string))
- :version "21.4"
+ :version "22.1"
:group 'vc)
(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$"))
"*Header keywords to be inserted by `vc-insert-headers'."
- :version "21.4"
+ :version "22.1"
:type '(repeat string)
:group 'vc)
＠＠ -93,7 +93,7 ＠＠
This is only meaningful if you don't use the implicit checkout model
\(i.e. if you have $SVNREAD set)."
;; :type 'boolean
- ;; :version "21.4"
+ ;; :version "22.1"
;; :group 'vc
)
1.10 +1 -1 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vc.el 2005/01/19 21:42:20 1.9
+++ vc.el 2005/02/10 22:34:14 1.10
＠＠ -577,7 +577,7 ＠＠
:type '(choice (const :tag "No" nil)
(const :tag "Yes" t))
:group 'vc
- :version "21.4")
+ :version "22.1")
;;;###autoload
(defcustom vc-checkout-hook nil
- 1 participants
- 0 comments