Mercurial > emacs
changeset 107911:bfc3c4135d73
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 02 Apr 2010 11:32:45 +0000 |
| parents | d9a02533def5 (current diff) f54953a8f7e2 (diff) |
| children | bd8cc5b74c24 |
| files | |
| diffstat | 8 files changed, 79 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 01 21:53:22 2010 +0000 +++ b/ChangeLog Fri Apr 02 11:32:45 2010 +0000 @@ -3562,8 +3562,8 @@ 1999-10-09 Stefan Monnier <monnier@cs.yale.edu> - * make-dist (dontcompile): look for the DONTCOMPILE variable rather - than the obsolete dontcompilefiles pseudo-rule in lisp/Makefile. + * make-dist (dontcompile): Look for the DONTCOMPILE variable rather + than the obsolete dontcompilefiles pseudo-rule in lisp/Makefile. 1999-10-09 Richard M. Stallman <rms@gnu.org> @@ -3572,7 +3572,7 @@ 1999-10-08 Stefan Monnier <monnier@cs.yale.edu> - * update-subdirs: also ignore CVS subdirs. + * update-subdirs: Also ignore CVS subdirs. 1999-10-07 Gerd Moellmann <gerd@gnu.org> @@ -6132,8 +6132,8 @@ src/Makefile.in is built from src/Makefile. * Makefile.in (src/Makefile, lib-src/Makefile, oldXMenu/Makefile): - If these files are out of date, simply have config.status - rebuild them; don't rebuild them explicitly. + If these files are out of date, simply have config.status + rebuild them; don't rebuild them explicitly. 1993-09-25 Brian J. Fox (bfox@ai.mit.edu) @@ -6328,7 +6328,7 @@ 1993-07-12 Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr) - * configure.in (m68k-bull-sysv3): new config. + * configure.in (m68k-bull-sysv3): New config. 1993-07-10 Jim Blandy (jimb@geech.gnu.ai.mit.edu) @@ -6551,7 +6551,7 @@ * make-dist: Rebuild configure if configure.in is newer. - * Makefile.in (src:, lib-src:, FRC:): force the src and lib-src + * Makefile.in (src:, lib-src:, FRC:): Force the src and lib-src targets to be executed even if make remembers that it has already satisfied FRC. @@ -7051,7 +7051,7 @@ * make-dist: Don't distribute etc/Old files. * GETTING.GNU.SOFTWARE, PROBLEMS: Registered into RCS with their - backups. + backups. 1993-03-20 Jim Blandy (jimb@geech.gnu.ai.mit.edu) @@ -7081,7 +7081,7 @@ 1993-03-17 Eric S. Raymond (eric@mole.gnu.ai.mit.edu) * Makefile.in: Add commented-out variable settings for developer's - configuration. + configuration. 1993-03-14 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) @@ -7696,7 +7696,7 @@ the script. * INSTALL: Doc fix. - * Makefile: brought the Makefile up to the GNU coding + * Makefile: Brought the Makefile up to the GNU coding standards, as described in standards.text: (TAGS): New name for the target which rebuilds the tags table. (check): New target; doesn't do anything yet.
--- a/lib-src/ChangeLog Thu Apr 01 21:53:22 2010 +0000 +++ b/lib-src/ChangeLog Fri Apr 02 11:32:45 2010 +0000 @@ -3942,7 +3942,7 @@ (xmalloc, fatal, error): New functions. (delete_socket, handle_signals): New functions. (progname, socket_name): New variables. - [HAVE_SOCKETS] (main): Call handle_signals; set the new variables. + [HAVE_SOCKETS] (main): Call handle_signals; set the new variables. 1996-09-01 Richard Stallman <rms@ethanol.gnu.ai.mit.edu> @@ -4715,9 +4715,9 @@ 1995-01-12 Francesco Potortì (pot@cnuce.cnr.it) * etags.c (FILEPOS, GET_CHARNO, GET_FILEPOS, max, LINENO): Deleted. - (append_to_tagfile, typedefs, typedefs_and_cplusplus, - constantypedefs, update, vgrind_style, no_warnings, - cxref_style, cplusplus, noindentypedefs): Were int, now logical. + (append_to_tagfile, typedefs, typedefs_and_cplusplus) + (constantypedefs, update, vgrind_style, no_warnings) + (cxref_style, cplusplus, noindentypedefs): Were int, now logical. (permit_duplicates): Was a var, now a #define. (filename_lb): Was global, now local to main. (main): Open the tag file when in cxref mode. @@ -4736,8 +4736,8 @@ (TOKEN_SAVED_P, SAVE_TOKEN, RESTORE_TOKEN): Deleted. (C_entries): nameb and savenameb deleted. Use dinamic allocation. (pfcnt): Deleted. Users updated. - (getit, Asm_labels, Pascal_functions, L_getit, get_scheme, - TEX_getit, prolog_getit): Use dinamic allocation for storing + (getit, Asm_labels, Pascal_functions, L_getit, get_scheme) + (TEX_getit, prolog_getit): Use dinamic allocation for storing the tag instead of a fixed size buffer. 1995-01-10 Richard Stallman <rms@mole.gnu.ai.mit.edu> @@ -6662,8 +6662,8 @@ 1990-01-19 David Lawrence (tale@cocoa-puffs) * timer.c, getdate.y (new files) and Makefile: - Sub-process support for run-at-time in timer.el. - Doesn't yet work correctly for USG. + Sub-process support for run-at-time in timer.el. + Doesn't yet work correctly for USG. 1990-01-10 Jim Kingdon (kingdon@pogo)
--- a/lisp/ChangeLog Thu Apr 01 21:53:22 2010 +0000 +++ b/lisp/ChangeLog Fri Apr 02 11:32:45 2010 +0000 @@ -1,3 +1,9 @@ +2010-04-02 Juanma Barranquero <lekktu@gmail.com> + + * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members) + (semantic-create-imenu-directory-index): Fix typos in docstrings. + (semantic-imenu-goto-function): Reflow docstring. + 2010-03-30 Tomas Abrahamsson <tab@lysator.liu.se> * textmodes/artist.el (artist-mode): Fix typo in docstring. @@ -10,7 +16,7 @@ * language/indian.el (devanagari-composable-pattern) (tamil-composable-pattern, kannada-composable-pattern) - (malayalam-composable-pattern): Adjusted for the new Unicode + (malayalam-composable-pattern): Adjust for the new Unicode specification. (bengali-composable-pattern, gurmukhi-composable-pattern) (gujarati-composable-pattern, oriya-composable-pattern) @@ -3324,7 +3330,7 @@ * bookmark.el: Formatting and doc fixes only: (bookmark-search-delay): Shorten doc string to fit in 80 columns. (bookmark-bmenu-search): Wrap to fit within 80 columns. - Minor grammar and punctuation fixes in doc string. + Minor grammar and punctuation fixes in doc string. (bookmark-read-search-input): Adjust to fit within 80 columns. 2009-11-20 Tassilo Horn <tassilo@member.fsf.org> @@ -6079,12 +6085,12 @@ 2009-10-05 Karl Fogel <kfogel@red-bean.com> * bookmark.el (bookmark-handle-bookmark): If bookmark has no file, - don't do anything related to relocating, just return nil. + don't do anything related to relocating, just return nil. (bookmark-error-no-filename): New error. (bookmark-default-handler): Signal `bookmark-error-no-filename' if - bookmark has no file. Don't even attempt to handle things that - are not files; the whole point of custom handlers is to keep that - knowledge elsewhere anyway. Tighten some comments. + bookmark has no file. Don't even attempt to handle things that + are not files; the whole point of custom handlers is to keep that + knowledge elsewhere anyway. Tighten some comments. (bookmark-file-or-variation-thereof): Remove now-unused function. (bookmark-location): Doc string fix. (Bug#4250) @@ -6114,8 +6120,8 @@ (bookmark-relocate, bookmark-insert-location, bookmark-rename) (bookmark-insert, bookmark-delete, bookmark-time-to-save-p) (bookmark-edit-annotation-mode, bookmark-edit-annotation): - Improve doc strings to say whether bookmark can be a string or - a record or both, and make other consistency and clarity fixes. + Improve doc strings to say whether bookmark can be a string or + a record or both, and make other consistency and clarity fixes. (bookmark-get-handler, bookmark--jump-via, bookmark-write-file) (bookmark-default-annotation-text, bookmark-yank-word) (bookmark-maybe-load-default-file, bookmark-maybe-sort-alist) @@ -6123,12 +6129,12 @@ (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames) (bookmark-bmenu-bookmark): Give these doc strings. (bookmark-bmenu-check-position): Give this a doc string, but also - add a FIXME comment about how the function may be pointless. + add a FIXME comment about how the function may be pointless. (bookmark-default-handler): Rework doc string and change a - parameter name, to clarify that this takes a bookmark record - not a bookmark name. + parameter name, to clarify that this takes a bookmark record + not a bookmark name. (bookmark-set): Change a parameter name to indicate its meaning, - and improve the doc string a bit. + and improve the doc string a bit. (Bug#4188) 2009-10-04 Karl Fogel <kfogel@red-bean.com>
--- a/lisp/cedet/semantic/imenu.el Thu Apr 01 21:53:22 2010 +0000 +++ b/lisp/cedet/semantic/imenu.el Fri Apr 02 11:32:45 2010 +0000 @@ -95,7 +95,7 @@ (defcustom semantic-imenu-bucketize-type-members t "*Non-nil if members of a type should be grouped into buckets. -nil means to keep them in the same order. +A nil value means to keep them in the same order. Overriden to nil if `semantic-imenu-bucketize-file' is nil." :group 'semantic-imenu :type 'boolean) @@ -167,8 +167,8 @@ (defun semantic-imenu-goto-function (name position &optional rest) "Move point associated with NAME to POSITION. -Used to override function `imenu-default-goto-function' so that we can continue -to use overlays to maintain the current position. +Used to override function `imenu-default-goto-function' so that +we can continue to use overlays to maintain the current position. Optional argument REST is some extra stuff." (require 'pulse) (if (semantic-overlay-p position) @@ -249,7 +249,7 @@ 'semantic-imenu-flush-fcn nil t))) (defun semantic-create-imenu-directory-index (&optional stream) - "Create an IMENU tag index based on all files active in semanticdb. + "Create an imenu tag index based on all files active in semanticdb. Optional argument STREAM is the stream of tags for the current buffer." (if (not semanticdb-current-database) (semantic-create-imenu-index-1 stream nil)
--- a/msdos/ChangeLog Thu Apr 01 21:53:22 2010 +0000 +++ b/msdos/ChangeLog Fri Apr 02 11:32:45 2010 +0000 @@ -708,7 +708,7 @@ 1994-04-30 Morten Welinder (terra@diku.dk) - * sed1.inp: don't comment out the inc-vers run as that + * sed1.inp: Don't comment out the inc-vers run as that does not exist anymore. Don't reset DEBUG_MOLE as that no longer is used. Identify the file being patched as src/... @@ -731,7 +731,7 @@ 1994-01-08 Morten Welinder (terra@diku.dk) - * sed3.inp: improve make-compatibility by not using drive + * sed3.inp: Improve make-compatibility by not using drive specifications and by not specifying an explicit shell. 1994-01-07 Morten Welinder (terra@diku.dk)
--- a/src/ChangeLog Thu Apr 01 21:53:22 2010 +0000 +++ b/src/ChangeLog Fri Apr 02 11:32:45 2010 +0000 @@ -25,7 +25,7 @@ * xdisp.c (x_consider_frame_title, update_window_cursor): Remove HAVE_NS conditionals. - (prepare_menu_bars)[HAVE_NS]: Call ns_set_doc_edited. + (prepare_menu_bars) [HAVE_NS]: Call ns_set_doc_edited. * nsfns.m (x_implicitly_set_name): If frame-title-format is t, use filename for the title. @@ -331,7 +331,7 @@ 2010-01-19 Alan Mackenzie <acm@muc.de> Fix spurious before-change-functions invocation from (insert ?\n). - * textprop.c (set_text_properties): rename parameter + * textprop.c (set_text_properties): Rename parameter `signal_after_change_p' to `coherent_change_p', and make the invocation of `modify_region' conditional on it. @@ -10353,7 +10353,7 @@ * font.c (Vfont_encoding_alist, find_font_encoding): Move from fontset.c. - (font_pixel_size)[! HAVE_WINDOW_SYSTEM]: Return 1. + (font_pixel_size) [! HAVE_WINDOW_SYSTEM]: Return 1. (font_open_entity): Update FRAME_X_DISPLAY_INFO (f)->n_fonts, FRAME_SMALLEST_CHAR_WIDTH (f), and FRAME_SMALLEST_FONT_HEIGHT (f) only when HAVE_WINDOW_SYSTEM is defined. @@ -20187,7 +20187,7 @@ 2007-08-29 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change) - * term.c (dissociate_if_controlling_tty)[USG]: Fix parse error. + * term.c (dissociate_if_controlling_tty) [USG]: Fix parse error. 2007-08-29 Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp> (tiny change)
--- a/src/ChangeLog.10 Thu Apr 01 21:53:22 2010 +0000 +++ b/src/ChangeLog.10 Fri Apr 02 11:32:45 2010 +0000 @@ -2137,7 +2137,7 @@ * Makefile.in (keymap.o): Add "keymap.h" and "window.h" dependencies. - * keymap.c: include "window.h". + * keymap.c: Include "window.h". (Fcommand_remapping): New optional POSITION argument. (Fkey_binding): New optional POSITION argument. Completely rework handling of mouse clicks to get the same order of keymaps as @@ -5867,9 +5867,9 @@ 2005-12-26 Luc Teirlinck <teirllm@auburn.edu> - * keyboard.h: extern last_point_position_window. - - * undo.c: include keyboard.h. + * keyboard.h: Extern last_point_position_window. + + * undo.c: Include keyboard.h. * Makefile.in (undo.o): Depend on keyboard.h. @@ -8276,7 +8276,7 @@ * xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix. (syms_of_xdisp) <void-text-area-pointer>: Doc fix. - * fileio.c (Frename_file)[!DOS_NT]: Don't call chown on MSDOS/Windows. + * fileio.c (Frename_file) [!DOS_NT]: Don't call chown on MSDOS/Windows. 2005-06-23 Richard M. Stallman <rms@gnu.org> @@ -12611,7 +12611,7 @@ * macterm.c (mac_check_for_quit_char): Remove warning for using NULL where 0 should be used. * unexmacosx.c: Use malloc/malloc.h on Tiger instead of - objc/malloc.h + objc/malloc.h. * mac.c: Include time.h for Tiger compatibility. 2004-10-07 Kim F. Storm <storm@cua.dk> @@ -12843,7 +12843,7 @@ * Makefile.in (msdos.o): Depend on buffer.h, commands.h, and blockinput.h. (dosfns.o): Depend on blockinput.h, window.h, dispextern.h, - charset.h, and coding.h + charset.h, and coding.h. (w16select.o): Depend on buffer.h, charset.h, coding.h, and composite.h. (term.o): Depend on window.h and keymap.h. (abbrev.o): Depend on syntax.h. @@ -17222,7 +17222,7 @@ 2003-09-01 Jason Rumney <jasonr@gnu.org> * makefile.w32-in (alloca.o): Remove. - (coding.o): Depend on intervals.h + (coding.o): Depend on intervals.h. (emacs.o, bytecode.o): Depend on window.h. 2003-09-01 Dave Love <fx@gnu.org> @@ -22643,7 +22643,7 @@ (Fx_popup_menu): Don't show pop up menu until preceding one is actually cleaned up. Moved UNGCPRO outside #ifdef HAVE_MENUS block. - * w32menu.c: Changes adapted from xmenu.c + * w32menu.c: Changes adapted from xmenu.c. (set_frame_menubar): First parse all submenus, then make widget_value trees from them. Don't allocate any widget_value objects @@ -24232,7 +24232,7 @@ m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/ibms390.h, m/intel386.h, m/iris4d.h, m/irist.h, m/isi-ov.h, m/m68k.h, m/macppc.h, m/masscomp.h, m/mg1.h, m/mips-siemens.h, - m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h + m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpcle.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sparc.h, m/sr2k.h, m/symmetry.h, m/tad68k.h, m/tahoe.h,
--- a/src/ChangeLog.8 Thu Apr 01 21:53:22 2010 +0000 +++ b/src/ChangeLog.8 Fri Apr 02 11:32:45 2010 +0000 @@ -2886,10 +2886,10 @@ * sysdep.c: Define numerous routines to emulate Unix system calls. - * xfaces.c: on MacOS, define the set of colors listed in rgb.txt + * xfaces.c: On MacOS, define the set of colors listed in rgb.txt file of an X Window environment. - * xfaces.c: on MacOS, define the Lisp functions x-display-color-p, + * xfaces.c: On MacOS, define the Lisp functions x-display-color-p, x-display-grayscale, x-color-defined-p, and x-color-values. * sysdep.c [macintosh] (stat, fstat, mkdir, rmdir, utime, access) @@ -3160,7 +3160,7 @@ 1999-08-25 Alexandre Oliva <oliva@dcc.unicamp.br> - * unexelf.c: Merge IRIX debugging info patch from unexsgi.c + * unexelf.c: Merge IRIX debugging info patch from unexsgi.c. * m/iris4d.h: Use unexelf for IRIX 5.*. * m/iris5d.h: Use unexelf for IRIX 6.*. * unexsgi.c: Deleted. @@ -3767,8 +3767,8 @@ 1999-08-06 Gerd Moellmann <gerd@gnu.org> * xdisp.c (compute_line_metrics): If first line's physical ascent - is larger than its logical ascent, use the physical ascent, and - make the row taller. Set row's overlapping_p flag. + is larger than its logical ascent, use the physical ascent, and + make the row taller. Set row's overlapping_p flag. * dispnew.c (redraw_overlapping_rows): Use flag overlapping_p. (direct_output_for_insert): Ditto. @@ -4675,7 +4675,7 @@ 1999-06-04 Gerd Moellmann <gerd@gnu.org> - * xfaces.c (recompute_basic_faces)[GLYPH_DEBUG]: Check return + * xfaces.c (recompute_basic_faces) [GLYPH_DEBUG]: Check return value of realize_basic_faces. (load_face_font_or_fontset): Store full font name in face. (realize_default_face): Use full font name. @@ -5601,9 +5601,9 @@ * window.c (coordinates_in_window): Use CURRENT_MODE_LINE_HEIGHT. * xdisp.c (redisplay_window): If mode line height has changed, - arrange for a thorough immediate redisplay using the correct mode - line height. - (window_box_height): Use CURRENT_MODE_LINE_HEIGHT. + arrange for a thorough immediate redisplay using the correct mode + line height. + (window_box_height): Use CURRENT_MODE_LINE_HEIGHT. * dispextern.h (MATRIX_MODE_LINE_HEIGHT): New. (CURRENT_MODE_LINE_HEIGHT): New. @@ -7062,7 +7062,7 @@ 1998-05-04 Gerd Moellmann <gerd@gnu.org> * Makefile.in (LIBXPM): If not already defined, define to -lXpm. - (LIBX)[HAVE_X11]: Add LIBXPM. + (LIBX) [HAVE_X11]: Add LIBXPM. * xfns.c (xpm_image_p): Implementation of image type functions for XPM. @@ -10052,7 +10052,7 @@ * xterm.h (WINDOW_COL_PIXEL_X etc.) Removed. - * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c + * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c. * xfns.c (x_contour_region): Use pixel coordinates from window cursor instead of WINDOW_TO_FRAME_H/VPOS. @@ -10897,7 +10897,7 @@ (MATRIX_ROW_INVERSE_P): Former MATRIX_ROW_HIGHLIGHT_P. (struct glyph_row): HIGHLIGHT_P -> INVERSE_P - * all files: use above new names. + * all files: Use above new names. * dispnew.c (scroll_frame_lines): Simplified. Use SCROLL_GLYPH_MATRIX. @@ -10961,7 +10961,7 @@ (init_display): Ditto. (syms_of_display): Ditto. - * dispextern.h: add prototypes for REDRAW_FRAME, + * dispextern.h: Add prototypes for REDRAW_FRAME, REDRAW_GARBAGED_FRAMES, CANCEL_LINE, CLEAR_FRAME_RECORDS, INIT_DESIRED_GLYPHS, SCROLL_FRAME_LINES, PRESERVE_OTHER_COLUMNS, ADJUST_WINDOW_CHARSTARTS, CANCEL_MY_COLUMNS, @@ -11108,9 +11108,9 @@ (make_window): Initialize DESIRED_MATRIX and CURRENT_MATRIX. (replace_window): Reset DESIRED_MATRIX and CURRENT_MATRIX - * Makefile.in (window.o): Add dependency window.c -> dispextern.h - - * window.c: Include dispextern.h + * Makefile.in (window.o): Add dependency window.c -> dispextern.h. + + * window.c: Include dispextern.h. * scroll.c (do_scrolling): Use new glyphs. (do_direct_scrolling): Ditto. @@ -11141,9 +11141,9 @@ (write_glyphs): Ditto. (insert_glyphs): Ditto. - * Makefile.in (term.o): term.c depends on dispextern.h - - * term.c: Include dispextern.h + * Makefile.in (term.o): term.c depends on dispextern.h. + + * term.c: Include dispextern.h. * dispnew.c (direct_output_forward_char): Old glyph functions removed, new inserted. @@ -11560,8 +11560,8 @@ 1999-05-02 Andrew Innes <andrewi@gnu.org> * s/ms-w32.h (HAVE_FSYNC): New macro. - (fsync): Map to _commit. - (ftruncate): Map to _chsize. + (fsync): Map to _commit. + (ftruncate): Map to _chsize. * w32term.c (dumpglyphs): On Windows NT, do output in Unicode even for ASCII, if enabled, to avoid memory allocation overhead for @@ -11666,7 +11666,7 @@ * fontset.c (Fquery_fontset): Don't check for fontset aliases here. (Fnew_fontset, Fset_fontset_font): Check for them here. - (Ffontset_info, Fnew_fontset, Fset_fontset_font): + (Ffontset_info, Fnew_fontset, Fset_fontset_font): Fix error message syntax. * buffer.c (Fmake_indirect_buffer): Copy multibyte status @@ -12775,7 +12775,7 @@ 1998-12-06 Eli Zaretskii <eliz@mescaline.gnu.org> * Makefile.in (msdos.o): Depend on termchar.h, charset.h, - coding.h, and disptab.h + coding.h, and disptab.h. * msdos.c (Vdos_unsupported_char_glyph): New variable. (syms_of_msdos): DEFVAR_LISP it.