Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100031. ------------------------------------------------------------ revno: 100031 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-04-24 12:50:03 -0700 message: Minor simplications for src/m/amdx86-64.h. * m/amdx86-64.h (START_FILES, LIB_STANDARD) [__OpenBSD__]: For clarity, revert to using fixed /usr/lib rather than $CRT_DIR. (START_FILES, LIB_STANDARD) [__FreeBSD__]: Merge into the generic case, since CRT_DIR defaults to /usr/lib. Suggested by Dan Nicolaescu. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-04-24 12:33:31 +0000 +++ src/ChangeLog 2010-04-24 19:50:03 +0000 @@ -1,3 +1,10 @@ +2010-04-24 Glenn Morris + + * m/amdx86-64.h (START_FILES, LIB_STANDARD) [__OpenBSD__]: + For clarity, revert to using fixed /usr/lib rather than $CRT_DIR. + (START_FILES, LIB_STANDARD) [__FreeBSD__]: Merge into the generic case, + since CRT_DIR defaults to /usr/lib. Suggested by Dan Nicolaescu. + 2010-04-24 Eli Zaretskii * xdisp.c (display_line): Use `reseat' instead of `reseat_1', and === modified file 'src/m/amdx86-64.h' --- src/m/amdx86-64.h 2010-04-24 02:30:11 +0000 +++ src/m/amdx86-64.h 2010-04-24 19:50:03 +0000 @@ -72,30 +72,12 @@ /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ #undef DATA_SEG_BITS -#ifdef __FreeBSD__ - -/* The libraries for binaries native to the build host's architecture are - installed under /usr/lib in FreeBSD, and the ones that need special paths - are 32-bit compatibility libraries (installed under /usr/lib32). To build - a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib. */ - -#undef START_FILES -#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o - -/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. - The reason is that some functions in libgcc.a call functions from libc.a, - and some libc.a functions need functions from libgcc.a. Since most - versions of ld are one-pass linkers, we need to mention -lgcc twice, - or else we risk getting unresolved externals. */ -#undef LIB_STANDARD -#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o - -#elif defined(__OpenBSD__) - -#undef START_FILES -#define START_FILES pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o -#undef LIB_STANDARD -#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtend.o +#ifdef __OpenBSD__ + +#undef START_FILES +#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o +#undef LIB_STANDARD +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o #elif defined(__NetBSD__) @@ -110,19 +92,25 @@ /* LIB_STANDARD and START_FILES set correctly in s/darwin.h */ -#else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !SOLARIS2 - && !__APPLE__ */ +#else /* !__OpenBSD__ && !__NetBSD__ && !SOLARIS2 && !__APPLE__ */ +/* CRT_DIR defaults to /usr/lib. On GNU/Linux, it may be /usr/lib64. + On FreeBSD, the libraries for binaries native to the build host's + architecture are installed under /usr/lib, and the ones that need + special paths are 32-bit compatibility libraries (installed under + /usr/lib32). So to build a native binary of Emacs on FreeBSD/amd64 + we can just point to /usr/lib. + */ +#undef START_FILES +#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD. The reason is that some functions in libgcc.a call functions from libc.a, and some libc.a functions need functions from libgcc.a. Since most versions of ld are one-pass linkers, we need to mention -lgcc twice, or else we risk getting unresolved externals. */ -#undef START_FILES #undef LIB_STANDARD -#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o -#endif /* __FreeBSD__ */ +#endif /* __OpenBSD__ */ #endif /* !i386 */ /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e ------------------------------------------------------------ revno: 100030 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-04-24 11:10:17 -0700 message: * etc/NEWS: Mention --with-crt-dir. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-04-23 14:19:44 +0000 +++ etc/NEWS 2010-04-24 18:10:17 +0000 @@ -30,6 +30,10 @@ These provide no new functionality, they just remove the need to edit lib-src/Makefile by hand in order to use the associated features. +--- +** There is a new configure option --with-crt-dir. +This is only useful if your crt*.o files are in a non-standard location. + ** Configure links against libselinux if it is found. You can disable this by using --without-selinux. ------------------------------------------------------------ revno: 100029 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-04-24 19:46:20 +0300 message: Fix typos in comments of composite.c diff: === modified file 'src/composite.c' --- src/composite.c 2010-04-24 13:24:25 +0000 +++ src/composite.c 2010-04-24 16:46:20 +0000 @@ -74,8 +74,8 @@ composition rules to tell how to compose (2N+2)th element with the previously composed 2N glyphs. - COMPONENTS-VEC -- Vector of integers. In relative composition, the - elements are characters to be composed. In rule-base + COMPONENTS-VEC -- Vector of integers. In a relative composition, + the elements are the characters to be composed. In a rule-base composition, the elements are characters or encoded composition rules. @@ -95,13 +95,13 @@ get_composition_id checks the validity of `composition' property, and, if valid, assigns a new ID, registers the information in composition_hash_table and composition_table, and changes the form - of the property value. If the property is invalid, return -1 - without changing the property value. + of the property value. If the property is invalid, + get_composition_id returns -1 without changing the property value. - We use two tables to keep information about composition; + We use two tables to keep the information about composition; composition_hash_table and composition_table. - The former is a hash table in which keys are COMPONENTS-VECs and + The former is a hash table whose keys are COMPONENTS-VECs and values are the corresponding COMPOSITION-IDs. This hash table is weak, but as each key (COMPONENTS-VEC) is also kept as a value of the `composition' property, it won't be collected as garbage until all @@ -162,8 +162,8 @@ Lisp_Object Qauto_composition_function; Lisp_Object Vcomposition_function_table; -/* Maxinum number of characters to lookback to check - auto-composition. */ +/* Maximum number of characters to look back for + auto-compositions. */ #define MAX_AUTO_COMPOSITION_LOOKBACK 3 EXFUN (Fremove_list_of_text_properties, 4); @@ -1241,7 +1241,7 @@ unsigned char *p; }; -/* Update the members of POSTION to the next character boundary. */ +/* Update the members of POSITION to the next character boundary. */ #define FORWARD_CHAR(POSITION, STOP) \ do { \ (POSITION).pos++; \ @@ -1257,7 +1257,7 @@ } \ } while (0) -/* Update the members of POSTION to the previous character boundary. */ +/* Update the members of POSITION to the previous character boundary. */ #define BACKWARD_CHAR(POSITION, STOP) \ do { \ if ((POSITION).pos == STOP) \ @@ -1429,7 +1429,7 @@ } if (need_adjustment) { - /* As we have called Lisp, there's a possibilily that + /* As we have called Lisp, there's a possibility that buffer/string is relocated. */ if (NILP (string)) cur.p = BYTE_POS_ADDR (cur.pos_byte); ------------------------------------------------------------ revno: 100028 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-04-24 19:23:29 +0300 message: composite.el (find-composition): Doc fix. diff: === modified file 'lisp/composite.el' --- lisp/composite.el 2010-01-14 03:54:04 +0000 +++ lisp/composite.el 2010-04-24 16:23:29 +0000 @@ -299,16 +299,16 @@ (compose-string-internal str 0 (length str) components))) (defun find-composition (pos &optional limit string detail-p) - "Return information about a composition at or nearest to buffer position POS. + "Return information about a composition at or near buffer position POS. If the character at POS has `composition' property, the value is a list -of FROM, TO, and VALID-P. +\(FROM TO VALID-P). FROM and TO specify the range of text that has the same `composition' property, VALID-P is t if this composition is valid, and nil if not. If there's no composition at POS, and the optional 2nd argument LIMIT -is non-nil, search for a composition toward LIMIT. +is non-nil, search for a composition toward the position given by LIMIT. If no composition is found, return nil. @@ -316,8 +316,9 @@ composition in; nil means the current buffer. If a valid composition is found and the optional 4th argument DETAIL-P -is non-nil, the return value is a list of FROM, TO, COMPONENTS, -RELATIVE-P, MOD-FUNC, and WIDTH. +is non-nil, the return value is a list of the form + + (FROM TO COMPONENTS RELATIVE-P MOD-FUNC WIDTH) COMPONENTS is a vector of integers, the meaning depends on RELATIVE-P. @@ -334,9 +335,9 @@ When Automatic Compostion mode is on, this function also finds a chunk of text that is automatically composed. If such a chunk is found closer to POS than the position that has `composition' -property, the value is a list of FROM, TO, and a glyph gstring -the specify how the chunk is composed. See the function -`composition-get-gstring' for the format of the glyph string." +property, the value is a list of FROM, TO, and a glyph-string +that specifies how the chunk is to be composed. See the function +`composition-get-gstring' for the format of the glyph-string." (let ((result (find-composition-internal pos limit string detail-p))) (if (and detail-p (> (length result) 3) (nth 2 result) (not (nth 3 result))) ;; This is a valid rule-base composition. ------------------------------------------------------------ revno: 100027 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-04-24 16:24:25 +0300 message: composite.c (composition_compute_stop_pos): Fix a typo in the commentary. diff: === modified file 'src/composite.c' --- src/composite.c 2010-01-14 03:54:04 +0000 +++ src/composite.c 2010-04-24 13:24:25 +0000 @@ -1011,7 +1011,7 @@ /* Update cmp_it->stop_pos to the next position after CHARPOS (and BYTEPOS) where character composition may happen. If BYTEPOS is - negative, compoute it. If it is a static composition, set + negative, compute it. If it is a static composition, set cmp_it->ch to -1. Otherwise, set cmp_it->ch to the character that triggers a automatic composition. */ ------------------------------------------------------------ revno: 100026 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-04-24 14:33:31 +0200 message: Remove conflict markers. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-04-24 11:11:40 +0000 +++ src/ChangeLog 2010-04-24 12:33:31 +0000 @@ -58,12 +58,7 @@ 2010-04-23 Eli Zaretskii - Support `display' text properties and overlay strings in bidi - buffers. -======= -2010-04-23 Eli Zaretskii - ->>>>>>> MERGE-SOURCE + Support `display' text properties and overlay strings in bidi buffers. * xdisp.c (pop_it): When the stack is popped after displaying from a string, bidi-iterate to exit from the text portion covered by the `display' property or overlay. (Bug#5988, bug#5920) ------------------------------------------------------------ revno: 100025 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-04-24 14:11:40 +0300 message: Fix cursor motion at end of line that ends in a composed character. xdisp.c (display_line): Use `reseat' instead of `reseat_1', and use `get_next_display_element' and `set_iterator_to_next' to advance to the next character, when looking for the character that begins the next row. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-04-24 07:36:27 +0000 +++ src/ChangeLog 2010-04-24 11:11:40 +0000 @@ -1,6 +1,11 @@ 2010-04-24 Eli Zaretskii - * .gdbinit: Add a "set Fmake_symbol" line to force GDB load the + * xdisp.c (display_line): Use `reseat' instead of `reseat_1', and + use `get_next_display_element' and `set_iterator_to_next' to + advance to the next character, when looking for the character that + begins the next row. + + * .gdbinit: Add a "set Fmake_symbol" line to force GDB to load the definition of "struct Lisp_Symbol". 2010-04-24 Glenn Morris @@ -55,6 +60,10 @@ Support `display' text properties and overlay strings in bidi buffers. +======= +2010-04-23 Eli Zaretskii + +>>>>>>> MERGE-SOURCE * xdisp.c (pop_it): When the stack is popped after displaying from a string, bidi-iterate to exit from the text portion covered by the `display' property or overlay. (Bug#5988, bug#5920) === modified file 'src/xdisp.c' --- src/xdisp.c 2010-04-23 18:23:51 +0000 +++ src/xdisp.c 2010-04-24 11:11:40 +0000 @@ -17969,17 +17969,20 @@ } else if (row->used[TEXT_AREA] && max_pos) { - SET_TEXT_POS (tpos, max_pos + 1, CHAR_TO_BYTE (max_pos + 1)); + SET_TEXT_POS (tpos, max_pos, CHAR_TO_BYTE (max_pos)); + save_it = *it; + it->bidi_p = 0; + reseat (it, tpos, 0); + if (!get_next_display_element (it)) + abort (); /* row at ZV was already handled above */ + set_iterator_to_next (it, 1); row_end = it->current; - row_end.pos = tpos; /* If the character at max_pos+1 is a newline, skip that as well. Note that this may skip some invisible text. */ - if (FETCH_CHAR (tpos.bytepos) == '\n' - || (FETCH_CHAR (tpos.bytepos) == '\r' && it->selective)) + if (!get_next_display_element (it)) + abort (); + if (ITERATOR_AT_END_OF_LINE_P (it)) { - save_it = *it; - it->bidi_p = 0; - reseat_1 (it, tpos, 0); set_iterator_to_next (it, 1); /* Record the position after the newline of a continued row. We will need that to set ROW->end of the last @@ -17994,7 +17997,6 @@ row_end = it->current; save_it.eol_pos.charpos = save_it.eol_pos.bytepos = 0; } - *it = save_it; } else if (!row->continued_p && MATRIX_ROW_CONTINUATION_LINE_P (row) @@ -18008,6 +18010,7 @@ row_end.pos = it->eol_pos; it->eol_pos.charpos = it->eol_pos.bytepos = 0; } + *it = save_it; row->end = row_end; } } ------------------------------------------------------------ revno: 100024 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-04-24 10:36:27 +0300 message: Fix GDB startup with src/.gdbinit. .gdbinit: Add a "set Fmake_symbol" line to force GDB load the definition of "struct Lisp_Symbol". diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2010-04-19 13:05:35 +0000 +++ src/.gdbinit 2010-04-24 07:36:27 +0000 @@ -21,6 +21,8 @@ # Force loading of symbols, enough to give us gdb_valbits etc. set main +# With some compilers, we need this to give us struct Lisp_Symbol etc.: +set Fmake_symbol # Find lwlib source files too. dir ../lwlib === modified file 'src/ChangeLog' --- src/ChangeLog 2010-04-24 02:23:22 +0000 +++ src/ChangeLog 2010-04-24 07:36:27 +0000 @@ -1,3 +1,8 @@ +2010-04-24 Eli Zaretskii + + * .gdbinit: Add a "set Fmake_symbol" line to force GDB load the + definition of "struct Lisp_Symbol". + 2010-04-24 Glenn Morris * Makefile.in (CRT_DIR): New variable, set by configure. ------------------------------------------------------------ revno: 100023 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-04-23 19:36:43 -0700 message: Minor htmlfontify simplifications. * hfy-cmap.el (htmlfontify-load-rgb-file, hfy-fallback-colour-values): Add autoload cookies. (htmlfontify-unload-rgb-file, hfy-fallback-colour-values): Add docs. (generated-autoload-file): Set file-local value to "htmlfontify.el". * htmlfontify.el (caddr, cadddr): Remove fallback definitions. They have definitions / compiler macros in cl.el. (htmlfontify-load-rgb-file, hfy-fallback-colour-values): Replace manual autoloads with generated ones. (htmlfontify-unload-rgb-file): Remove autoload. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-04-24 02:16:13 +0000 +++ lisp/ChangeLog 2010-04-24 02:36:43 +0000 @@ -12,6 +12,17 @@ (authors-canonical-file-name, authors-scan-el): Use authors-disambiguate-file-name. + * hfy-cmap.el (htmlfontify-load-rgb-file, hfy-fallback-colour-values): + Add autoload cookies. + (htmlfontify-unload-rgb-file, hfy-fallback-colour-values): Add docs. + (generated-autoload-file): Set file-local value to "htmlfontify.el". + * htmlfontify.el (caddr, cadddr): Remove fallback definitions. + They have definitions / compiler macros in cl.el. + (htmlfontify-load-rgb-file, hfy-fallback-colour-values): + Replace manual autoloads with generated ones. + (htmlfontify-unload-rgb-file): Remove autoload. + * Makefile.in (autoloads): Ensure htmlfontify.el is writable. + 2010-04-23 Stefan Monnier * emacs-lisp/bytecomp.el (byte-compile-set-default): New function. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2010-03-27 10:36:12 +0000 +++ lisp/Makefile.in 2010-04-24 02:36:43 +0000 @@ -151,7 +151,7 @@ autoloads: $(LOADDEFS) doit chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \ $(lisp)/emacs-lisp/cl-loaddefs.el $(lisp)/mail/rmail.el \ - $(lisp)/dired.el $(lisp)/ibuffer.el + $(lisp)/dired.el $(lisp)/ibuffer.el $(lisp)/htmlfontify.el cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins === modified file 'lisp/hfy-cmap.el' --- lisp/hfy-cmap.el 2010-01-13 08:35:10 +0000 +++ lisp/hfy-cmap.el 2010-04-24 02:36:43 +0000 @@ -803,6 +803,7 @@ (defconst hfy-rgb-regex "^\\s-*\\([0-9]+\\)\\s-+\\([0-9]+\\)\\s-+\\([0-9]+\\)\\s-+\\(.+\\)\\s-*$") +;;;###autoload (defun htmlfontify-load-rgb-file (&optional file) "Load an X11 style rgb.txt FILE. Search `hfy-rgb-load-path' if FILE is not specified. @@ -832,14 +833,21 @@ (kill-buffer rgb-buffer))))) (defun htmlfontify-unload-rgb-file () + "Unload the current color name -> rgb translation map." (interactive) (setq hfy-rgb-txt-colour-map nil)) +;;;###autoload (defun hfy-fallback-colour-values (colour-string) + "Use a fallback method for obtaining the rgb values for a color." (cdr (assoc-string colour-string (or hfy-rgb-txt-colour-map hfy-fallback-colour-map))) ) (provide 'hfy-cmap) + +;; Local Variables: +;; generated-autoload-file: "htmlfontify.el" +;; End: + +;; arch-tag: dff7feea-add4-48ba-937c-e79ac40cec9b ;;; hfy-cmap.el ends here - -;; arch-tag: dff7feea-add4-48ba-937c-e79ac40cec9b === modified file 'lisp/htmlfontify.el' --- lisp/htmlfontify.el 2010-04-17 02:07:48 +0000 +++ lisp/htmlfontify.el 2010-04-24 02:36:43 +0000 @@ -90,39 +90,6 @@ ;; (`font-lock-fontify-region') (require 'cus-edit) -(eval-and-compile - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;; I want these - can't be bothered requiring all of cl though. - (if (not (fboundp 'caddr)) - (defun caddr (list) - "Return the `car' of the `cddr' of LIST." - (car (cddr list)))) - - (if (not (fboundp 'cadddr)) - (defun cadddr (list) - "Return the `cadr' of the `cddr' of LIST." - (cadr (cddr list)))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - (autoload - 'htmlfontify-load-rgb-file - "hfy-cmap" - "Load an rgb.txt file for color name -> rgb translation purposes." - 'interactive) - - (autoload - 'htmlfontify-unload-rgb-file - "hfy-cmap" - "Unload the current color name -> rgb translation map." - 'interactive) - - (autoload - 'hfy-fallback-colour-values - "hfy-cmap" - "Use a fallback method for obtaining the rgb values for a color." - 'interactive) - ) - (defconst htmlfontify-version 0.21) (defconst hfy-meta-tags @@ -2368,7 +2335,28 @@ (let ((file (hfy-initfile))) (load file 'NOERROR nil nil) )) + +;;;### (autoloads (hfy-fallback-colour-values htmlfontify-load-rgb-file) +;;;;;; "hfy-cmap" "hfy-cmap.el" "3de2db2d213813bb3afe170ffd66cdde") +;;; Generated autoloads from hfy-cmap.el + +(autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\ +Load an X11 style rgb.txt FILE. +Search `hfy-rgb-load-path' if FILE is not specified. +Loads the variable `hfy-rgb-txt-colour-map', which is used by +`hfy-fallback-colour-values'. + +\(fn &optional FILE)" t nil) + +(autoload 'hfy-fallback-colour-values "hfy-cmap" "\ +Use a fallback method for obtaining the rgb values for a color. + +\(fn COLOUR-STRING)" nil nil) + +;;;*** + + (provide 'htmlfontify) + +;; arch-tag: 944e5e63-c81d-4baa-a82a-0275f9c30e61 ;;; htmlfontify.el ends here - -;; arch-tag: 944e5e63-c81d-4baa-a82a-0275f9c30e61 ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.