April 2006 - xemacs-cvs＠xemacs.org - XEmacs Mailing List Archives

CVS update by scop packages/unsupported/scop/vc ... 18 years

CVS Monitor

User: scop Date: 06/05/01 00:43:03 Modified: packages/unsupported/scop/vc ChangeLog vc.el Log: Cope without log-view.el. Revision Changes Path 1.49 +5 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -r1.48 -r1.49 --- ChangeLog 2006/04/29 19:27:39 1.48 +++ ChangeLog 2006/04/30 22:43:01 1.49 ＠＠ -1,3 +1,8 ＠＠ +2006-05-01 Ville Skyttä <scop(a)xemacs.org> + + * vc.el (vc-default-show-log-entry): Workaround for (at least so + far) missing log-view stuff. + 2006-04-29 Ville Skyttä <scop(a)xemacs.org> * vc.el (vc-annotate-warp-version): Use `forward-line' instead 1.27 +8 -2 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.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- vc.el 2006/04/29 19:27:39 1.26 +++ vc.el 2006/04/30 22:43:01 1.27 ＠＠ -2435,7 +2435,7 ＠＠ If FOCUS-REV is non-nil, leave the point (vc-call print-log file) (set-buffer "*vc*")))) (pop-to-buffer (current-buffer)) - ;; XEmacs: we don't have log-view-mode... maybe, yet! -> ignore-errors + ;; XEmacs: we don't have log-view-mode (yet?), so use ignore-errors here (ignore-errors (log-view-mode)) (vc-exec-after `(let ((inhibit-read-only t)) ＠＠ -2455,7 +2455,13 ＠＠ If FOCUS-REV is non-nil, leave the point (defun vc-default-show-log-entry (backend rev) (with-no-warnings - (log-view-goto-rev rev))) + ;; XEmacs: we don't have log-view-mode (yet?), so let's try at least + ;; something that could work for CVS and Subversion until it is. + (if (fboundp 'log-view-goto-rev) + (log-view-goto-rev rev) + (and (re-search-forward (concat "^r\$evision \$?" (regexp-quote rev) + "\$\\s-+\\|$\$") nil t) + (beginning-of-line))))) (defun vc-default-comment-history (backend file) "Return a string with all log entries stored in BACKEND for FILE."

1 participants
0 comments

CVS update by viteno xemacs ... 18 years

CVS Monitor

User: viteno Date: 06/04/30 23:51:12 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1516 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1515 retrieving revision 1.1516 diff -u -p -r1.1515 -r1.1516 --- version.sh 2006/04/29 21:51:13 1.1515 +++ version.sh 2006/04/30 21:51:11 1.1516 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060429)" +xemacs_extra_name="(+CVS-20060430)" xemacs_release_date="2006-04-01"

1 participants
0 comments

CVS update by viteno xemacs ... 18 years

CVS Monitor

User: viteno Date: 06/04/29 23:51:14 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1515 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1514 retrieving revision 1.1515 diff -u -p -r1.1514 -r1.1515 --- version.sh 2006/04/28 21:51:06 1.1514 +++ version.sh 2006/04/29 21:51:13 1.1515 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060428)" +xemacs_extra_name="(+CVS-20060429)" xemacs_release_date="2006-04-01"

1 participants
0 comments

CVS update by scop packages/unsupported/scop ... 18 years

CVS Monitor

User: scop Date: 06/04/29 21:28:08 Modified: packages/unsupported/scop STATUS Log: Bump GNU sync/check dates. Revision Changes Path 1.61 +2 -2 XEmacs/packages/unsupported/scop/STATUS Index: STATUS =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- STATUS 2006/04/22 18:30:11 1.60 +++ STATUS 2006/04/29 19:28:08 1.61 ＠＠ -13,9 +13,9 ＠＠ ede: Emacs Development Environment, <htt - 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 2006-04-22. +- Up to date with GNU Emacs CVS HEAD as of 2006-04-29. - Compiles, seems to work, auto-mode-alist and autoloads may need spanking. vc: vc*.el and a few other related files from GNU Emacs -- Up to date with GNU Emacs CVS HEAD as of 2006-04-22. +- Up to date with GNU Emacs CVS HEAD as of 2006-04-29. - Compiles, something even works.

1 participants
0 comments

CVS update by scop packages/unsupported/scop/vc ... 18 years

CVS Monitor

User: scop Date: 06/04/29 21:27:40 Modified: packages/unsupported/scop/vc ChangeLog vc.el Log: Use (forward-line -1) instead of (previous-line). Revision Changes Path 1.48 +5 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- ChangeLog 2006/04/22 18:29:45 1.47 +++ ChangeLog 2006/04/29 19:27:39 1.48 ＠＠ -1,3 +1,8 ＠＠ +2006-04-29 Ville Skyttä <scop(a)xemacs.org> + + * vc.el (vc-annotate-warp-version): Use `forward-line' instead + of `previous-line'. + 2006-04-22 Ville Skyttä <scop(a)xemacs.org> * Makefile (VERSION): 0.03. 1.26 +2 -2 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.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- vc.el 2006/04/22 18:27:48 1.25 +++ vc.el 2006/04/29 19:27:39 1.26 ＠＠ -3287,8 +3287,8 ＠＠ revision." (if window (select-window window) (switch-to-buffer-other-window buf))) (goto-line (min oldline (progn (goto-char (point-max)) - ;; XEmacs: previous-line needs 1 arg - (previous-line 1) + ;; XEmacs: s/previous-line/forward-line/ + (forward-line -1) (line-number-at-pos)))))))) (defun vc-annotate-compcar (threshold a-list)

1 participants
0 comments

CVS update by aidan packages/xemacs-packages/semantic ... 18 years

CVS Monitor

User: aidan Date: 06/04/29 21:06:09 Modified: packages/xemacs-packages/semantic ChangeLog semantic-java.el Log: Fix \u problems in packages from my last commit. Revision Changes Path 1.23 +5 -0 XEmacs/packages/xemacs-packages/perl-modes/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/perl-modes/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- ChangeLog 2005/04/27 12:45:03 1.22 +++ ChangeLog 2006/04/29 19:06:05 1.23 ＠＠ -1,3 +1,8 ＠＠ +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * cperl-mode.el (cperl-short-docs): + '\u' => '\\u' as it should have been in the first place. + 2005-04-27 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.08 released. 1.10 +1 -1 XEmacs/packages/xemacs-packages/perl-modes/cperl-mode.el Index: cperl-mode.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/perl-modes/cperl-mode.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- cperl-mode.el 2005/04/27 11:16:56 1.9 +++ cperl-mode.el 2006/04/29 19:06:05 1.10 ＠＠ -7638,7 +7638,7 ＠＠ $~ The name of the current report format \\0 Octal char, e.g. \\033. \\E Case modification terminator. See \\Q, \\L, and \\U. \\L Lowercase until \\E . See also \l, lc. -\\U Upcase until \\E . See also \u, uc. +\\U Upcase until \\E . See also \\u, uc. \\Q Quote metacharacters until \\E . See also quotemeta. \\a Alarm character (octal 007). \\b Backspace character (octal 010). 1.41 +5 -0 XEmacs/packages/xemacs-packages/semantic/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/semantic/ChangeLog,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- ChangeLog 2006/02/28 06:19:44 1.40 +++ ChangeLog 2006/04/29 19:06:09 1.41 ＠＠ -1,3 +1,8 ＠＠ +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * semantic-java.el (semantic-java-keyword-table): + '\u' => '\\u' as it should have been in the first place. + 2006-02-28 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.20 released. 1.6 +1 -1 XEmacs/packages/xemacs-packages/semantic/semantic-java.el Index: semantic-java.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/semantic/semantic-java.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- semantic-java.el 2003/01/06 12:12:48 1.5 +++ semantic-java.el 2006/04/29 19:06:09 1.6 ＠＠ -497,7 +497,7 ＠＠ ("byte" summary "Integral primitive type (-128 to 127)") ("case" summary "switch(<expr>) {case <const-expr>: <stmts> ... }") ("catch" summary "try {<stmts>} catch(<parm>) {<stmts>} ... ") - ("char" summary "Integral primitive type ('\u0000' to '\uffff') (0 to 65535)") + ("char" summary "Integral primitive type ('\\u0000' to '\\uffff') (0 to 65535)") ("class" summary "Class declaration: class <name>") ("const" summary "Unused reserved word") ("continue" summary "continue [<label>] ;")

1 participants
0 comments

CVS update by aidan xemacs/lisp/mule ... 18 years

CVS Monitor

User: aidan Date: 06/04/29 20:55:32 Modified: xemacs/lisp/mule ethio-util.el Log: Fix trunk problems caused by my latest commit. Revision Changes Path 1.742 +5 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.741 retrieving revision 1.742 diff -u -p -r1.741 -r1.742 --- ChangeLog 2006/04/29 16:15:25 1.741 +++ ChangeLog 2006/04/29 18:55:27 1.742 ＠＠ -1,5 +1,10 ＠＠ 2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + * mule/ethio-util.el (ethio-fidel-to-java-buffer): + "\u" -> "\\u" as it should have been in the first place. + +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + * dumped-lisp.el (preloaded-file-list): Move loadhist earlier in the preloaded-file list. * help.el: 1.8 +1 -1 XEmacs/xemacs/lisp/mule/ethio-util.el Index: ethio-util.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/ethio-util.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ethio-util.el 2004/06/06 23:58:46 1.7 +++ ethio-util.el 2006/04/29 18:55:32 1.8 ＠＠ -1778,7 +1778,7 ＠＠ Each command is always surrounded by bra (defun ethio-fidel-to-java-buffer nil "Convert Ethiopic characters into the Java escape sequences. -Each escape sequence is of the form \uXXXX, where XXXX is the +Each escape sequence is of the form \\uXXXX, where XXXX is the character's codepoint (in hex) in Unicode. If `ethio-java-save-lowercase' is non-nil, use [0-9a-f].

1 participants
0 comments

CVS update by aidan xemacs/src ... 18 years

CVS Monitor

User: aidan Date: 06/04/29 18:15:33 Modified: xemacs/src ChangeLog doc.c symbols.c sysfile.h Log: Support builtin functions in find-function. Revision Changes Path 1.207 +9 -0 XEmacs/xemacs/lib-src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.206 retrieving revision 1.207 diff -u -p -r1.206 -r1.207 --- ChangeLog 2006/03/31 19:19:10 1.206 +++ ChangeLog 2006/04/29 16:15:21 1.207 ＠＠ -1,3 +1,12 ＠＠ +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * make-docfile.c: + * make-docfile.c (put_filename): + * make-docfile.c (scan_c_file): + * make-docfile.c (scan_lisp_file): + Record file name information for built-in symbols. Based on the + FSF's implementation of same. + 2006-03-31 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.26 "endive" is released. 1.18 +34 -0 XEmacs/xemacs/lib-src/make-docfile.c Index: make-docfile.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/make-docfile.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- make-docfile.c 2005/02/22 08:05:58 1.17 +++ make-docfile.c 2006/04/29 16:15:21 1.18 ＠＠ -44,6 +44,7 ＠＠ Boston, MA 02111-1307, USA. */ #include <config.h> #include <sysfile.h> +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> ＠＠ -58,6 +59,7 ＠＠ Boston, MA 02111-1307, USA. */ ('0' <= c && c <= '9') || \ (c == '_')) +static void put_filename (const char *filename); static int scan_file (const char *filename); static int read_c_string (FILE *, int, int); static void write_c_args (FILE *out, const char *func, char *buf, int minargs, ＠＠ -263,6 +265,30 ＠＠ main (int argc, char **argv) return err_count > 0; } +/* Add a source file name boundary in the output file. */ +static void +put_filename (const char *filename) +{ + const char *tmp; + + /* Why are we cutting this off? */ + for (tmp = filename; *tmp; tmp++) + { + if (IS_DIRECTORY_SEP(*tmp)) + filename = tmp + 1; + } + + /* <= because sizeof includes the nul byte at the end. Not quite right, + because it should include the length of the symbol + "\037[VF]" instead + of simply 10. */ + assert(sizeof("\037S\n") + strlen(filename) + 10 + <= DOC_MAX_FILENAME_LENGTH); + + putc (037, outfile); + putc ('S', outfile); + fprintf (outfile, "%s\n", filename); +} + /* Read file FILENAME and output its doc strings to outfile. */ /* Return 1 if file is not found, 0 if it is found. */ ＠＠ -864,11 +890,14 ＠＠ scan_c_file (const char *filename, const if (defunflag || defvarflag || c == '"') { /* XEmacs change: the original code is in the "else" clause */ + /* XXX Must modify the documentation file name code to handle + ELLCCs */ if (ellcc) fprintf (outfile, " CDOC%s(\"%s\", \"\\\n", defvarflag ? "SYM" : "SUBR", globalbuf); else { + put_filename (filename); /* XEmacs addition */ putc (037, outfile); putc (defvarflag ? 'V' : 'F', outfile); fprintf (outfile, "%s\n", globalbuf); ＠＠ -963,6 +992,10 ＠＠ scan_c_file (const char *filename, const The NAME and DOCSTRING are output. NAME is preceded by `F' for a function or `V' for a variable. An entry is output only if DOCSTRING has \ newline just after the opening " + + Adds the filename a symbol or function was found in before its docstring; + there's no need for this with the load-history available, but we do it for + consistency with the C parsing code. */ static void ＠＠ -1356,6 +1389,7 ＠＠ scan_lisp_file (const char *filename, co In the latter case, the opening quote (and leading backslash-newline) have already been read. */ + put_filename (filename); /* XEmacs addition */ putc ('\n', outfile); /* XEmacs addition */ putc (037, outfile); putc (type, outfile); 1.741 +19 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.740 retrieving revision 1.741 diff -u -p -r1.740 -r1.741 --- ChangeLog 2006/04/25 19:46:23 1.740 +++ ChangeLog 2006/04/29 16:15:25 1.741 ＠＠ -1,3 +1,22 ＠＠ +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * dumped-lisp.el (preloaded-file-list): + Move loadhist earlier in the preloaded-file list. + * help.el: + * help.el (help-mode-map): Add bindings to find the source code of + a function, notably when that function's in C. + * help.el (describe-function-find-file, describe-symbol-find-file): + Removed. Use symbol-file from loadhist.el instead. + * help.el (frob-help-extents): + * help.el (describe-function-1): + Allow built-in function file names to be hyperlinks. + * help.el (describe-variable): + * help.el (help-find-source-or-scroll-up): New. + * help.el (help-mouse-find-source-or-track): New. + Make describe-function a bit more mouse-friendly, basically. + * loadhist.el (symbol-file): + Support looking up builtin symbols using built-in-symbol-file. + 2006-04-23 Ville Skyttä <scop(a)xemacs.org> * simple.el (goto-line): Add optional `buffer' argument, from 1.59 +2 -1 XEmacs/xemacs/lisp/dumped-lisp.el Index: dumped-lisp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/dumped-lisp.el,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- dumped-lisp.el 2006/04/23 16:11:22 1.58 +++ dumped-lisp.el 2006/04/29 16:15:26 1.59 ＠＠ -92,6 +92,8 ＠＠ in dumped-lisp.el and is not itself list ; `emacs-user-extension-dir' "misc" ;; (pureload "profile") + "loadhist" ; Must be dumped before loaddefs is loaded + ; Used by help. "help" ;; (pureload "hyper-apropos") Soon... "files" ＠＠ -308,7 +310,6 ＠＠ in dumped-lisp.el and is not itself list ;; "sun-eos-debugger" ;; "sun-eos-debugger-extra" ;; "sun-eos-menubar")) - "loadhist" ; Must be dumped before loaddefs is loaded "loaddefs" ; <=== autoloads get loaded here )) 1.48 +65 -15 XEmacs/xemacs/lisp/help.el Index: help.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/help.el,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -r1.47 -r1.48 --- help.el 2005/11/16 12:13:02 1.47 +++ help.el 2006/04/29 16:15:26 1.48 ＠＠ -1,4 +1,4 ＠＠ -;;; help.el --- help commands for XEmacs. +;; help.el --- help commands for XEmacs. ;; Copyright (C) 1985, 1986, 1992-4, 1997 Free Software Foundation, Inc. ;; Copyright (C) 2001, 2002, 2003 Ben Wing. ＠＠ -41,6 +41,8 ＠＠ ;; or run interpreted, but not when the compiled code is loaded. (eval-when-compile (require 'help-macro)) +(require 'loadhist) ;; For symbol-file. + (defgroup help nil "Support for on-line help systems." :group 'emacs) ＠＠ -153,6 +155,8 ＠＠ Commands: (define-key help-mode-map "c" 'customize-variable) (define-key help-mode-map [tab] 'help-next-symbol) (define-key help-mode-map [(shift tab)] 'help-prev-symbol) +(define-key help-mode-map [return] 'help-find-source-or-scroll-up) +(define-key help-mode-map [button2] 'help-mouse-find-source-or-track) (define-key help-mode-map "n" 'help-next-section) (define-key help-mode-map "p" 'help-prev-section) ＠＠ -1091,14 +1095,14 ＠＠ unless the function is autoloaded." :type 'boolean :group 'help-appearance) -(defun describe-symbol-find-file (symbol) - (loop for (file . load-data) in load-history - do (when (memq symbol load-data) - (return file)))) +(define-obsolete-function-alias + ;; Moved to using the version in loadhist.el + 'describe-function-find-symbol + 'symbol-file) (define-obsolete-function-alias 'describe-function-find-file - 'describe-symbol-find-file) + 'symbol-file) (defun describe-function (function) "Display the full documentation of FUNCTION (a symbol). ＠＠ -1340,6 +1344,7 ＠＠ part of the documentation of internal su (when (or var fun) (let ((ex (make-extent b e))) (require 'hyper-apropos) + (set-extent-property ex 'mouse-face 'highlight) (set-extent-property ex 'help-symbol sym) (set-extent-property ex 'face 'hyper-apropos-hyperlink) ＠＠ -1421,10 +1426,21 ＠＠ part of the documentation of internal su (if autoload-file (princ (format " -- autoloads from \"%s\"\n" autoload-file))) (or file-name - (setq file-name (describe-symbol-find-file function))) - (if file-name - (princ (format " -- loaded from \"%s\"\n" file-name))) -;; (terpri) + (setq file-name (symbol-file function))) + (when file-name + (princ " -- loaded from \"") + (if (not (bufferp standard-output)) + (princ file-name) + (let ((opoint (point standard-output)) + e) + (require 'hyper-apropos) + (princ file-name) + (setq e (make-extent opoint (point standard-output) + standard-output)) + (set-extent-property e 'face 'hyper-apropos-hyperlink) + (set-extent-property e 'mouse-face 'highlight) + (set-extent-property e 'find-function-symbol function))) + (princ "\"\n")) (if describe-function-show-arglist (let ((arglist (function-arglist function))) (when arglist ＠＠ -1469,7 +1485,6 ＠＠ part of the documentation of internal su (eq ?\n (aref doc (1- (length doc))))) (terpri))))))))) - ;;; [Obnoxious, whining people who complain very LOUDLY on Usenet ;;; are binding this to keys.] (defun describe-function-arglist (function) ＠＠ -1590,11 +1605,22 ＠＠ there is no variable around that point, (princ (format "%s" aliases))) (princ (built-in-variable-doc variable)) (princ ".\n") - (let ((file-name (describe-symbol-find-file variable))) - (if file-name - (princ (format " -- loaded from \"%s\"\n" file-name)))) - (princ "\nValue: ") (require 'hyper-apropos) + (let ((file-name (symbol-file variable)) + opoint e) + (when file-name + (princ " -- loaded from \"") + (if (not (bufferp standard-output)) + (princ file-name) + (setq opoint (point standard-output)) + (princ file-name) + (setq e (make-extent opoint (point standard-output) + standard-output)) + (set-extent-property e 'face 'hyper-apropos-hyperlink) + (set-extent-property e 'mouse-face 'highlight) + (set-extent-property e 'find-variable-symbol variable)) + (princ"\"\n"))) + (princ "\nValue: ") (if (not (boundp variable)) (Help-princ-face "void\n" 'hyper-apropos-documentation) (Help-prin1-face (symbol-value variable) ＠＠ -1778,5 +1804,29 ＠＠ after the listing is made.)" (if (stringp string) (with-displaying-help-buffer (insert string))))) + +(defun help-find-source-or-scroll-up (&optional pos) + "Follow any cross reference to source code; if none, scroll up. " + (interactive "d") + (let ((e (extent-at pos nil 'find-function-symbol))) + (if e + (find-function (extent-property e 'find-function-symbol)) + (setq e (extent-at pos nil 'find-variable-symbol)) + (if e + (find-variable (extent-property e 'find-variable-symbol)) + (view-scroll-lines-up 1))))) + +(defun help-mouse-find-source-or-track (event) + "Follow any cross reference to source code under the mouse; +if none, call mouse-track. " + (interactive "e") + (mouse-set-point event) + (let ((e (extent-at (point) nil 'find-function-symbol))) + (if e + (find-function (extent-property e 'find-function-symbol)) + (setq e (extent-at (point) nil 'find-variable-symbol)) + (if e + (find-variable (extent-property e 'find-variable-symbol)) + (mouse-track event))))) ;;; help.el ends here 1.7 +9 -3 XEmacs/xemacs/lisp/loadhist.el Index: loadhist.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/loadhist.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- loadhist.el 2002/11/18 06:52:28 1.6 +++ loadhist.el 2006/04/29 16:15:26 1.7 ＠＠ -41,9 +41,15 ＠＠ "Return the input source from which SYM was loaded. This is a file name, or nil if the source was a buffer with no associated file." (interactive "SFind source file for symbol: ") ; XEmacs - (dolist (entry load-history) - (when (memq sym (cdr entry)) - (return (car entry))))) + (block look-up-symbol-file + (dolist (entry load-history) + (when (memq sym (cdr entry)) + (return-from look-up-symbol-file (car entry)))) + (when (or (and (boundp sym) (built-in-variable-type sym)) + (and (fboundp sym) (subrp (symbol-function sym)))) + (let ((built-in-file (built-in-symbol-file sym))) + (if built-in-file + (concat build-root "/src/" built-in-file)))))) (defun feature-symbols (feature) "Return the file and list of symbols associated with a given FEATURE." 1.951 +9 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.950 retrieving revision 1.951 diff -u -p -r1.950 -r1.951 --- ChangeLog 2006/04/29 14:36:56 1.950 +++ ChangeLog 2006/04/29 16:15:29 1.951 ＠＠ -1,5 +1,14 ＠＠ 2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + * doc.c: + * doc.c (extract_object_file_name): + * doc.c (get_object_file_name): + * doc.c (Fbuilt_in_symbol_file): + Support saving and recovering the source file name of a built-in + symbol (that is, one created in C.) + +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + * lread.c: * lread.c (read_escape): Support \uABCD and \U00ABCDEF for specifying characters by their 1.36 +266 -12 XEmacs/xemacs/src/doc.c Index: doc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/doc.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- doc.c 2005/10/25 11:16:22 1.35 +++ doc.c 2006/04/29 16:15:30 1.36 ＠＠ -39,11 +39,128 ＠＠ Lisp_Object Vinternal_doc_file_name; Lisp_Object QSsubstitute; -/* Read and return doc string or instructions from open file descriptor FD - at position POSITION. Does not close the file. Returns string; or if - error, returns a cons holding the error data to pass to Fsignal. - NAME_NONRELOC and NAME_RELOC are only used for the error messages. */ +/* Work out what source file a function or variable came from, taking the + information from the documentation file. */ +static Lisp_Object +extract_object_file_name (int fd, EMACS_INT doc_pos, + Ibyte *name_nonreloc, Lisp_Object name_reloc, + int standard_doc_file) +{ + Ibyte buf[DOC_MAX_FILENAME_LENGTH]; + Ibyte *buffer = buf; + int buffer_size = sizeof (buf), space_left; + Ibyte *from, *to; + REGISTER Ibyte *p = buffer; + Lisp_Object return_me; + Lisp_Object fdstream = Qnil, instream = Qnil; + struct gcpro gcpro1, gcpro2; + EMACS_INT position, seenS = 0; + + GCPRO2 (fdstream, instream); + + position = doc_pos > DOC_MAX_FILENAME_LENGTH ? + doc_pos - DOC_MAX_FILENAME_LENGTH : 0; + + if (0 > lseek (fd, position, 0)) + { + if (name_nonreloc) + name_reloc = build_intstring (name_nonreloc); + return_me = list3 (build_msg_string + ("Position out of range in doc string file"), + name_reloc, make_int (position)); + goto done; + } + + fdstream = make_filedesc_input_stream (fd, 0, -1, 0); + Lstream_set_buffering (XLSTREAM (fdstream), LSTREAM_UNBUFFERED, 0); + instream = + make_coding_input_stream + (XLSTREAM (fdstream), standard_doc_file ? Qescape_quoted : Qbinary, + CODING_DECODE, 0); + Lstream_set_buffering (XLSTREAM (instream), LSTREAM_UNBUFFERED, 0); + + space_left = buffer_size - (p - buffer); + while (space_left > 0) + { + int nread; + + nread = Lstream_read (XLSTREAM (instream), p, space_left); + if (nread < 0) + { + return_me = list1 (build_msg_string + ("Read error on documentation file")); + goto done; + } + + p[nread] = 0; + + if (!nread) + break; + + p += nread; + space_left = buffer_size - (p - buffer); + } + + /* First, search backward for the "\037S" that marks the beginning of the + file name, then search forward from that to the newline or to the end + of the buffer. */ + from = p; + + while (from > buf) + { + --from; + if (seenS) + { + if ('\037' == *from) + { + /* Got a file name; adjust `from' to point to it, break out of + the loop. */ + from += 2; + break; + } + } + /* Is *from 'S' ? */ + seenS = ('S' == *from); + } + + if (buf == from) + { + /* We've scanned back to the beginning of the buffer without hitting + the file name. Either the file name plus the symbol name is longer + than DOC_MAX_FILENAME_LENGTH--which shouldn't happen, because it'll + trigger an assertion failure in make-docfile, the DOC file is + corrupt, or it was produced by a version of make-docfile that + doesn't store the file name with the symbol name and docstring. */ + return_me = list1 (build_msg_string + ("Object file name not stored in doc file")); + goto done; + } + + to = from; + /* Search for the end of the file name. */ + while (++to < p) + { + if ('\n' == *to || '\037' == *to) + { + break; + } + } + + /* Don't require the file name to end in a newline. */ + return_me = make_string (from, to - from); + + done: + if (!NILP (instream)) + { + Lstream_delete (XLSTREAM (instream)); + Lstream_delete (XLSTREAM (fdstream)); + } + + UNGCPRO; + return return_me; +} + Lisp_Object unparesseuxify_doc_string (int fd, EMACS_INT position, Ibyte *name_nonreloc, Lisp_Object name_reloc, ＠＠ -287,6 +404,150 ＠＠ read_doc_string (Lisp_Object filepos) return Fread (string); } +static Lisp_Object +get_object_file_name (Lisp_Object filepos) +{ + REGISTER int fd; + REGISTER Ibyte *name_nonreloc = 0; + EMACS_INT position; + Lisp_Object file, tem; + Lisp_Object name_reloc = Qnil; + int standard_doc_file = 0; + + if (INTP (filepos)) + { + file = Vinternal_doc_file_name; + standard_doc_file = 1; + position = XINT (filepos); + } + else if (CONSP (filepos) && INTP (XCDR (filepos))) + { + file = XCAR (filepos); + position = XINT (XCDR (filepos)); + if (position < 0) + position = - position; + } + else + return Qnil; + + if (!STRINGP (file)) + return Qnil; + + /* Put the file name in NAME as a C string. + If it is relative, combine it with Vdoc_directory. */ + + tem = Ffile_name_absolute_p (file); + if (NILP (tem)) + { + Bytecount minsize; + /* XEmacs: Move this check here. OK if called during loadup to + load byte code instructions. */ + if (!STRINGP (Vdoc_directory)) + return Qnil; + + minsize = XSTRING_LENGTH (Vdoc_directory); + /* sizeof ("../lib-src/") == 12 */ + if (minsize < 12) + minsize = 12; + name_nonreloc = alloca_ibytes (minsize + XSTRING_LENGTH (file) + 8); + string_join (name_nonreloc, Vdoc_directory, file); + } + else + name_reloc = file; + + fd = qxe_open (name_nonreloc ? name_nonreloc : + XSTRING_DATA (name_reloc), O_RDONLY | OPEN_BINARY, 0); + if (fd < 0) + { + if (purify_flag) + { + /* sizeof ("../lib-src/") == 12 */ + name_nonreloc = alloca_ibytes (12 + XSTRING_LENGTH (file) + 8); + /* Preparing to dump; DOC file is probably not installed. + So check in ../lib-src. */ + qxestrcpy_ascii (name_nonreloc, "../lib-src/"); + qxestrcat (name_nonreloc, XSTRING_DATA (file)); + + fd = qxe_open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0); + } + + if (fd < 0) + report_file_error ("Cannot open doc string file", + name_nonreloc ? build_intstring (name_nonreloc) : + name_reloc); + } + + tem = extract_object_file_name (fd, position, name_nonreloc, name_reloc, + standard_doc_file); + retry_close (fd); + + if (!STRINGP (tem)) + signal_error_1 (Qinvalid_byte_code, tem); + + return tem; +} + + +static void +weird_doc (Lisp_Object sym, const CIbyte *weirdness, const CIbyte *type, + int pos) +{ + if (!strcmp (weirdness, GETTEXT ("duplicate"))) return; + message ("Note: Strange doc (%s) for %s %s ＠ %d", + weirdness, type, XSTRING_DATA (XSYMBOL (sym)->name), pos); +} + +DEFUN ("built-in-symbol-file", Fbuilt_in_symbol_file, 1, 1, 0, /* +Return the C source file built-in symbol SYM comes from. +Don't use this. Use the more general `symbol-file' (q.v.) instead. +*/ + (symbol)) +{ + /* This function can GC */ + Lisp_Object fun; + Lisp_Object filename = Qnil; + + if (EQ(Ffboundp(symbol), Qt)) + { + fun = Findirect_function (symbol); + + if (SUBRP (fun)) + { + if (XSUBR (fun)->doc == 0) + return Qnil; + + if ((EMACS_INT) XSUBR (fun)->doc >= 0) + { + weird_doc (symbol, "No file info available for function", + GETTEXT("function"), 0); + return Qnil; + } + else + filename = get_object_file_name + (make_int (- (EMACS_INT) XSUBR (fun)->doc)); + } + } + else if (EQ(Fboundp(symbol), Qt)) + { + Lisp_Object doc_offset = Fget (symbol, Qvariable_documentation, Qnil); + + if (!NILP(doc_offset)) + { + if (INTP(doc_offset)) + { + filename = get_object_file_name + (XINT (doc_offset) > 0 ? doc_offset + : make_int (- XINT (doc_offset))); + } + else if (CONSP(doc_offset)) + { + filename = get_object_file_name(doc_offset); + } + } + } + return filename; +} + DEFUN ("documentation", Fdocumentation, 1, 2, 0, /* Return the documentation string of FUNCTION. Unless a non-nil second argument RAW is given, the ＠＠ -419,14 +680,6 ＠＠ translation. return doc; } -static void -weird_doc (Lisp_Object sym, const CIbyte *weirdness, const CIbyte *type, - int pos) -{ - if (!strcmp (weirdness, GETTEXT ("duplicate"))) return; - message ("Note: Strange doc (%s) for %s %s ＠ %d", - weirdness, type, XSTRING_DATA (XSYMBOL (sym)->name), pos); -} DEFUN ("Snarf-documentation", Fsnarf_documentation, 1, 1, 0, /* Used during Emacs initialization, before dumping runnable Emacs, ＠＠ -1008,6 +1261,7 ＠＠ thus, \\=\\=\\=\\= puts \\=\\= into the void syms_of_doc (void) { + DEFSUBR (Fbuilt_in_symbol_file); DEFSUBR (Fdocumentation); DEFSUBR (Fdocumentation_property); DEFSUBR (Fsnarf_documentation); 1.56 +13 -0 XEmacs/xemacs/src/symbols.c Index: symbols.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- symbols.c 2006/02/27 16:29:28 1.55 +++ symbols.c 2006/04/29 16:15:30 1.56 ＠＠ -719,6 +719,18 ＠＠ Associates the function with the current return newdef; } +DEFUN ("subr-name", Fsubr_name, 1, 1, 0, /* +Return name of function SUBR. +SUBR must be a built-in function. +*/ + (subr)) +{ + const char *name; + if (!SUBRP (subr)) + wrong_type_argument (Qsubrp, subr); + name = XSUBR (subr)->name; + return make_string (name, strlen (name)); +} DEFUN ("setplist", Fsetplist, 2, 2, 0, /* Set SYMBOL's property list to NEWPLIST, and return NEWPLIST. ＠＠ -3706,6 +3718,7 ＠＠ syms_of_symbols (void) DEFSUBR (Ffset); DEFSUBR (Fdefine_function); Ffset (intern ("defalias"), intern ("define-function")); + DEFSUBR (Fsubr_name); DEFSUBR (Fsetplist); DEFSUBR (Fsymbol_value_in_buffer); DEFSUBR (Fsymbol_value_in_console); 1.22 +6 -2 XEmacs/xemacs/src/sysfile.h Index: sysfile.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysfile.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- sysfile.h 2005/10/25 11:16:28 1.21 +++ sysfile.h 2006/04/29 16:15:31 1.22 ＠＠ -447,8 +447,6 ＠＠ const char *strerror (int); separator. */ -#ifdef emacs - /* We used to put some of this stuff in the s+m files for the various types of MS Windows, but that's disingenuous. The various definitions above were specifically created for MS Windows, and the "if not, then ＠＠ -518,6 +516,12 ＠＠ DECLARE_INLINE_HEADER (int IS_ANY_SEP (I #define IS_ANY_SEP(c) IS_DIRECTORY_SEP (c) #endif /* WIN32_ANY */ + +/* How long can a source filename be in DOC (including "\037S" at the start + and "\n" at the end) ? */ +#define DOC_MAX_FILENAME_LENGTH 2048 + +#ifdef emacs #if defined (WIN32_NATIVE) #define PATHNAME_RESOLVE_LINKS(path, pathout) \

1 participants
0 comments

CVS update by aidan xemacs/src ... 18 years

CVS Monitor

User: aidan Date: 06/04/29 16:37:00 Modified: xemacs/src ChangeLog lread.c xft-fonts.h Log: Support Unicode escapes in the Lisp reader, taking the syntax from C#. Revision Changes Path 1.338 +6 -0 XEmacs/xemacs/man/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.337 retrieving revision 1.338 diff -u -p -r1.337 -r1.338 --- ChangeLog 2006/04/23 16:11:27 1.337 +++ ChangeLog 2006/04/29 14:36:49 1.338 ＠＠ -1,3 +1,9 ＠＠ +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * lispref/objects.texi (Character Type): + Document the Unicode syntax for characters in characters and + strings. + 2006-04-23 Stephen J. Turnbull <stephen(a)xemacs.org> * internals/internals.texi: Run texinfo-master-menu. 1.8 +16 -0 XEmacs/xemacs/man/lispref/objects.texi Index: objects.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/objects.texi,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- objects.texi 2003/06/30 09:31:01 1.7 +++ objects.texi 2006/04/29 14:36:54 1.8 ＠＠ -510,6 +510,21 ＠＠ with the legitimate ＠sc{iso}-8859-1 inte For example, character code 193 is a lowercase ＠samp{a} with an acute accent, in ＠sc{iso}-8859-1.) +＠cindex unicode character escape + From version 21.5.25 onwards, XEmacs provides a syntax for specifying +characters by their Unicode code points. ＠samp{?\uABCD} will give you +an XEmacs character that maps to the code point ＠samp{U+ABCD} in +Unicode-based representations (UTF-8 text files, Unicode-oriented fonts, +etc.) Just as in the C# language, there is a slightly different syntax +for specifying characters with code points above ＠samp{#xFFFF}; +＠samp{\U00ABCDEF} will give you an XEmacs character that maps to the +code point ＠samp{U+ABCDEF} in Unicode-based representations, if such an +XEmacs character exists. + + Unlike in C#, while this syntax is available for character literals, +and (see later) in strings, it is not available elsewhere in your Lisp +source code. + ＠ignore ＠c None of this crap applies to XEmacs. For use in strings and buffers, you are limited to the control characters that exist in ＠sc{ascii}, but for keyboard input purposes, ＠＠ -614,6 +629,7 ＠＠ bit values are 2**22 for alt, 2**23 for ＠cindex backslash in character constant ＠cindex octal character code ＠cindex hexadecimal character code + Finally, there are two read syntaxes involving character codes. It is not possible to represent multibyte or wide characters in this way; the permissible range of codes is from 0 to 255 (＠emph{i.e.}, 1.950 +7 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.949 retrieving revision 1.950 diff -u -p -r1.949 -r1.950 --- ChangeLog 2006/04/25 14:02:05 1.949 +++ ChangeLog 2006/04/29 14:36:56 1.950 ＠＠ -1,3 +1,10 ＠＠ +2006-04-29 Aidan Kehoe <kehoea(a)parhasard.net> + + * lread.c: + * lread.c (read_escape): + Support \uABCD and \U00ABCDEF for specifying characters by their + Unicode code point. + 2006-04-25 Stephen J. Turnbull <stephen(a)xemacs.org> Repair busted commit, plus some gratuitous doc improvements. 1.77 +48 -3 XEmacs/xemacs/src/lread.c Index: lread.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lread.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -p -r1.76 -r1.77 --- lread.c 2005/07/12 23:26:49 1.76 +++ lread.c 2006/04/29 14:36:57 1.77 ＠＠ -208,6 +208,8 ＠＠ static int saved_doc_string_position; static int locate_file_open_or_access_file (Ibyte *fn, int access_mode); EXFUN (Fread_from_string, 3); +EXFUN (Funicode_to_char, 2); /* In unicode.c. */ + /* When errors are signaled, the actual readcharfun should not be used as an argument if it is an lstream, so that lstreams don't escape to the Lisp level. */ ＠＠ -1675,6 +1677,9 ＠＠ read_escape (Lisp_Object readcharfun) { /* This function can GC */ Ichar c = readchar (readcharfun); + /* \u allows up to four hex digits, \U up to eight. Default to the + behaviour for \u, and change this value in the case that \U is seen. */ + int unicode_hex_count = 4; if (c < 0) signal_error (Qend_of_file, 0, READCHARFUN_MAYBE (readcharfun)); ＠＠ -1763,7 +1768,7 ＠＠ read_escape (Lisp_Object readcharfun) } } if (i >= 0400) - syntax_error ("Attempt to create non-ASCII/ISO-8859-1 character", + syntax_error ("Non-ISO-8859-1 character specified with octal escape", make_int (i)); return i; } ＠＠ -1791,11 +1796,51 ＠＠ read_escape (Lisp_Object readcharfun) } return i; } + case 'U': + /* Post-Unicode-2.0: Up to eight hex chars */ + unicode_hex_count = 8; + case 'u': + /* A Unicode escape, as in C# (though we only permit them in strings + and characters, not arbitrarily in the source code.) */ + { + REGISTER Ichar i = 0; + REGISTER int count = 0; + Lisp_Object lisp_char; + while (++count <= unicode_hex_count) + { + c = readchar (readcharfun); + /* Remember, can't use isdigit(), isalpha() etc. on Ichars */ + if (c >= '0' && c <= '9') i = (i << 4) + (c - '0'); + else if (c >= 'a' && c <= 'f') i = (i << 4) + (c - 'a') + 10; + else if (c >= 'A' && c <= 'F') i = (i << 4) + (c - 'A') + 10; + else + { + syntax_error ("Non-hex digit used for Unicode escape", + make_char (c)); + break; + } + } + + lisp_char = Funicode_to_char(make_int(i), Qnil); + + if (EQ(Qnil, lisp_char)) + { + /* This is ugly and horrible and trashes the user's data, but + it's what unicode.c does. In the future, unicode-to-char + should not return nil. */ #ifdef MULE - /* #### need some way of reading an extended character with - an escape sequence. */ + i = make_ichar (Vcharset_japanese_jisx0208, 34 + 128, 46 + 128); +#else + i = '~'; #endif + return i; + } + else + { + return XCHAR(lisp_char); + } + } default: return c; 1.4 +0 -71 XEmacs/xemacs/src/Attic/xft-fonts.h <<Binary file>>

1 participants
0 comments

CVS update by viteno xemacs ... 18 years

CVS Monitor

User: viteno Date: 06/04/28 23:51:07 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1514 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1513 retrieving revision 1.1514 diff -u -p -r1.1513 -r1.1514 --- version.sh 2006/04/27 21:51:09 1.1513 +++ version.sh 2006/04/28 21:51:06 1.1514 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20060427)" +xemacs_extra_name="(+CVS-20060428)" xemacs_release_date="2006-04-01"

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

xemacs-cvs April 2006