Changeset 3537

Timestamp:

11/09/04 22:30:25 (4 years ago)

Author:

miyoshi

Message:

* alloc.c (PDUMP_SUBR_DOC_SIZE): Increased.

* emacs.c: Partially sync up with Emacs CVS HEAD.

* cus-load.el: Update.

* loaddefs.el: Ditto.

* ibuf-ext.el: New file from Emacs CVS HEAD.

* ibuf-macs.el: Ditto.

* ibuffer.el: Ditto.

Files:

• branches/2.2/lisp/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/lisp/cus-load.el (modified) (2 diffs)
• branches/2.2/lisp/ibuf-ext.el (added)
• branches/2.2/lisp/ibuf-macs.el (added)
• branches/2.2/lisp/ibuffer.el (added)
• branches/2.2/lisp/loaddefs.el (modified) (2 diffs)
• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/alloc.c (modified) (1 diff)
• branches/2.2/src/emacs.c (modified) (50 diffs)

branches/2.2/lisp/ChangeLog.Meadow

@@ +1 @@
+2004-11-09  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * cus-load.el: Update.
+
+        * loaddefs.el: Ditto.
+
+        * ibuf-ext.el: New file from Emacs CVS HEAD.
+
+        * ibuf-macs.el: Ditto.
+
+        * ibuffer.el: Ditto.
+
-2004-11-08  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/lisp/cus-load.el

@@ -391 +391 @@
-(put 'message-faces 'custom-loads '(message))
-(put 'environment 'custom-loads '(cus-edit dired "dos-vars" faces "paths"))
+(put 'ibuffer 'custom-loads '(ibuffer ibuf-ext))
-(put 'perl 'custom-loads '(perl-mode))
-(put 'password 'custom-loads '(password))
@@ -400 +401 @@
-(put 'type-break 'custom-loads '(type-break))
-(put 'mh 'custom-loads '(mh-customize mh-init))
-
+buffer i
-(put 'lm 'custom-loads '(landmark))
-(put 'ruler-mode 'custom-loads '(ruler-mode))

branches/2.2/lisp/loaddefs.el

@@ -12152 +12152 @@
-
-\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads (ibuffer-do-occur ibuffer-mark-dired-buffers ibuffer-mark-read-only-buffers
+;;;;;;  ibuffer-mark-special-buffers ibuffer-mark-old-buffers ibuffer-mark-help-buffers
+;;;;;;  ibuffer-mark-dissociated-buffers ibuffer-mark-unsaved-buffers
+;;;;;;  ibuffer-mark-modified-buffers ibuffer-mark-by-mode ibuffer-mark-by-file-name-regexp
+;;;;;;  ibuffer-mark-by-mode-regexp ibuffer-mark-by-name-regexp ibuffer-copy-filename-as-kill
+;;;;;;  ibuffer-diff-with-file ibuffer-jump-to-buffer ibuffer-do-kill-lines
+;;;;;;  ibuffer-backwards-next-marked ibuffer-forward-next-marked
+;;;;;;  ibuffer-add-to-tmp-show ibuffer-add-to-tmp-hide ibuffer-bs-show
+;;;;;;  ibuffer-invert-sorting ibuffer-toggle-sorting-mode ibuffer-switch-to-saved-filters
+;;;;;;  ibuffer-add-saved-filters ibuffer-delete-saved-filters ibuffer-save-filters
+;;;;;;  ibuffer-or-filter ibuffer-negate-filter ibuffer-exchange-filters
+;;;;;;  ibuffer-decompose-filter ibuffer-pop-filter ibuffer-filter-disable
+;;;;;;  ibuffer-switch-to-saved-filter-groups ibuffer-delete-saved-filter-groups
+;;;;;;  ibuffer-save-filter-groups ibuffer-yank-filter-group ibuffer-yank
+;;;;;;  ibuffer-kill-line ibuffer-kill-filter-group ibuffer-jump-to-filter-group
+;;;;;;  ibuffer-clear-filter-groups ibuffer-decompose-filter-group
+;;;;;;  ibuffer-pop-filter-group ibuffer-set-filter-groups-by-mode
+;;;;;;  ibuffer-filters-to-filter-group ibuffer-included-in-filters-p
+;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
+;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
+;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (16715 60951))
+;;; Generated autoloads from ibuf-ext.el
+
+(autoload (quote ibuffer-auto-mode) "ibuf-ext" "\
+Toggle use of Ibuffer's auto-update facility.
+With numeric ARG, enable auto-update if and only if ARG is positive.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote ibuffer-mouse-filter-by-mode) "ibuf-ext" "\
+Enable or disable filtering by the major mode chosen via mouse.
+
+\(fn EVENT)" t nil)
+
+(autoload (quote ibuffer-interactive-filter-by-mode) "ibuf-ext" "\
+Enable or disable filtering by the major mode at point.
+
+\(fn EVENT-OR-POINT)" t nil)
+
+(autoload (quote ibuffer-mouse-toggle-filter-group) "ibuf-ext" "\
+Toggle the display status of the filter group chosen with the mouse.
+
+\(fn EVENT)" t nil)
+
+(autoload (quote ibuffer-toggle-filter-group) "ibuf-ext" "\
+Toggle the display status of the filter group on this line.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-forward-filter-group) "ibuf-ext" "\
+Move point forwards by COUNT filtering groups.
+
+\(fn &optional COUNT)" t nil)
+
+(autoload (quote ibuffer-backward-filter-group) "ibuf-ext" "\
+Move point backwards by COUNT filtering groups.
+
+\(fn &optional COUNT)" t nil)
+ (autoload 'ibuffer-do-shell-command-pipe "ibuf-ext.el")
+ (autoload 'ibuffer-do-shell-command-pipe-replace "ibuf-ext.el")
+ (autoload 'ibuffer-do-shell-command-file "ibuf-ext.el")
+ (autoload 'ibuffer-do-eval "ibuf-ext.el")
+ (autoload 'ibuffer-do-view-and-eval "ibuf-ext.el")
+ (autoload 'ibuffer-do-rename-uniquely "ibuf-ext.el")
+ (autoload 'ibuffer-do-revert "ibuf-ext.el")
+ (autoload 'ibuffer-do-replace-regexp "ibuf-ext.el")
+ (autoload 'ibuffer-do-query-replace "ibuf-ext.el")
+ (autoload 'ibuffer-do-query-replace-regexp "ibuf-ext.el")
+ (autoload 'ibuffer-do-print "ibuf-ext.el")
+
+(autoload (quote ibuffer-included-in-filters-p) "ibuf-ext" "\
+Not documented
+
+\(fn BUF FILTERS)" nil nil)
+
+(autoload (quote ibuffer-filters-to-filter-group) "ibuf-ext" "\
+Make the current filters into a filtering group.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-set-filter-groups-by-mode) "ibuf-ext" "\
+Set the current filter groups to filter by mode.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-pop-filter-group) "ibuf-ext" "\
+Remove the first filter group.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-decompose-filter-group) "ibuf-ext" "\
+Decompose the filter group GROUP into active filters.
+
+\(fn GROUP)" t nil)
+
+(autoload (quote ibuffer-clear-filter-groups) "ibuf-ext" "\
+Remove all filter groups.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-jump-to-filter-group) "ibuf-ext" "\
+Move point to the filter group whose name is NAME.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-kill-filter-group) "ibuf-ext" "\
+Kill the filter group named NAME.
+The group will be added to `ibuffer-filter-group-kill-ring'.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-kill-line) "ibuf-ext" "\
+Kill the filter group at point.
+See also `ibuffer-kill-filter-group'.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote ibuffer-yank) "ibuf-ext" "\
+Yank the last killed filter group before group at point.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-yank-filter-group) "ibuf-ext" "\
+Yank the last killed filter group before group named NAME.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-save-filter-groups) "ibuf-ext" "\
+Save all active filter groups GROUPS as NAME.
+They are added to `ibuffer-saved-filter-groups'.  Interactively,
+prompt for NAME, and use the current filters.
+
+\(fn NAME GROUPS)" t nil)
+
+(autoload (quote ibuffer-delete-saved-filter-groups) "ibuf-ext" "\
+Delete saved filter groups with NAME.
+They are removed from `ibuffer-saved-filter-groups'.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-switch-to-saved-filter-groups) "ibuf-ext" "\
+Set this buffer's filter groups to saved version with NAME.
+The value from `ibuffer-saved-filters' is used.
+If prefix argument ADD is non-nil, then add the saved filters instead
+of replacing the current filters.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-filter-disable) "ibuf-ext" "\
+Disable all filters currently in effect in this buffer.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-pop-filter) "ibuf-ext" "\
+Remove the top filter in this buffer.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-decompose-filter) "ibuf-ext" "\
+Separate the top compound filter (OR, NOT, or SAVED) in this buffer.
+
+This means that the topmost filter on the filtering stack, which must
+be a complex filter like (OR [name: foo] [mode: bar-mode]), will be
+turned into two separate filters [name: foo] and [mode: bar-mode].
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-exchange-filters) "ibuf-ext" "\
+Exchange the top two filters on the stack in this buffer.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-negate-filter) "ibuf-ext" "\
+Negate the sense of the top filter in the current buffer.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-or-filter) "ibuf-ext" "\
+Replace the top two filters in this buffer with their logical OR.
+If optional argument REVERSE is non-nil, instead break the top OR
+filter into parts.
+
+\(fn &optional REVERSE)" t nil)
+
+(autoload (quote ibuffer-save-filters) "ibuf-ext" "\
+Save FILTERS in this buffer with name NAME in `ibuffer-saved-filters'.
+Interactively, prompt for NAME, and use the current filters.
+
+\(fn NAME FILTERS)" t nil)
+
+(autoload (quote ibuffer-delete-saved-filters) "ibuf-ext" "\
+Delete saved filters with NAME from `ibuffer-saved-filters'.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-add-saved-filters) "ibuf-ext" "\
+Add saved filters from `ibuffer-saved-filters' to this buffer's filters.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-switch-to-saved-filters) "ibuf-ext" "\
+Set this buffer's filters to filters with NAME from `ibuffer-saved-filters'.
+If prefix argument ADD is non-nil, then add the saved filters instead
+of replacing the current filters.
+
+\(fn NAME)" t nil)
+ (autoload 'ibuffer-filter-by-mode "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-used-mode "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-name "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-filename "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-size-gt  "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-size-lt  "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-content "ibuf-ext.el")
+ (autoload 'ibuffer-filter-by-predicate "ibuf-ext.el")
+
+(autoload (quote ibuffer-toggle-sorting-mode) "ibuf-ext" "\
+Toggle the current sorting mode.
+Default sorting modes are:
+ Recency - the last time the buffer was viewed
+ Name - the name of the buffer
+ Major Mode - the name of the major mode of the buffer
+ Size - the size of the buffer
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-invert-sorting) "ibuf-ext" "\
+Toggle whether or not sorting is in reverse order.
+
+\(fn)" t nil)
+ (autoload 'ibuffer-do-sort-by-major-mode "ibuf-ext.el")
+ (autoload 'ibuffer-do-sort-by-mode-name "ibuf-ext.el")
+ (autoload 'ibuffer-do-sort-by-alphabetic "ibuf-ext.el")
+ (autoload 'ibuffer-do-sort-by-size "ibuf-ext.el")
+
+(autoload (quote ibuffer-bs-show) "ibuf-ext" "\
+Emulate `bs-show' from the bs.el package.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-add-to-tmp-hide) "ibuf-ext" "\
+Add REGEXP to `ibuffer-tmp-hide-regexps'.
+This means that buffers whose name matches REGEXP will not be shown
+for this Ibuffer session.
+
+\(fn REGEXP)" t nil)
+
+(autoload (quote ibuffer-add-to-tmp-show) "ibuf-ext" "\
+Add REGEXP to `ibuffer-tmp-show-regexps'.
+This means that buffers whose name matches REGEXP will always be shown
+for this Ibuffer session.
+
+\(fn REGEXP)" t nil)
+
+(autoload (quote ibuffer-forward-next-marked) "ibuf-ext" "\
+Move forward by COUNT marked buffers (default 1).
+
+If MARK is non-nil, it should be a character denoting the type of mark
+to move by.  The default is `ibuffer-marked-char'.
+
+If DIRECTION is non-nil, it should be an integer; negative integers
+mean move backwards, non-negative integers mean move forwards.
+
+\(fn &optional COUNT MARK DIRECTION)" t nil)
+
+(autoload (quote ibuffer-backwards-next-marked) "ibuf-ext" "\
+Move backwards by COUNT marked buffers (default 1).
+
+If MARK is non-nil, it should be a character denoting the type of mark
+to move by.  The default is `ibuffer-marked-char'.
+
+\(fn &optional COUNT MARK)" t nil)
+
+(autoload (quote ibuffer-do-kill-lines) "ibuf-ext" "\
+Hide all of the currently marked lines.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-jump-to-buffer) "ibuf-ext" "\
+Move point to the buffer whose name is NAME.
+
+If called interactively, prompt for a buffer name and go to the
+corresponding line in the Ibuffer buffer.  If said buffer is in a
+hidden group filter, open it.
+
+If `ibuffer-jump-offer-only-visible-buffers' is non-nil, only offer
+visible buffers in the completion list.  Calling the command with
+a prefix argument reverses the meaning of that variable.
+
+\(fn NAME)" t nil)
+
+(autoload (quote ibuffer-diff-with-file) "ibuf-ext" "\
+View the differences between this buffer and its associated file.
+This requires the external program \"diff\" to be in your `exec-path'.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-copy-filename-as-kill) "ibuf-ext" "\
+Copy filenames of marked buffers into the kill ring.
+
+The names are separated by a space.
+If a buffer has no filename, it is ignored.
+
+With no prefix arg, use the filename sans its directory of each marked file.
+With a zero prefix arg, use the complete filename of each marked file.
+With \\[universal-argument], use the filename of each marked file relative
+to `ibuffer-default-directory' iff non-nil, otherwise `default-directory'.
+
+You can then feed the file name(s) to other commands with \\[yank].
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote ibuffer-mark-by-name-regexp) "ibuf-ext" "\
+Mark all buffers whose name matches REGEXP.
+
+\(fn REGEXP)" t nil)
+
+(autoload (quote ibuffer-mark-by-mode-regexp) "ibuf-ext" "\
+Mark all buffers whose major mode matches REGEXP.
+
+\(fn REGEXP)" t nil)
+
+(autoload (quote ibuffer-mark-by-file-name-regexp) "ibuf-ext" "\
+Mark all buffers whose file name matches REGEXP.
+
+\(fn REGEXP)" t nil)
+
+(autoload (quote ibuffer-mark-by-mode) "ibuf-ext" "\
+Mark all buffers whose major mode equals MODE.
+
+\(fn MODE)" t nil)
+
+(autoload (quote ibuffer-mark-modified-buffers) "ibuf-ext" "\
+Mark all modified buffers.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-mark-unsaved-buffers) "ibuf-ext" "\
+Mark all modified buffers that have an associated file.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-mark-dissociated-buffers) "ibuf-ext" "\
+Mark all buffers whose associated file does not exist.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-mark-help-buffers) "ibuf-ext" "\
+Mark buffers like *Help*, *Apropos*, *Info*.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-mark-old-buffers) "ibuf-ext" "\
+Mark buffers which have not been viewed in `ibuffer-old-time' days.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-mark-special-buffers) "ibuf-ext" "\
+Mark all buffers whose name begins and ends with '*'.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-mark-read-only-buffers) "ibuf-ext" "\
+Mark all read-only buffers.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-mark-dired-buffers) "ibuf-ext" "\
+Mark all `dired' buffers.
+
+\(fn)" t nil)
+
+(autoload (quote ibuffer-do-occur) "ibuf-ext" "\
+View lines which match REGEXP in all marked buffers.
+Optional argument NLINES says how many lines of context to display: it
+defaults to one.
+
+\(fn REGEXP &optional NLINES)" t nil)
+
+;;;***
+
+;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (16543
+;;;;;;  50739))
+;;; Generated autoloads from ibuf-macs.el
+
+(autoload (quote define-ibuffer-column) "ibuf-macs" "\
+Define a column SYMBOL for use with `ibuffer-formats'.
+
+BODY will be called with `buffer' bound to the buffer object, and
+`mark' bound to the current mark on the buffer.  The original ibuffer
+buffer will be bound to `ibuffer-buf'.
+
+If NAME is given, it will be used as a title for the column.
+Otherwise, the title will default to a capitalized version of the
+SYMBOL's name.  PROPS is a plist of additional properties to add to
+the text, such as `mouse-face'.  And SUMMARIZER, if given, is a
+function which will be passed a list of all the strings in its column;
+it should return a string to display at the bottom.
+
+Note that this macro expands into a `defun' for a function named
+ibuffer-make-column-NAME.  If INLINE is non-nil, then the form will be
+inlined into the compiled format versions.  This means that if you
+change its definition, you should explicitly call
+`ibuffer-recompile-formats'.
+
+\(fn SYMBOL (&key NAME INLINE PROPS SUMMARIZER) &rest BODY)" nil (quote macro))
+
+(autoload (quote define-ibuffer-sorter) "ibuf-macs" "\
+Define a method of sorting named NAME.
+DOCUMENTATION is the documentation of the function, which will be called
+`ibuffer-do-sort-by-NAME'.
+DESCRIPTION is a short string describing the sorting method.
+
+For sorting, the forms in BODY will be evaluated with `a' bound to one
+buffer object, and `b' bound to another.  BODY should return a non-nil
+value if and only if `a' is \"less than\" `b'.
+
+\(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)" nil (quote macro))
+
+(autoload (quote define-ibuffer-op) "ibuf-macs" "\
+Generate a function which operates on a buffer.
+OP becomes the name of the function; if it doesn't begin with
+`ibuffer-do-', then that is prepended to it.
+When an operation is performed, this function will be called once for
+each marked buffer, with that buffer current.
+
+ARGS becomes the formal parameters of the function.
+DOCUMENTATION becomes the docstring of the function.
+INTERACTIVE becomes the interactive specification of the function.
+MARK describes which type of mark (:deletion, or nil) this operation
+uses.  :deletion means the function operates on buffers marked for
+deletion, otherwise it acts on normally marked buffers.
+MODIFIER-P describes how the function modifies buffers.  This is used
+to set the modification flag of the Ibuffer buffer itself.  Valid
+values are:
+ nil - the function never modifiers buffers
+ t - the function it always modifies buffers
+ :maybe - attempt to discover this information by comparing the
+  buffer's modification flag.
+DANGEROUS is a boolean which should be set if the user should be
+prompted before performing this operation.
+OPSTRING is a string which will be displayed to the user after the
+operation is complete, in the form:
+ \"Operation complete; OPSTRING x buffers\"
+ACTIVE-OPSTRING is a string which will be displayed to the user in a
+confirmation message, in the form:
+ \"Really ACTIVE-OPSTRING x buffers?\"
+COMPLEX means this function is special; see the source code of this
+macro for exactly what it does.
+
+\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)" nil (quote macro))
+
+(autoload (quote define-ibuffer-filter) "ibuf-macs" "\
+Define a filter named NAME.
+DOCUMENTATION is the documentation of the function.
+READER is a form which should read a qualifier from the user.
+DESCRIPTION is a short string describing the filter.
+
+BODY should contain forms which will be evaluated to test whether or
+not a particular buffer should be displayed or not.  The forms in BODY
+will be evaluated with BUF bound to the buffer object, and QUALIFIER
+bound to the current value of the filter.
+
+\(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)" nil (quote macro))
+
+;;;***
+
+;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
+;;;;;;  "ibuffer" "ibuffer.el" (16754 46317))
+;;; Generated autoloads from ibuffer.el
+
+(autoload (quote ibuffer-list-buffers) "ibuffer" "\
+Display a list of buffers, in another window.
+If optional argument FILES-ONLY is non-nil, then add a filter for
+buffers which are visiting a file.
+
+\(fn &optional FILES-ONLY)" t nil)
+
+(autoload (quote ibuffer-other-window) "ibuffer" "\
+Like `ibuffer', but displayed in another window by default.
+If optional argument FILES-ONLY is non-nil, then add a filter for
+buffers which are visiting a file.
+
+\(fn &optional FILES-ONLY)" t nil)
+
+(autoload (quote ibuffer) "ibuffer" "\
+Begin using `ibuffer' to edit a list of buffers.
+Type 'h' after entering ibuffer for more information.
+
+Optional argument OTHER-WINDOW-P says to use another window.
+Optional argument NAME specifies the name of the buffer; it defaults
+to \"*Ibuffer*\".
+Optional argument QUALIFIERS is an initial set of filtering qualifiers
+to use; see `ibuffer-filtering-qualifiers'.
+Optional argument NOSELECT means don't select the Ibuffer buffer.
+Optional argument SHRINK means shrink the buffer to minimal size.  The
+special value `onewindow' means always use another window.
+Optional argument FILTER-GROUPS is an initial set of filtering
+groups to use; see `ibuffer-filter-groups'.
+Optional argument FORMATS is the value to use for `ibuffer-formats'.
+If specified, then the variable `ibuffer-formats' will have that value
+locally in this buffer.
+
+\(fn &optional OTHER-WINDOW-P NAME QUALIFIERS NOSELECT SHRINK FILTER-GROUPS FORMATS)" t nil)
-
-;;;***
@@ -27887 +28395 @@
-;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-https.el" "url/url-imap.el"
-;;;;;;  "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el"
-2 13327 625
+4 48045 258
-
-;;;***

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2004-11-09  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * alloc.c (PDUMP_SUBR_DOC_SIZE): Increased.
+
+        * emacs.c: Partially sync up with Emacs CVS HEAD.
+
-2004-11-08  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

branches/2.2/src/alloc.c

@@ -5513 +5513 @@
-#endif
-#define PDUMP_POINTERS_SIZE 127
-4
+5
-#define PDUMP_INTERVAL_TREE_SIZE 31
-#define PDUMP_HASH_TABLE_SIZE 5 /* for Lisp_Hash_Table */

branches/2.2/src/emacs.c

@@ -41 +41 @@
-#endif
-
+#ifdef WINDOWSNT
+#include <fcntl.h>
+#endif
+
-#include "lisp.h"
-#include "commands.h"
-#include "intervals.h"
-#include "buffer.h"
+#include "window.h"
-
-#include "systty.h"
@@ -52 +57 @@
-#include "termhooks.h"
-#include "keyboard.h"
+#include "keymap.h"
-
-#ifdef HAVE_SETLOCALE
@@ -81 +87 @@
-/* Make these values available in GDB, which doesn't see macros.  */
-
+#ifdef USE_LSB_TAG
+int gdb_use_lsb = 1;
+#else
+int gdb_use_lsb = 0;
+#endif
+#ifdef NO_UNION_TYPE
+int gdb_use_union = 0;
+#else
+int gdb_use_union = 1;
+#endif
-EMACS_INT gdb_valbits = VALBITS;
-EMACS_INT gdb_gctypebits = GCTYPEBITS;
-EMACS_INT gdb_emacs_intbits = sizeof (EMACS_INT) * BOOL_VECTOR_BITS_PER_CHAR;
-#ifdef DATA_SEG_BITS
-EMACS_INT gdb_data_seg_bits = DATA_SEG_BITS;
-#else
- 
+
-#endif
-EMACS_INT PVEC_FLAG = PSEUDOVECTOR_FLAG;
-
-
+. 
-Lisp_Object Vcommand_line_args;
-
@@ -110 +125 @@
-/* An empty lisp string.  To avoid having to build any other.  */
-Lisp_Object empty_string;
-
-#ifdef SIGUSR1
-/* Hooks for signal USR1 and USR2 handing */
-Lisp_Object Vsignal_USR1_hook;
-#ifdef SIGUSR2
-Lisp_Object Vsignal_USR2_hook;
-#endif
-#endif
-
-/* Search path separator.  */
@@ -158 +165 @@
-Lisp_Object Vprevious_system_time_locale;
-
-n
-
+
+. 
-int inhibit_window_system;
-
-/* If nonzero, set Emacs to run at this priority.  This is also used
-   in child_setup and sys_suspend to make sure subshells run at normal
-T
-int
-
-
-
+t
+EMACS_INT
+
+,
+ 
-int running_asynch_code;
-
@@ -177 +184 @@
-
-#ifdef HAVE_X_WINDOWS
-
+ 
-int display_arg;
-#endif
@@ -215 +222 @@
-void syms_of_emacs ();
-
+/* MSVC needs each string be shorter than 2048 bytes, so the usage
+   strings below are split to not overflow this limit.  */
-#define USAGE1 "\
-Usage: %s [OPTION-OR-FILENAME]...\n\
@@ -290 +299 @@
-
-
-
+. 
-int fatal_error_code;
-
-
+. 
-int fatal_error_in_progress;
-
@@ -327 +336 @@
-#endif /* SIGUSR2 */
-
-
+ 
-SIGTYPE
-fatal_error_signal (sig)
@@ -377 +386 @@
-/* We define abort, rather than using it from the library,
-   so that GDB can return from a breakpoint here.
-on msdos.c
+in msdos.c.
-
-#if ! defined (DOS_NT) && ! defined (NO_ABORT)
@@ -395 +404 @@
-
-
-
+. 
-
-static void
@@ -405 +414 @@
-  register int i;
-  Lisp_Object name, dir, tem;
-specpdl_ptr - specpdl
+SPECPDL_INDEX ()
-  Lisp_Object raw_name;
-
@@ -539 +548 @@
-       doc: /* Return the program name that was used to run Emacs.
-Any directory names are omitted.  */)
-
+   
-{
-  return Fcopy_sequence (Vinvocation_name);
@@ -547 +556 @@
-       0, 0, 0,
-       doc: /* Return the directory name in which the Emacs executable was located.  */)
-
+   
-{
-  return Fcopy_sequence (Vinvocation_directory);
@@ -580 +589 @@
-void __do_global_dtors ()
-{}
-
-
+GNU/
+GNU_
-char * __CTOR_LIST__[2] = { (char *) (-1), 0 };
-#endif
@@ -726 +735 @@
-}
-
+
-/* ARGSUSED */
-int
-
+
+
+
+
+
-     int argc;
-     char **argv;
+#ifdef VMS
-     char **envp;
+#endif
-{
-#if GC_MARK_STACK
@@ -816 +832 @@
-
-#ifdef VMS
-
+. 
-  {
-    char *file;
@@ -825 +841 @@
-#ifdef LINK_CRTL_SHARE
-#ifdef SHARABLE_LIB_BUG
-
+ 
-  if (!stdin)
-    stdin = fdopen (0, "r");
@@ -953 +969 @@
-#endif
-
-
+. 
-  while (1)
-    {
@@ -966 +982 @@
-            {
-              char *errstring = strerror (errno);
-emacs: %s: %s\n"
+%s: %s: %s\n", argv[0]
-              exit (1);
-            }
@@ -972 +988 @@
-          if (! isatty (0))
-            {
-emacs: %s: not a tty\n"
+%s: %s: not a tty\n", argv[0]
-              exit (1);
-            }
@@ -984 +1000 @@
-    }
-
+  /* Command line option --no-windows is deprecated and thus not mentioned
+     in the manual and usage informations.  */
-  if (argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
-    inhibit_window_system = 1;
@@ -992 +1010 @@
-    noninteractive = 1;
-
-.
+
-  if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
-    {
@@ -1118 +1136 @@
-  noninteractive1 = noninteractive;
-
-
+. 
-
-#ifdef MEADOW
@@ -1135 +1153 @@
-      init_syntax_once ();      /* Create standard syntax table.  */
-      init_category_once ();    /* Create standard category table.  */
-
+. 
-      init_casetab_once ();
-
-
-
+. 
+. 
+. 
-
-      /* Call syms_of_xfaces before init_window_once because that
@@ -1152 +1170 @@
-      syms_of_keyboard ();
-
-macintosh
+MAC_OS8
-      /* init_window_once calls make_terminal_frame which on Mac OS
-         creates a full-fledge output_mac type frame.  This does not
-         work correctly before syms_of_textprop, syms_of_macfns,
-         syms_of_ccl, syms_of_fontset, syms_of_xterm, syms_of_search,
-x_term_init
+mac_initialize
-         been called.  */
-      syms_of_textprop ();
@@ -1169 +1187 @@
-      syms_of_frame ();
-
-x_term_init
+mac_initialize
-      init_keyboard ();
-#endif
@@ -1246 +1264 @@
-         unibyte during startup if .emacs sets unibyte.  Tested with
-         8-bit data in environment variables and /etc/passwd, setting
-
+ 
-      if (argmatch (argv, argc, "-unibyte", "--unibyte", 4, NULL, &skip_args)
-          || argmatch (argv, argc, "-no-multibyte", "--no-multibyte", 4, NULL, &skip_args)
@@ -1369 +1387 @@
-#endif
-
-
+. 
-
-  init_callproc_1 ();   /* Must precede init_cmdargs and init_sys_modes.  */
@@ -1376 +1394 @@
-  if (initialized)
-    {
-
+. 
-      Lisp_Object old_log_max;
-      old_log_max = Vmessage_log_max;
@@ -1392 +1410 @@
-  if (!initialized)
-    {
-
+. 
-      /* And data must come first of all
-
-macintosh
-
+. 
+MAC_OS8
+ Classic
-      syms_of_data ();
-#endif
@@ -1414 +1432 @@
-      syms_of_callproc ();
-      syms_of_category ();
-macintosh
-
+MAC_OS8
+ Classic
-      syms_of_ccl ();
-#endif
@@ -1439 +1457 @@
-      syms_of_minibuf ();
-      syms_of_process ();
-macintosh
-
+MAC_OS8
+ Classic
-      syms_of_search ();
-      syms_of_frame ();
@@ -1450 +1468 @@
-      syms_of_sound ();
-#endif
-macintosh
-
+MAC_OS8
+ Classic
-      syms_of_textprop ();
-#endif
@@ -1476 +1494 @@
-#endif /* HAVE_X_WINDOWS */
-
+#ifdef HAVE_MENUS
-#ifndef HAVE_NTGUI
-
+
+
-      syms_of_xmenu ();
+#endif
-#endif
-#endif
@@ -1570 +1591 @@
-    {
-#ifdef VMS
-
+. 
-#endif /* VMS */
-
-
-macintosh
-
-
+. 
+
+MAC_OS8
+ Classic
+. 
-#endif
-#ifdef VMS
-
+ 
-#endif /* VMS */
-  init_sys_modes ();    /* Init system terminal modes (RAW or CBREAK, etc.) */
@@ -1610 +1631 @@
-    {
-      char *file;
-
+ 
-      if (argmatch (argv, argc, "-l", "--load", 3, &file, &skip_args))
-        Vtop_level = Fcons (intern ("load"),
@@ -1650 +1671 @@
-     GNU/Linux.  It might work on some other systems too.  Give it a
-     try and tell us if it works on your system.  To compile for
-
+ 
-#if defined (__FreeBSD__) || defined (__linux)
-#ifdef PROFILING
@@ -1679 +1700 @@
-     called to bolt the undumping time into the undumped emacs, this
-     results in localtime ignoring the TZ environment variable.
-
+ 
-  tzset ();
-#endif /* defined (LOCALTIME_CACHE) */
@@ -1949 +1970 @@
-       doc: /* Exit the Emacs job and kill it.
-If ARG is an integer, return ARG as the exit program code.
-
+
+
-The value of `kill-emacs-hook', if not void,
-is a list of functions (of no args),
-all of which are called before Emacs is actually killed.  */)
-
+   
-     Lisp_Object arg;
-{
@@ -1980 +2002 @@
-     Do it after shut_down_emacs, which does an auto-save.  */
-  if (STRINGP (Vauto_save_list_file_name))
-XSTRING (Vauto_save_list_file_name)->data
+SDATA (Vauto_save_list_file_name)
-
-#ifdef PDUMP
@@ -2028 +2050 @@
-        reset_sys_modes ();
-        if (sig && sig != SIGTERM)
-.
+
-      }
-  }
@@ -2093 +2115 @@
-       doc: /* Dump current state of Emacs into data file FILENAME.
-This function exists on systems that use HAVE_SHM.  */)
-
+   
-     Lisp_Object filename;
-{
@@ -2106 +2128 @@
-
-  fflush (stdout);
-
+. 
-  /* Also arrange for warnings when nearly out of space.  */
-#ifndef SYSTEM_MALLOC
-  memory_warnings (my_edata, malloc_warning);
-#endif
-XSTRING (filename)->data
+SDATA (filename)
-
-  Vpurify_flag = tem;
@@ -2126 +2148 @@
-
-You must run Emacs in batch mode in order to dump it.  */)
-
+   
-