------------------------------------------------------------ revno: 116005 fixes bug: http://debbugs.gnu.org/16405 committer: Juri Linkov branch nick: trunk timestamp: Mon 2014-01-13 10:04:09 +0200 message: * lisp/info.el (Info-find-file): Go to DIR before displaying the error about a nonexistent file if no previous Info file is visited. Use `user-error' instead of `error' for "Info file %s does not exist". (Info-find-node-2): In case of a nonexistent node in unwind forms go to the Top node if there is no previous node to revert to. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-13 07:47:15 +0000 +++ lisp/ChangeLog 2014-01-13 08:04:09 +0000 @@ -1,3 +1,12 @@ +2014-01-13 Juri Linkov + + * info.el (Info-find-file): Go to DIR before displaying the error + about a nonexistent file if no previous Info file is visited. + Use `user-error' instead of `error' for "Info file %s does not exist". + (Info-find-node-2): In case of a nonexistent node in unwind forms + go to the Top node if there is no previous node to revert to. + (Bug#16405) + 2014-01-13 Martin Rudalics fit-frame/window-to-buffer code fixes including one for Bug#14096. === modified file 'lisp/info.el' --- lisp/info.el 2014-01-10 07:26:04 +0000 +++ lisp/info.el 2014-01-13 08:04:09 +0000 @@ -925,7 +925,10 @@ (setq filename found) (if noerror (setq filename nil) - (error "Info file %s does not exist" filename))) + ;; If there is no previous Info file, go to the directory. + (unless Info-current-file + (Info-directory)) + (user-error "Info file %s does not exist" filename))) filename)))) (defun Info-find-node (filename nodename &optional no-going-back strict-case) @@ -1245,12 +1248,14 @@ (Info-find-index-name Info-point-loc) (setq Info-point-loc nil)))))) ;; If we did not finish finding the specified node, - ;; go back to the previous one. - (or Info-current-node no-going-back (null Info-history) - (let ((hist (car Info-history))) - (setq Info-history (cdr Info-history)) - (Info-find-node (nth 0 hist) (nth 1 hist) t) - (goto-char (nth 2 hist)))))) + ;; go back to the previous one or to the Top node. + (unless (or Info-current-node no-going-back) + (if Info-history + (let ((hist (car Info-history))) + (setq Info-history (cdr Info-history)) + (Info-find-node (nth 0 hist) (nth 1 hist) t) + (goto-char (nth 2 hist))) + (Info-find-node Info-current-file "Top" t))))) ;; Cache the contents of the (virtual) dir file, once we have merged ;; it for the first time, so we can save time subsequently. ------------------------------------------------------------ revno: 116004 committer: martin rudalics branch nick: trunk timestamp: Mon 2014-01-13 08:47:15 +0100 message: fit-frame/window-to-buffer code fixes including one for Bug#14096. * window.el (fit-frame-to-buffer): Fix doc-string. Respect window-min-height/-width. Fit pixelwise when frame-resize-pixelwise is non-nil. Adjust right/bottom edge when avoiding that frame goes partially off-screen. (fit-window-to-buffer): Respect window-min-height/-width (Bug#14096). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-13 05:03:31 +0000 +++ lisp/ChangeLog 2014-01-13 07:47:15 +0000 @@ -1,3 +1,13 @@ +2014-01-13 Martin Rudalics + + fit-frame/window-to-buffer code fixes including one for Bug#14096. + * window.el (fit-frame-to-buffer): Fix doc-string. Respect + window-min-height/-width. Fit pixelwise when + frame-resize-pixelwise is non-nil. Adjust right/bottom edge + when avoiding that frame goes partially off-screen. + (fit-window-to-buffer): Respect window-min-height/-width + (Bug#14096). + 2014-01-13 Stefan Monnier * indent.el (indent-according-to-mode): Flush to column 0 in text-mode === modified file 'lisp/window.el' --- lisp/window.el 2014-01-07 17:16:24 +0000 +++ lisp/window.el 2014-01-13 07:47:15 +0000 @@ -6824,7 +6824,8 @@ FRAME can be any live frame and defaults to the selected one. Fit only if FRAME's root window is live. MAX-HEIGHT, MIN-HEIGHT, MAX-WIDTH and MIN-WIDTH specify bounds on the new total size of -FRAME's root window. +FRAME's root window. MIN-HEIGHT and MIN-WIDTH default to the values of +`window-min-height' and `window-min-width' respectively. The option `fit-frame-to-buffer' controls whether this function has any effect. New position and size of FRAME are additionally @@ -6832,8 +6833,10 @@ `fit-frame-to-buffer-margins' or the corresponding parameters of FRAME." (interactive) - (or (fboundp 'x-display-pixel-height) - (user-error "Cannot resize frame in non-graphic Emacs")) + (unless (and (fboundp 'x-display-pixel-height) + ;; We need the respective sizes now. + (fboundp 'display-monitor-attributes-list)) + (user-error "Cannot resize frame in non-graphic Emacs")) (setq frame (window-normalize-frame frame)) (when (and (window-live-p (frame-root-window frame)) fit-frame-to-buffer @@ -6938,7 +6941,8 @@ (min-height (cond ((numberp (nth 1 sizes)) (* (nth 1 sizes) char-height)) - ((numberp min-height) (* min-height char-height)))) + ((numberp min-height) (* min-height char-height)) + (t (* window-min-height char-height)))) (max-width (cond ((numberp (nth 2 sizes)) @@ -6950,7 +6954,8 @@ ((numberp (nth 3 sizes)) (- (* (nth 3 sizes) char-width) window-extra-width)) ((numberp min-width) - (- (* min-width char-width) window-extra-width)))) + (- (* min-width char-width) window-extra-width)) + (t (* window-min-width char-width)))) ;; Note: Currently, for a new frame the sizes of the header ;; and mode line may be estimated incorrectly (value (window-text-pixel-size @@ -6958,7 +6963,7 @@ (width (+ (car value) (window-right-divider-width))) (height (+ (cdr value) (window-bottom-divider-width))) remainder) - (unless window-resize-pixelwise + (unless frame-resize-pixelwise ;; Round sizes to character sizes. (setq remainder (% width char-width)) (unless (zerop remainder) @@ -6987,12 +6992,11 @@ ;; Add extra width. (setq width (+ width extra-width)) ;; Preserve right margin. - (let ((right (+ left width extra-width)) - (max-right (- workarea-width right-margin))) + (let ((right (+ left width extra-width))) (cond - ((> right max-right) - ;; Move FRAME to left. - (setq left (max 0 (- left (- right max-right))))) + ((> right right-margin) + ;; Move frame to left (we don't know its real width). + (setq left (min (- right-margin display-width) -1))) ((< left left-margin) ;; Move frame to right. (setq left left-margin))))) @@ -7005,12 +7009,11 @@ ;; Add extra height. (setq height (+ height extra-height)) ;; Preserve bottom and top margins. - (let ((bottom (+ top height extra-height)) - (max-bottom (- workarea-height bottom-margin))) + (let ((bottom (+ top height extra-height))) (cond - ((> bottom max-bottom) - ;; Move FRAME to left. - (setq top (max 0 (- top (- bottom max-bottom))))) + ((> bottom bottom-margin) + ;; Move frame up (we don't know its real height). + (setq top (min (- bottom-margin display-height) -1))) ((< top top-margin) ;; Move frame down. (setq top top-margin))))) @@ -7027,16 +7030,16 @@ (set-frame-size frame (if width - (if window-resize-pixelwise + (if frame-resize-pixelwise width (/ width char-width)) (frame-text-width)) (if height - (if window-resize-pixelwise + (if frame-resize-pixelwise height (/ height char-height)) (frame-text-height)) - window-resize-pixelwise))))) + frame-resize-pixelwise))))) (defun fit-window-to-buffer (&optional window max-height min-height max-width min-width) "Adjust size of WINDOW to display its buffer's contents exactly. @@ -7098,7 +7101,10 @@ (window-safe-min-pixel-height window) window-safe-min-height)) ;; Preserve header and mode line if present. - (window-min-size nil nil t pixelwise))) + (max (if pixelwise + (* char-height window-min-height) + window-min-height) + (window-min-size nil nil t pixelwise)))) (max-height ;; Sanitize MAX-HEIGHT. (if (numberp max-height) @@ -7150,7 +7156,10 @@ (window-safe-min-pixel-width) window-safe-min-width)) ;; Preserve fringes, margins, scrollbars if present. - (window-min-size nil nil t pixelwise))) + (max (if pixelwise + (* char-width window-min-width) + window-min-width) + (window-min-size nil nil t pixelwise)))) (max-width ;; Sanitize MAX-WIDTH. (if (numberp max-width) ------------------------------------------------------------ revno: 116003 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2014-01-13 00:03:31 -0500 message: * lisp/indent.el (indent-according-to-mode): Flush to column 0 in text-mode after an empty line. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-12 23:34:33 +0000 +++ lisp/ChangeLog 2014-01-13 05:03:31 +0000 @@ -1,3 +1,8 @@ +2014-01-13 Stefan Monnier + + * indent.el (indent-according-to-mode): Flush to column 0 in text-mode + after an empty line. + 2014-01-12 Stefan Monnier * net/shr.el (shr-render-region): Autoload. === modified file 'lisp/indent.el' --- lisp/indent.el 2014-01-01 07:43:34 +0000 +++ lisp/indent.el 2014-01-13 05:03:31 +0000 @@ -76,9 +76,10 @@ ;; indenting. Replace with something ad-hoc. (let ((column (save-excursion (beginning-of-line) - (skip-chars-backward "\n \t") - (beginning-of-line) - (current-indentation)))) + (if (bobp) 0 + (beginning-of-line 0) + (if (looking-at "[ \t]*$") 0 + (current-indentation)))))) (if (<= (current-column) (current-indentation)) (indent-line-to column) (save-excursion (indent-line-to column)))) ------------------------------------------------------------ revno: 116002 [merge] committer: Daniel Colascione branch nick: trunk timestamp: Sun 2014-01-12 17:50:46 -0800 message: Make GTK+ menus work correctly with the Unity global menu diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-12 23:23:55 +0000 +++ src/ChangeLog 2014-01-13 01:50:46 +0000 @@ -1,3 +1,19 @@ +2014-01-13 Daniel Colascione + + Fix menu item updating in the presence of the Unity global menu + GTK+ module. + + * gtkutil.h (xg_have_tear_offs): Add frame parameter + * gtkutil.c (xg_have_tear_offs): Count the global menu as a + tear-off. + (xg_update_menubar,xg_update_menu_item): Call g_object_notify when + updating menus; explain why. + (xg_update_frame_menubar): Remove the 23px hack: I can't repro the + problem it's supposed to solve and it interferes with detecting + the presence of a global menu. + * xmenu.c (set_frame_menubar): Call xg_have_tear_offs with new + parameter. + 2014-01-11 K. Handa * composite.c (composition_update_it): Fix indexing of === modified file 'src/gtkutil.c' --- src/gtkutil.c 2014-01-01 07:43:34 +0000 +++ src/gtkutil.c 2014-01-13 01:40:35 +0000 @@ -2414,9 +2414,12 @@ /* Return true if there are detached menus. */ bool -xg_have_tear_offs (void) +xg_have_tear_offs (struct frame *f) { - return xg_detached_menus > 0; + /* If the frame's menubar height is zero, the menu bar is probably + being redirected outside the window to some kind of global menu; + this situation is the moral equivalent of a tear-off. */ + return FRAME_MENUBAR_HEIGHT (f) == 0 || xg_detached_menus > 0; } /* Callback invoked when a detached menu window is removed. Here we @@ -2449,9 +2452,9 @@ } #else /* ! HAVE_GTK_TEAROFF_MENU_ITEM_NEW */ bool -xg_have_tear_offs (void) +xg_have_tear_offs (struct frame *f) { - return false; + return FRAME_MENUBAR_HEIGHT (f) == 0; } #endif /* ! HAVE_GTK_TEAROFF_MENU_ITEM_NEW */ @@ -2897,7 +2900,13 @@ char *utf8_label = get_utf8_string (val->name); GtkWidget *submenu = gtk_menu_item_get_submenu (witem); + /* GTK menu items don't notice when their labels have been + changed from underneath them, so we have to explicitly + use g_object_notify to tell listeners (e.g., a GMenuModel + bridge that might be loaded) that the item's label has + changed. */ gtk_label_set_text (wlabel, utf8_label); + g_object_notify (G_OBJECT (witem), "label"); #ifdef HAVE_GTK_TEAROFF_MENU_ITEM_NEW /* If this item has a submenu that has been detached, change @@ -2934,6 +2943,7 @@ select_cb, deactivate_cb, highlight_cb, 0, 0, 0, 0, cl_data, 0); + gtk_widget_set_name (w, MENU_ITEM_NAME); gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos); gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); @@ -2993,6 +3003,7 @@ const char *old_label = 0; const char *old_key = 0; xg_menu_item_cb_data *cb_data; + bool label_changed = false; wchild = XG_BIN_CHILD (w); utf8_label = get_utf8_string (val->name); @@ -3037,15 +3048,20 @@ } } - if (wkey) old_key = gtk_label_get_label (wkey); if (wlbl) old_label = gtk_label_get_label (wlbl); if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0)) - gtk_label_set_text (wkey, utf8_key); + { + label_changed = true; + gtk_label_set_text (wkey, utf8_key); + } if (! old_label || strcmp (utf8_label, old_label) != 0) - gtk_label_set_text (wlbl, utf8_label); + { + label_changed = true; + gtk_label_set_text (wlbl, utf8_label); + } if (utf8_key) g_free (utf8_key); if (utf8_label) g_free (utf8_label); @@ -3077,6 +3093,9 @@ cb_data->select_id = 0; } } + + if (label_changed) /* See comment in xg_update_menubar. */ + g_object_notify (G_OBJECT (w), "label"); } /* Update the toggle menu item W so it corresponds to VAL. */ @@ -3359,11 +3378,6 @@ gtk_widget_show_all (x->menubar_widget); gtk_widget_get_preferred_size (x->menubar_widget, NULL, &req); - /* If menu bar doesn't know its height yet, cheat a little so the frame - doesn't jump so much when resized later in menubar_map_cb. */ - if (req.height == 0) - req.height = 23; - if (FRAME_MENUBAR_HEIGHT (f) != req.height) { FRAME_MENUBAR_HEIGHT (f) = req.height; === modified file 'src/gtkutil.h' --- src/gtkutil.h 2014-01-01 07:43:34 +0000 +++ src/gtkutil.h 2014-01-13 01:40:35 +0000 @@ -107,7 +107,7 @@ extern bool xg_event_is_for_menubar (struct frame *, const XEvent *); -extern bool xg_have_tear_offs (void); +extern bool xg_have_tear_offs (struct frame *f); extern ptrdiff_t xg_get_scroll_id_for_window (Display *dpy, Window wid); === modified file 'src/xmenu.c' --- src/xmenu.c 2014-01-01 07:43:34 +0000 +++ src/xmenu.c 2014-01-13 01:40:35 +0000 @@ -796,7 +796,7 @@ #ifdef USE_GTK /* If we have detached menus, we must update deep so detached menus also gets updated. */ - deep_p = deep_p || xg_have_tear_offs (); + deep_p = deep_p || xg_have_tear_offs (f); #endif if (deep_p) ------------------------------------------------------------ revno: 116001 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2014-01-12 18:34:33 -0500 message: * lisp/net/shr.el (shr-render-region): Autoload. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-12 14:54:50 +0000 +++ lisp/ChangeLog 2014-01-12 23:34:33 +0000 @@ -1,3 +1,7 @@ +2014-01-12 Stefan Monnier + + * net/shr.el (shr-render-region): Autoload. + 2014-01-12 Xue Fuqiao * net/eww.el (eww-download-directory): Rename from @@ -31,22 +35,20 @@ (eldoc-mode): Restrict eldoc-message-commands to editing commands if eldoc-print-after-edit is set. (Bug#16346) - * progmodes/octave.el (octave-mode-menu): Adapt to change in - eldoc. + * progmodes/octave.el (octave-mode-menu): Adapt to change in eldoc. 2014-01-11 Eric S. Raymond * version.el (emacs-repository-get-version): Enhance so the - function works correctly in either a Bazaar or Git repo. The - Bazaar case can be discarded after the repo transition. + function works correctly in either a Bazaar or Git repo. - * play/meese.el: It's 2014 and Ed Meese is justly forgotten. Goes - with removal of the joke manpages from /etc. + * play/meese.el: It's 2014 and Ed Meese is justly forgotten. + Goes with removal of the joke manpages from /etc. 2014-01-10 K. Handa - * mail/rmail.el (rmail-get-coding-system): Check - rmail-get-coding-function before "funcall"ing it. + * mail/rmail.el (rmail-get-coding-system): + Check rmail-get-coding-function before "funcall"ing it. 2014-01-10 Glenn Morris @@ -69,8 +71,7 @@ 2014-01-10 Chong Yidong - * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is - loaded. + * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is loaded. 2014-01-10 Anders Lindgren === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2014-01-05 10:23:35 +0000 +++ lisp/net/shr.el 2014-01-12 23:34:33 +0000 @@ -169,6 +169,7 @@ (libxml-parse-html-region (point-min) (point-max)))) (goto-char (point-min))) +;;;###autoload (defun shr-render-region (begin end &optional buffer) "Display the HTML rendering of the region between BEGIN and END." (interactive "r") ------------------------------------------------------------ revno: 116000 [merge] committer: K. Handa branch nick: trunk timestamp: Mon 2014-01-13 08:27:14 +0900 message: composite.c (composition_update_it): Fix indexing of LGSTRING_CHAR (Bug#15984). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-11 13:36:06 +0000 +++ src/ChangeLog 2014-01-12 23:23:55 +0000 @@ -1,3 +1,8 @@ +2014-01-11 K. Handa + + * composite.c (composition_update_it): Fix indexing of + LGSTRING_CHAR (Bug#15984). + 2014-01-11 Fabrice Popineau * unexw32.c (_start) [__MINGW64__]: Define to __start. === modified file 'src/composite.c' --- src/composite.c 2014-01-01 07:43:34 +0000 +++ src/composite.c 2014-01-12 23:23:55 +0000 @@ -1412,7 +1412,7 @@ cmp_it->width = 0; for (i = cmp_it->nchars - 1; i >= 0; i--) { - c = XINT (LGSTRING_CHAR (gstring, i)); + c = XINT (LGSTRING_CHAR (gstring, cmp_it->from + i)); cmp_it->nbytes += CHAR_BYTES (c); cmp_it->width += CHAR_WIDTH (c); } ------------------------------------------------------------ revno: 115999 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2014-01-12 20:11:49 +0200 message: Remove ChangeLog entry of a reverted commit in Makefile.in. diff: === modified file 'ChangeLog' --- ChangeLog 2014-01-12 17:27:17 +0000 +++ ChangeLog 2014-01-12 18:11:49 +0000 @@ -1,7 +1,3 @@ -2014-01-12 Eli Zaretskii - - * Makefile.in (src): Fix the computation of $vcswitness. - 2014-01-12 Glenn Morris * README: Replace reference to etc/MAILINGLISTS. ------------------------------------------------------------ revno: 115998 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2014-01-12 20:02:45 +0200 message: Fix last commit. diff: === modified file 'Makefile.in' --- Makefile.in 2014-01-12 17:27:17 +0000 +++ Makefile.in 2014-01-12 18:02:45 +0000 @@ -375,7 +375,7 @@ # is not wrong, but is overkill in 99.99% of the cases. src: Makefile FRC dirstate='.bzr/checkout/dirstate'; \ - vcswitness='$(srcdir)/../'$$dirstate; \ + vcswitness='$$(srcdir)/../'$$dirstate; \ [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ cd $@ || exit; \ boot=bootstrap-emacs$(EXEEXT); \ ------------------------------------------------------------ revno: 115997 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2014-01-12 19:27:17 +0200 message: Revert part of revision 115992 and fix the VCSWITNESS thingy. Makefile.in (src): Fix the computation of $vcswitness. diff: === modified file 'ChangeLog' --- ChangeLog 2014-01-12 16:37:42 +0000 +++ ChangeLog 2014-01-12 17:27:17 +0000 @@ -1,7 +1,6 @@ -2014-01-12 Eric S. Raymond +2014-01-12 Eli Zaretskii - * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS - code, and explain the problem. + * Makefile.in (src): Fix the computation of $vcswitness. 2014-01-12 Glenn Morris === modified file 'Makefile.in' --- Makefile.in 2014-01-12 14:54:50 +0000 +++ Makefile.in 2014-01-12 17:27:17 +0000 @@ -374,12 +374,16 @@ # all preloaded elisp files, and only then dump the actual src/emacs, which # is not wrong, but is overkill in 99.99% of the cases. src: Makefile FRC + dirstate='.bzr/checkout/dirstate'; \ + vcswitness='$(srcdir)/../'$$dirstate; \ + [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ cd $@ || exit; \ boot=bootstrap-emacs$(EXEEXT); \ [ ! -x "$$boot" ] || boot=''; \ $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \ + VCSWITNESS="$$vcswitness" blessmail: Makefile src FRC cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ === modified file 'etc/PROBLEMS' --- etc/PROBLEMS 2014-01-12 14:54:50 +0000 +++ etc/PROBLEMS 2014-01-12 17:27:17 +0000 @@ -2429,12 +2429,6 @@ from source, rather than the Ubuntu version, worked. See . -*** Rebuild of loaddefs.el is not always done after Lisp changes - -The rebuild production should depend on all Lisp files with #autoload -cookies. It doesn't yet. This needs a configure-time improvement to -the nuild system. - ** Dumping *** Linux: Segfault during `make bootstrap' under certain recent versions of the Linux kernel. === modified file 'src/Makefile.in' --- src/Makefile.in 2014-01-12 14:54:50 +0000 +++ src/Makefile.in 2014-01-12 17:27:17 +0000 @@ -629,10 +629,12 @@ ## Since the .el.elc rule cannot specify an extra dependency, we do it here. $(lisp): $(BOOTSTRAPEMACS) -## This ought to depend on every Lisp file that contains an autoload cookie. -## A task for the future... +## VCSWITNESS points to the file that holds info about the current checkout. +## We use it as a heuristic to decide when to rebuild loaddefs.el. +## If empty it is ignored; the parent makefile can set it to some other value. +VCSWITNESS = -$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) +$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)" ## Dump an Emacs executable named bootstrap-emacs containing the ------------------------------------------------------------ revno: 115996 committer: David Engster branch nick: trunk timestamp: Sun 2014-01-12 17:50:54 +0100 message: Update EIEIO documentation because of namespace cleanup. * eieio.texi (Introduction): `class-of' is obsolete. (Predicates, Basic Methods): Adapt function names to namespace cleanup. * NEWS: Add missing renames to EIEIO section. Also, no functions were removed but only made obsolete. Class field accessors were always purely internal, so remove that remark. Add markup. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-01-12 15:19:07 +0000 +++ doc/misc/ChangeLog 2014-01-12 16:50:54 +0000 @@ -4,6 +4,12 @@ Use "file name" instead of "filename" or "path". Use "host" instead of "machine". +2014-01-12 David Engster + + * eieio.texi (Introduction): `class-of' is obsolete. + (Predicates, Basic Methods): Adapt function names to namespace + cleanup. + 2014-01-12 Xue Fuqiao * eww.texi (Basics): Use "directory" instead of "path" (Bug#16419). === modified file 'doc/misc/eieio.texi' --- doc/misc/eieio.texi 2014-01-06 05:25:46 +0000 +++ doc/misc/eieio.texi 2014-01-12 16:50:54 +0000 @@ -223,10 +223,9 @@ @item Support for metaclasses There is just one default metaclass, @code{eieio-default-superclass}, and you cannot define your own. The @code{:metaclass} tag in -@code{defclass} is ignored. Also, functions like `class-of' and -`find-class', which should return instances of the metaclass, behave -differently in @eieio{} in that they return symbols or plain structures -instead. +@code{defclass} is ignored. Also, functions like `find-class', which +should return instances of the metaclass, behave differently in +@eieio{} in that they return symbols or plain structures instead. @item EQL specialization EIEIO does not support it. @@ -1065,7 +1064,7 @@ @var{object} can be an instance or a class. @end defun -@defun class-name class +@defun eieio-class-name class Return a string of the form @samp{#} which should look similar to other Lisp objects like buffers and processes. Printing a class results only in a symbol. @@ -1089,7 +1088,7 @@ without knowing what it is. This is not a part of CLOS. @end defun -@defun object-name obj +@defun eieio-object-name obj Return a string of the form @samp{#} for @var{obj}. This should look like Lisp symbols from other parts of Emacs such as buffers and processes, and is shorter and cleaner than printing the @@ -1098,43 +1097,39 @@ information into the symbol. @end defun -@defun object-class obj +@defun eieio-object-class obj Returns the class symbol from @var{obj}. @end defun -@defun class-of obj -CLOS symbol which does the same thing as @code{object-class} -@end defun - -@defun object-class-fast obj -Same as @code{object-class} except this is a macro, and no +@defun eieio--object-class obj +Same as @code{eieio-object-class} except this is a macro, and no type-checking is performed. @end defun -@defun object-class-name obj +@defun eieio-object-class-name obj Returns the symbol of @var{obj}'s class. @end defun -@defun class-parents class +@defun eieio-class-parents class Returns the direct parents class of @var{class}. Returns @code{nil} if it is a superclass. @end defun -@defun class-parents-fast class -Just like @code{class-parent} except it is a macro and no type checking +@defun eieio-class-parents-fast class +Just like @code{eieio-class-parents} except it is a macro and no type checking is performed. @end defun -@defun class-parent class +@defun eieio-class-parent class Deprecated function which returns the first parent of @var{class}. @end defun -@defun class-children class +@defun eieio-class-children class Return the list of classes inheriting from @var{class}. @end defun -@defun class-children-fast class -Just like @code{class-children}, but with no checks. +@defun eieio-class-children-fast class +Just like @code{eieio-class-children}, but with no checks. @end defun @defun same-class-p obj class @@ -1676,9 +1671,9 @@ @defun object-print this &rest strings @anchor{object-print} -Pretty printer for object @var{this}. Call function @dfn{object-name} with @var{strings}. +Pretty printer for object @var{this}. Call function @dfn{eieio-object-name} with @var{strings}. The default method for printing object @var{this} is to use the -function @dfn{object-name}. +function @dfn{eieio-object-name}. It is sometimes useful to put a summary of the object into the default # string when using eieio browsing tools. === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-01-12 01:35:51 +0000 +++ etc/ChangeLog 2014-01-12 16:50:54 +0000 @@ -1,3 +1,9 @@ +2014-01-12 David Engster + + * NEWS: Add missing renames to EIEIO section. Also, no functions + were removed but only made obsolete. Class field accessors were + always purely internal, so remove that remark. Add markup. + 2014-01-11 Eric S. Raymond * celibacy.1, sex.6, condom.1, echo.msg: Deleted at RMS's === modified file 'etc/NEWS' --- etc/NEWS 2014-01-12 01:28:40 +0000 +++ etc/NEWS 2014-01-12 16:50:54 +0000 @@ -1230,25 +1230,25 @@ ** EIEIO ++++ *** Namespace cleanup by obsolete-aliasing functions to use `eieio-' prefix. **** object-name -> eieio-object-name **** object-class -> eieio-object-class **** object-class-fast -> eieio--object-class +**** object-class-name -> eieio-object-class-name **** object-name-string -> eieio-object-name-string **** object-num-slots -> eieio--object-num-slots **** object-set-name-string -> eieio-object-set-name-string +**** class-of -> eieio-object-class +**** class-name -> eieio-class-name **** class-parent -> eieio-class-parent **** class-parents -> eieio-class-parents +**** class-parents-fast -> eieio-class-parents-fast **** class-children -> eieio-class-children **** class-num-slots -> eieio--class-num-slots **** class-precedence-list -> eieio-class-precedence-list -**** All generated class-* and object-* field accessors are now -prefixed with `eieio-' as well. - -*** Obsoleted functions: -**** class-of -**** class-direct-subclasses -**** class-direct-superclasses +**** class-direct-subclasses -> eieio-class-children +**** class-direct-superclasses -> eieio-class-parents ** Changes in encoding and decoding of text ------------------------------------------------------------ revno: 115995 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2014-01-12 18:37:42 +0200 message: Revert last commit. diff: === modified file 'ChangeLog' --- ChangeLog 2014-01-12 15:37:23 +0000 +++ ChangeLog 2014-01-12 16:37:42 +0000 @@ -1,8 +1,5 @@ 2014-01-12 Eric S. Raymond - * doc/misc/efaq.texi, etc/CONTRIBUTE, lisp/mh-e/mh-acros.el: - Remove more references unnecessarily specific to VCS. - * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS code, and explain the problem. === modified file 'doc/misc/efaq.texi' --- doc/misc/efaq.texi 2014-01-12 15:37:23 +0000 +++ doc/misc/efaq.texi 2014-01-12 16:37:42 +0000 @@ -978,6 +978,7 @@ @cindex Latest version of Emacs @cindex Development, Emacs @cindex Repository, Emacs +@cindex Bazaar repository, Emacs Emacs @value{EMACSVER} is the current version as of this writing. A version number with two components (e.g., @samp{22.1}) indicates a released @@ -988,6 +989,7 @@ @uref{http://savannah.gnu.org/projects/emacs/, Savannah}. The source code can be retrieved anonymously following the @uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}. +The repository is GNU Bazaar. Because Emacs undergoes many changes before a release, the version number of a development version is not especially meaningful. It is === modified file 'etc/CONTRIBUTE' --- etc/CONTRIBUTE 2014-01-12 15:37:23 +0000 +++ etc/CONTRIBUTE 2014-01-12 16:37:42 +0000 @@ -71,12 +71,11 @@ * Getting the Source Code -The latest version of Emacs can be fetched from the version-control -repository on the Savannah web site. It is important to write your -patch based on the latest version. If you start from an older -version, your patch may be outdated (so that maintainers will have a -hard time applying it), or changes in Emacs may have made your patch -unnecessary. +The latest version of Emacs can be downloaded using Bazaar from the +Savannah web site. It is important to write your patch based on the +latest version. If you start from an older version, your patch may be +outdated (so that maintainers will have a hard time applying it), or +changes in Emacs may have made your patch unnecessary. After you have downloaded the repository source, you should read the file INSTALL.REPO for build instructions (they differ to some extent from a === modified file 'lisp/mh-e/mh-acros.el' --- lisp/mh-e/mh-acros.el 2014-01-12 15:37:23 +0000 +++ lisp/mh-e/mh-acros.el 2014-01-12 16:37:42 +0000 @@ -25,16 +25,16 @@ ;;; Commentary: ;; This file contains all macros that are used in more than one file. -;; If you run "make recompile" in the Emacs repository and see the message +;; If you run "make recompile" in Bazaar Emacs and see the message ;; "Source is newer than compiled," it is a sign that macro probably ;; needs to be moved here. ;; Historically, it was so named with a silent "m" so that it would be -;; compiled first. Otherwise, "make recompile" in the Emacs repository -;; would use compiled files with stale macro definitions. Later, -;; no-byte-compile was added to the Local Variables section to avoid -;; this problem and because it's pointless to compile a file full of -;; macros. But we kept the name. +;; compiled first. Otherwise, "make recompile" in Bazaar Emacs would use +;; compiled files with stale macro definitions. Later, no-byte-compile +;; was added to the Local Variables section to avoid this problem and +;; because it's pointless to compile a file full of macros. But we +;; kept the name. ;;; Change Log: ------------------------------------------------------------ revno: 115994 committer: Eric S. Raymond branch nick: trunk timestamp: Sun 2014-01-12 10:37:23 -0500 message: Remove more references unnecessarily specific to VCS. diff: === modified file 'ChangeLog' --- ChangeLog 2014-01-12 14:54:50 +0000 +++ ChangeLog 2014-01-12 15:37:23 +0000 @@ -1,5 +1,8 @@ 2014-01-12 Eric S. Raymond + * doc/misc/efaq.texi, etc/CONTRIBUTE, lisp/mh-e/mh-acros.el: + Remove more references unnecessarily specific to VCS. + * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS code, and explain the problem. === modified file 'doc/misc/efaq.texi' --- doc/misc/efaq.texi 2014-01-12 01:35:51 +0000 +++ doc/misc/efaq.texi 2014-01-12 15:37:23 +0000 @@ -978,7 +978,6 @@ @cindex Latest version of Emacs @cindex Development, Emacs @cindex Repository, Emacs -@cindex Bazaar repository, Emacs Emacs @value{EMACSVER} is the current version as of this writing. A version number with two components (e.g., @samp{22.1}) indicates a released @@ -989,7 +988,6 @@ @uref{http://savannah.gnu.org/projects/emacs/, Savannah}. The source code can be retrieved anonymously following the @uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}. -The repository is GNU Bazaar. Because Emacs undergoes many changes before a release, the version number of a development version is not especially meaningful. It is === modified file 'etc/CONTRIBUTE' --- etc/CONTRIBUTE 2014-01-09 00:10:07 +0000 +++ etc/CONTRIBUTE 2014-01-12 15:37:23 +0000 @@ -71,11 +71,12 @@ * Getting the Source Code -The latest version of Emacs can be downloaded using Bazaar from the -Savannah web site. It is important to write your patch based on the -latest version. If you start from an older version, your patch may be -outdated (so that maintainers will have a hard time applying it), or -changes in Emacs may have made your patch unnecessary. +The latest version of Emacs can be fetched from the version-control +repository on the Savannah web site. It is important to write your +patch based on the latest version. If you start from an older +version, your patch may be outdated (so that maintainers will have a +hard time applying it), or changes in Emacs may have made your patch +unnecessary. After you have downloaded the repository source, you should read the file INSTALL.REPO for build instructions (they differ to some extent from a === modified file 'lisp/mh-e/mh-acros.el' --- lisp/mh-e/mh-acros.el 2014-01-01 07:43:34 +0000 +++ lisp/mh-e/mh-acros.el 2014-01-12 15:37:23 +0000 @@ -25,16 +25,16 @@ ;;; Commentary: ;; This file contains all macros that are used in more than one file. -;; If you run "make recompile" in Bazaar Emacs and see the message +;; If you run "make recompile" in the Emacs repository and see the message ;; "Source is newer than compiled," it is a sign that macro probably ;; needs to be moved here. ;; Historically, it was so named with a silent "m" so that it would be -;; compiled first. Otherwise, "make recompile" in Bazaar Emacs would use -;; compiled files with stale macro definitions. Later, no-byte-compile -;; was added to the Local Variables section to avoid this problem and -;; because it's pointless to compile a file full of macros. But we -;; kept the name. +;; compiled first. Otherwise, "make recompile" in the Emacs repository +;; would use compiled files with stale macro definitions. Later, +;; no-byte-compile was added to the Local Variables section to avoid +;; this problem and because it's pointless to compile a file full of +;; macros. But we kept the name. ;;; Change Log: ------------------------------------------------------------ revno: 115993 committer: Michael Albinus branch nick: trunk timestamp: Sun 2014-01-12 16:19:07 +0100 message: * tramp.texi (all): Doc fix according to GNU Coding Standards. Use "file name" instead of "filename" or "path". Use "host" instead of "machine". diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-01-12 14:25:10 +0000 +++ doc/misc/ChangeLog 2014-01-12 15:19:07 +0000 @@ -1,3 +1,9 @@ +2014-01-12 Michael Albinus + + * tramp.texi (all): Doc fix according to GNU Coding Standards. + Use "file name" instead of "filename" or "path". Use "host" + instead of "machine". + 2014-01-12 Xue Fuqiao * eww.texi (Basics): Use "directory" instead of "path" (Bug#16419). === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2014-01-06 05:25:46 +0000 +++ doc/misc/tramp.texi 2014-01-12 15:19:07 +0000 @@ -17,7 +17,7 @@ @include trampver.texi -@c Macro for formatting a filename according to the respective syntax. +@c Macro for formatting a file name according to the respective syntax. @c xxx and yyy are auxiliary macros in order to omit leading and @c trailing whitespace. Not very elegant, but I don't know it better. @@ -198,7 +198,7 @@ Configuring @value{tramp} for use -* Connection types:: Types of connections made to remote machines. +* Connection types:: Types of connections made to remote hosts. * Inline methods:: Inline methods. * External methods:: External methods. @ifset emacsgvfs @@ -217,7 +217,7 @@ * Connection caching:: Reusing connection related information. * Predefined connection information:: Setting own connection related information. -* Remote Programs:: How @value{tramp} finds and uses programs on the remote machine. +* Remote Programs:: How @value{tramp} finds and uses programs on the remote host. * Remote shell setup:: Remote shell setup hints. * Android shell setup:: Android shell setup hints. * Auto-save and Backup:: Auto-save and Backup. @@ -225,8 +225,8 @@ Using @value{tramp} -* Filename Syntax:: @value{tramp} filename conventions. -* Filename completion:: Filename completion. +* File name Syntax:: @value{tramp} file name conventions. +* File name completion:: File name completion. * Ad-hoc multi-hops:: Declaring multiple hops in the file name. * Remote processes:: Integration with other @value{emacsname} packages. * Cleanup remote connections:: Cleanup remote connections. @@ -247,18 +247,18 @@ @cindex overview After the installation of @value{tramp} into your @value{emacsname}, you -will be able to access files on remote machines as though they were +will be able to access files on remote hosts as though they were local. Access to the remote file system for editing files, version control, and @code{dired} are transparently enabled. -Your access to the remote machine can be with the @command{rsh}, +Your access to the remote host can be with the @command{rsh}, @command{rlogin}, @command{telnet} programs or with any similar connection method. This connection must pass @acronym{ASCII} successfully to be usable but need not be 8-bit clean. The package provides support for @command{ssh} connections out of the box, one of the more common uses of the package. This allows -relatively secure access to machines, especially if @command{ftp} +relatively secure access to hosts, especially if @command{ftp} access is disabled. Under Windows, @value{tramp} is integrated with the PuTTY package, @@ -267,11 +267,11 @@ The majority of activity carried out by @value{tramp} requires only that the remote login is possible and is carried out at the terminal. In order to access remote files @value{tramp} needs to transfer their content -to the local machine temporarily. +to the local host temporarily. -@value{tramp} can transfer files between the machines in a variety of ways. +@value{tramp} can transfer files between the hosts in a variety of ways. The details are easy to select, depending on your needs and the -machines in question. +hosts in question. The fastest transfer methods for large files rely on a remote file transfer package such as @command{rcp}, @command{scp}, @command{rsync} @@ -280,7 +280,7 @@ If the remote copy methods are not suitable for you, @value{tramp} also supports the use of encoded transfers directly through the shell. This requires that the @command{mimencode} or @command{uuencode} tools -are available on the remote machine. These methods are generally +are available on the remote host. These methods are generally faster for small files. @value{tramp} is still under active development and any problems you encounter, @@ -351,7 +351,7 @@ @item Now the remote shell is up and it good working order. Remember, what was supposed to happen is that @value{tramp} tries to find out what files exist -on the remote host so that it can do filename completion. +on the remote host so that it can do file name completion. So, @value{tramp} basically issues @command{cd} and @command{ls} commands and also sometimes @command{echo} with globbing. Another command that is @@ -360,7 +360,7 @@ necessary operation. @item -Suppose you are finished with filename completion, have entered @kbd{C-x +Suppose you are finished with file name completion, have entered @kbd{C-x C-f}, a full file name and hit @kbd{@key{RET}}. Now comes the time to transfer the file contents from the remote host to the local host so that you can edit them. @@ -470,7 +470,7 @@ file contents were added. Support for VC was added. After that, there were added the multi-hop methods in April 2000 and -the unification of @value{tramp} and Ange-FTP filenames in July 2002. +the unification of @value{tramp} and Ange-FTP file names in July 2002. In July 2004, multi-hop methods have been replaced by proxy hosts. Running commands on remote hosts was introduced in December 2005. @ifset emacsgw @@ -508,8 +508,8 @@ @value{tramp} is (normally) fully functional when it is initially installed. It is initially configured to use the @command{scp} program to connect to the remote host. So in the easiest case, you -just type @kbd{C-x C-f} and then enter the filename -@file{@trampfn{, user, machine, /path/to.file}}. +just type @kbd{C-x C-f} and then enter the file name +@file{@trampfn{, user, host, /path/to.file}}. On some hosts, there are problems with opening a connection. These are related to the behavior of the remote shell. See @xref{Remote shell @@ -518,7 +518,7 @@ If you do not wish to use these commands to connect to the remote host, you should change the default connection and transfer method that @value{tramp} uses. There are several different methods that @value{tramp} -can use to connect to remote machines and transfer files +can use to connect to remote hosts and transfer files (@pxref{Connection types}). If you don't know which method is right for you, see @xref{Default @@ -526,7 +526,7 @@ @menu -* Connection types:: Types of connections made to remote machines. +* Connection types:: Types of connections made to remote hosts. * Inline methods:: Inline methods. * External methods:: External methods. @ifset emacsgvfs @@ -548,7 +548,7 @@ * Connection caching:: Reusing connection related information. * Predefined connection information:: Setting own connection related information. -* Remote Programs:: How @value{tramp} finds and uses programs on the remote machine. +* Remote Programs:: How @value{tramp} finds and uses programs on the remote host. * Remote shell setup:: Remote shell setup hints. * Android shell setup:: Android shell setup hints. * Auto-save and Backup:: Auto-save and Backup. @@ -557,17 +557,17 @@ @node Connection types -@section Types of connections made to remote machines +@section Types of connections made to remote hosts @cindex connection types, overview There are two basic types of transfer methods, each with its own advantages and limitations. Both types of connection make use of a remote shell access program such as @command{rsh}, @command{ssh} or -@command{telnet} to connect to the remote machine. +@command{telnet} to connect to the remote host. This connection is used to perform many of the operations that @value{tramp} requires to make the remote file system transparently accessible from -the local machine. It is only when visiting files that the methods +the local host. It is only when visiting files that the methods differ. @cindex inline methods @@ -575,9 +575,9 @@ @cindex methods, inline @cindex methods, external Loading or saving a remote file requires that the content of the file -be transferred between the two machines. The content of the file can +be transferred between the two hosts. The content of the file can be transferred using one of two methods: the @dfn{inline method} over -the same connection used to log in to the remote machine, or the +the same connection used to log in to the remote host, or the @dfn{external method} through another connection using a remote copy program such as @command{rcp}, @command{scp} or @command{rsync}. @@ -607,12 +607,12 @@ The inline methods in @value{tramp} are quite powerful and can work in situations where you cannot use an external transfer program to connect. Inline methods are the only methods that work when connecting to the -remote machine via telnet. (There are also strange inline methods which +remote host via telnet. (There are also strange inline methods which allow you to transfer files between @emph{user identities} rather than hosts, see below.) These methods depend on the existence of a suitable encoding and -decoding command on remote machine. Locally, @value{tramp} may be able to +decoding command on remote host. Locally, @value{tramp} may be able to use features of @value{emacsname} to decode and encode the files or it may require access to external commands to perform that task. @@ -789,11 +789,11 @@ @cindex rsh (with rcp method) This method uses the @command{rsh} and @command{rcp} commands to connect -to the remote machine and transfer files. This is probably the fastest +to the remote host and transfer files. This is probably the fastest connection method available. The alternative method @option{remcp} uses the @command{remsh} and -@command{rcp} commands. It should be applied on machines where +@command{rcp} commands. It should be applied on hosts where @command{remsh} is used instead of @command{rsh}. @@ -804,8 +804,8 @@ @cindex ssh (with scp method) Using @command{ssh} to connect to the remote host and @command{scp} to -transfer files between the machines is the best method for securely -connecting to a remote machine and accessing files. +transfer files between the hosts is the best method for securely +connecting to a remote host and accessing files. The performance of this option is also quite good. It may be slower than the inline methods when you often open and close small files however. @@ -843,7 +843,7 @@ @cindex ssh (with rsync method) Using the @command{ssh} command to connect securely to the remote -machine and the @command{rsync} command to transfer files is almost +host and the @command{rsync} command to transfer files is almost identical to the @option{scp} method. While @command{rsync} performs much better than @command{scp} when @@ -945,7 +945,7 @@ This is not a native @value{tramp} method. Instead, it forwards all requests to @value{ftppackagename}. @ifset xemacs -This works only for unified filenames, see @ref{Issues}. +This works only for unified file names, see @ref{Issues}. @end ifset @@ -974,15 +974,15 @@ Because of this, the @value{tramp} syntax has been extended: you can specify a user name which looks like @code{user%domain} (the real user name, then a percent sign, then the domain name). So, to connect to -the machine @code{melancholia} as user @code{daniel} of the domain +the host @code{melancholia} as user @code{daniel} of the domain @code{BIZARRE}, and edit @file{.emacs} in the home directory (share -@code{daniel$}) I would specify the filename @file{@trampfn{smb, +@code{daniel$}) I would specify the file name @file{@trampfn{smb, daniel%BIZARRE, melancholia, /daniel$$/.emacs}}. Depending on the Windows domain configuration, a Windows user might be considered as domain user per default. In order to connect as local -user, the WINS name of that machine must be given as domain name. -Usually, it is the machine name in capital letters. In the example +user, the WINS name of that host must be given as domain name. +Usually, it is the host name in capital letters. In the example above, the local user @code{daniel} would be specified as @file{@trampfn{smb, daniel%MELANCHOLIA, melancholia, /daniel$$/.emacs}}. @@ -1156,7 +1156,7 @@ method for all user names matching @samp{john} and the @option{rsync} method for all host names matching @samp{lily}. The third line specifies to use the @option{su} method for the user @samp{root} on -the machine @samp{localhost}. +the host @samp{localhost}. @lisp (add-to-list 'tramp-default-method-alist '("" "john" "ssh")) @@ -1180,9 +1180,9 @@ Internet, the security implications of your preferred method. The @option{rsh} and @option{telnet} methods send your password as -plain text as you log in to the remote machine, as well as +plain text as you log in to the remote host, as well as transferring the files in such a way that the content can easily be -read from other machines. +read from other hosts. If you need to connect to remote systems that are accessible from the Internet, you should give serious thought to using @option{ssh} based @@ -1207,7 +1207,7 @@ compression (driven by @var{tramp-inline-compress-start-size}) shall still result in good performance. -I guess that these days, most people can access a remote machine by +I guess that these days, most people can access a remote host by using @command{ssh}. So I suggest that you use the @option{ssh} method. So, type @kbd{C-x C-f @trampfn{ssh, root, otherhost, /etc/motd} @key{RET}} to edit the @file{/etc/motd} file on the other @@ -1359,7 +1359,7 @@ @var{host} and @var{user} are regular expressions or @code{nil}, which is interpreted as a regular expression which always matches. -@var{proxy} must be a Tramp filename which localname part is ignored. +@var{proxy} must be a Tramp file name which localname part is ignored. Method and user name on @var{proxy} are optional, which is interpreted with the default values. @ifset emacsgw @@ -1500,7 +1500,7 @@ The variable @code{tramp-completion-function-alist} is intended to customize which files are taken into account for user and host name -completion (@pxref{Filename completion}). For every method, it keeps +completion (@pxref{File name completion}). For every method, it keeps a set of configuration files, accompanied by a Lisp function able to parse that file. Entries in @code{tramp-completion-function-alist} have the form (@var{method} @var{pair1} @var{pair2} ...). @@ -1763,7 +1763,7 @@ @node Remote Programs -@section How @value{tramp} finds and uses programs on the remote machine +@section How @value{tramp} finds and uses programs on the remote host @value{tramp} depends on a number of programs on the remote host in order to function, including @command{ls}, @command{test}, @command{find} and @@ -1782,14 +1782,14 @@ @vindex tramp-default-remote-path @vindex tramp-own-remote-path @defopt tramp-remote-path -When @value{tramp} connects to the remote machine, it searches for the +When @value{tramp} connects to the remote host, it searches for the programs that it can use. The variable @code{tramp-remote-path} -controls the directories searched on the remote machine. +controls the directories searched on the remote host. By default, this is set to a reasonable set of defaults for most -machines. The symbol @code{tramp-default-remote-path} is a place +hosts. The symbol @code{tramp-default-remote-path} is a place holder, it is replaced by the list of directories received via the -command @command{getconf PATH} on your remote machine. For example, +command @command{getconf PATH} on your remote host. For example, on Debian GNU/Linux this is @file{/bin:/usr/bin}, whereas on Solaris this is @file{/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}. It is recommended to apply this symbol on top of @@ -2067,7 +2067,7 @@ Android devices use a restricted shell. They can be accessed via the @option{adb} method. However, this restricts the access to a USB connection, and it requires the installation of the Android SDK on the -local machine. +local host. When an @command{sshd} process runs on the Android device, like provided by the @code{SSHDroid} app, any @option{ssh}-based method can @@ -2293,7 +2293,7 @@ @cindex sshx method with Cygwin The recent Cygwin installation of @command{ssh} works only with a Cygwinized @value{emacsname}. You can check it by typing @kbd{M-x -eshell}, and starting @kbd{ssh test.machine}. The problem is evident +eshell}, and starting @kbd{ssh test.host}. The problem is evident if you see a message like this: @example @@ -2309,12 +2309,12 @@ @cindex scpx method with Cygwin If you wish to use the @option{scpx} connection method, then you might have the problem that @value{emacsname} calls @command{scp} with a -Windows filename such as @code{c:/foo}. The Cygwin version of -@command{scp} does not know about Windows filenames and interprets -this as a remote filename on the host @code{c}. +Windows file name such as @code{c:/foo}. The Cygwin version of +@command{scp} does not know about Windows file names and interprets +this as a remote file name on the host @code{c}. One possible workaround is to write a wrapper script for @option{scp} -which converts the Windows filename to a Cygwinized filename. +which converts the Windows file name to a Cygwinized file name. @cindex Cygwin and ssh-agent @cindex SSH_AUTH_SOCK and @value{emacsname} on Windows @@ -2338,7 +2338,7 @@ @cindex using @value{tramp} Once you have installed @value{tramp} it will operate fairly -transparently. You will be able to access files on any remote machine +transparently. You will be able to access files on any remote host that you can log in to as though they were local. Files are specified to @value{tramp} using a formalized syntax specifying the @@ -2357,52 +2357,52 @@ minute you have already forgotten that you hit that key! @menu -* Filename Syntax:: @value{tramp} filename conventions. -* Filename completion:: Filename completion. +* File name Syntax:: @value{tramp} file name conventions. +* File name completion:: File name completion. * Ad-hoc multi-hops:: Declaring multiple hops in the file name. * Remote processes:: Integration with other @value{emacsname} packages. * Cleanup remote connections:: Cleanup remote connections. @end menu -@node Filename Syntax -@section @value{tramp} filename conventions -@cindex filename syntax -@cindex filename examples +@node File name Syntax +@section @value{tramp} file name conventions +@cindex file name syntax +@cindex file name examples -To access the file @var{localname} on the remote machine @var{machine} -you would specify the filename @file{@trampfn{, , machine, -localname}}. This will connect to @var{machine} and transfer the file +To access the file @var{localname} on the remote host @var{host} +you would specify the file name @file{@trampfn{, , host, +localname}}. This will connect to @var{host} and transfer the file using the default method. @xref{Default Method}. -Some examples of @value{tramp} filenames are shown below. +Some examples of @value{tramp} file names are shown below. @table @file @item @value{prefix}melancholia@value{postfix}.emacs -Edit the file @file{.emacs} in your home directory on the machine +Edit the file @file{.emacs} in your home directory on the host @code{melancholia}. @item @value{prefix}melancholia.danann.net@value{postfix}.emacs This edits the same file, using the fully qualified domain name of -the machine. +the host. @item @value{prefix}melancholia@value{postfix}~/.emacs This also edits the same file; the @file{~} is expanded to your -home directory on the remote machine, just like it is locally. +home directory on the remote host, just like it is locally. @item @value{prefix}melancholia@value{postfix}~daniel/.emacs This edits the file @file{.emacs} in the home directory of the user -@code{daniel} on the machine @code{melancholia}. The @file{~} +@code{daniel} on the host @code{melancholia}. The @file{~} construct is expanded to the home directory of that user on the remote -machine. +host. @item @value{prefix}melancholia@value{postfix}/etc/squid.conf -This edits the file @file{/etc/squid.conf} on the machine +This edits the file @file{/etc/squid.conf} on the host @code{melancholia}. @end table -@var{machine} can also be an IPv4 or IPv6 address, like in +@var{host} can also be an IPv4 or IPv6 address, like in @file{@trampfn{, , 127.0.0.1, .emacs}} or @file{@trampfn{, , @value{ipv6prefix}::1@value{ipv6postfix}, .emacs}}. @ifset emacs @@ -2413,17 +2413,17 @@ Unless you specify a different name to use, @value{tramp} will use the current local user name as the remote user name to log in with. If you need to log in as a different user, you can specify the user name as -part of the filename. +part of the file name. -To log in to the remote machine as a specific user, you use the syntax -@file{@trampfn{, user, machine, path/to.file}}. That means that +To log in to the remote host as a specific user, you use the syntax +@file{@trampfn{, user, host, path/to.file}}. That means that connecting to @code{melancholia} as @code{daniel} and editing @file{.emacs} in your home directory you would specify @file{@trampfn{, daniel, melancholia, .emacs}}. It is also possible to specify other file transfer methods (@pxref{Inline methods}, @pxref{External methods}) as part of the -filename. +file name. @ifset emacs This is done by putting the method before the user and host name, as in @file{@value{prefix}@var{method}@value{postfixhop}} (Note the @@ -2434,15 +2434,15 @@ @file{@value{prefix}@value{postfixhop}}. (Note the trailing slash!). @end ifset -The user, machine and file specification remain the same. +The user, host and file specification remain the same. -So, to connect to the machine @code{melancholia} as @code{daniel}, +So, to connect to the host @code{melancholia} as @code{daniel}, using the @option{ssh} method to transfer files, and edit -@file{.emacs} in my home directory I would specify the filename +@file{.emacs} in my home directory I would specify the file name @file{@trampfn{ssh, daniel, melancholia, .emacs}}. @ifset emacs -A remote filename containing a host name only, which is equal to a +A remote file name containing a host name only, which is equal to a method name, is not allowed. If such a host name is used, it must always be preceded by an explicit method name, like @file{@value{prefix}ssh@value{postfixhop}ssh@value{postfix}}. @@ -2454,13 +2454,13 @@ daniel, melancholia#42, .emacs}}. -@node Filename completion -@section Filename completion -@cindex filename completion +@node File name completion +@section File name completion +@cindex file name completion -Filename completion works with @value{tramp} for completion of method -names, of user names and of machine names as well as for completion of -file names on remote machines. +File name completion works with @value{tramp} for completion of method +names, of user names and of host names as well as for completion of +file names on remote hosts. @ifset emacs In order to enable this, partial completion must be activated in your @file{.emacs}. @@ -2488,8 +2488,7 @@ @samp{@value{prefixhop}telnet@value{postfixhop}} is a possible completion for the respective method, @ifset emacs -@samp{tmp/} stands for the directory @file{/tmp} on your local -machine, +@samp{tmp/} stands for the directory @file{/tmp} on your local host, @end ifset and @samp{@value{prefixhop}toto@value{postfix}} might be a host @value{tramp} has detected in your @file{~/.ssh/known_hosts} @@ -2497,7 +2496,7 @@ If you go on to type @kbd{e @key{TAB}}, the minibuffer is completed to @samp{@value{prefix}telnet@value{postfixhop}}. -Next @kbd{@key{TAB}} brings you all machine names @value{tramp} detects in +Next @kbd{@key{TAB}} brings you all host names @value{tramp} detects in your @file{/etc/hosts} file, let's say @example @@ -2509,21 +2508,21 @@ @end multitable @end example -Now you can choose the desired machine, and you can continue to -complete file names on that machine. +Now you can choose the desired host, and you can continue to +complete file names on that host. If the configuration files (@pxref{Customizing Completion}), which @value{tramp} uses for analysis of completion, offer user names, those user names will be taken into account as well. -Remote machines which have been visited in the past and kept +Remote hosts which have been visited in the past and kept persistently (@pxref{Connection caching}) will be offered too. -Once the remote machine identification is completed, it comes to -filename completion on the remote host. This works pretty much like +Once the remote host identification is completed, it comes to +file name completion on the remote host. This works pretty much like for files on the local host, with the exception that minibuffer -killing via a double-slash works only on the filename part, except -that filename part starts with @file{//}. +killing via a double-slash works only on the file name part, except +that file name part starts with @file{//}. @ifset emacs A triple-slash stands for the default behavior. @end ifset @@ -2557,14 +2556,14 @@ A remote directory might have changed its contents out of @value{emacsname} control, for example by creation or deletion of -files by other processes. Therefore, during filename completion, the +files by other processes. Therefore, during file name completion, the remote directory contents are reread regularly in order to detect such changes, which would be invisible otherwise (@pxref{Connection caching}). @defopt tramp-completion-reread-directory-timeout This variable defines the number of seconds since last remote command before rereading a directory contents. A value of 0 would require an -immediate reread during filename completion, @code{nil} means to use +immediate reread during file name completion, @code{nil} means to use always cached values for the directory contents. @end defopt @@ -2632,7 +2631,7 @@ @ifset emacsgvfs If the remote host is mounted via GVFS (see @ref{GVFS based methods}), the remote filesystem is mounted locally. Therefore, there are no -remote processes; all processes run still locally on your machine with +remote processes; all processes run still locally on your host with an adapted @code{default-directory}. This section does not apply for such connection methods. @end ifset @@ -2645,7 +2644,7 @@ this is welcome! When your program is not found in the default search path -@value{tramp} sets on the remote machine, you should either use an +@value{tramp} sets on the remote host, you should either use an absolute path, or extend @code{tramp-remote-path} (see @ref{Remote Programs}): @@ -2713,18 +2712,18 @@ Calling @kbd{M-x shell} in a buffer related to a remote host runs the local shell as defined in @option{shell-file-name}. This might be -also a valid path name for a shell to be applied on the remote host, +also a valid file name for a shell to be applied on the remote host, but it will fail at least when your local and remote hosts belong to different system types, like @samp{windows-nt} and @samp{gnu/linux}. You must set the variable @option{explicit-shell-file-name} to the -shell path name on the remote host, in order to start that shell on +shell file name on the remote host, in order to start that shell on the remote host. @ifset emacs Starting with Emacs 24 this won't be necessary, if you call @code{shell} interactively. You will be asked for the remote shell -path, if you are on a remote buffer, and if +file name, if you are on a remote buffer, and if @option{explicit-shell-file-name} is equal to @code{nil}. @end ifset @@ -2924,7 +2923,7 @@ @ifset emacs @ifset installchapter Before sending a bug report, you could check whether @value{tramp} -works at all. Run the test suite on your local machine, @ref{Testing}. +works at all. Run the test suite on your local host, @ref{Testing}. @end ifset @end ifset @@ -2935,7 +2934,7 @@ When submitting a bug report, please try to describe in excruciating detail the steps required to reproduce the problem, the setup of the -remote machine and any special conditions that exist. You should also +remote host and any special conditions that exist. You should also check that your problem is not described already in @xref{Frequently Asked Questions}. @@ -3009,7 +3008,7 @@ confident that files on remote hosts are not changed out of @value{emacsname}' control, set @code{remote-file-name-inhibit-cache} to @code{nil}. Set also @code{tramp-completion-reread-directory-timeout} -to @code{nil}, @ref{Filename completion}. +to @code{nil}, @ref{File name completion}. Disable version control. If you access remote files which are not under version control, a lot of check operations can be avoided by @@ -3037,7 +3036,7 @@ @item Unknown characters in the prompt -@value{tramp} needs to recognize the prompt on the remote machine +@value{tramp} needs to recognize the prompt on the remote host after execution any command. This is not possible when the prompt contains unknown characters like escape sequences for coloring. This should be avoided on the remote side. @xref{Remote shell setup}. for @@ -3069,7 +3068,7 @@ @item Echoed characters after login -When the remote machine opens an echoing shell, there might be control +When the remote host opens an echoing shell, there might be control characters in the welcome message. @value{tramp} tries to suppress such echoes via the @command{stty -echo} command, but sometimes this command is not reached, because the echoed output has confused @@ -3167,7 +3166,7 @@ @item File name completion does not work with @value{tramp} -When you log in to the remote machine, do you see the output of +When you log in to the remote host, do you see the output of @command{ls} in color? If so, this may be the cause of your problems. @command{ls} outputs @acronym{ANSI} escape sequences that your terminal @@ -3175,12 +3174,12 @@ confuse @value{tramp} however. In your @file{.bashrc}, @file{.profile} or equivalent on the remote -machine you probably have an alias configured that adds the option +host you probably have an alias configured that adds the option @option{--color=yes} or @option{--color=auto}. You should remove that alias and ensure that a new login @emph{does not} display the output of @command{ls} in color. If you still cannot use -filename completion, report a bug to the @value{tramp} developers. +file name completion, report a bug to the @value{tramp} developers. @item @@ -3726,7 +3725,7 @@ package. Their replacements are reasonably simplistic in their approach. They -dissect the filename, call the original handler on the localname and +dissect the file name, call the original handler on the localname and then rebuild the @value{tramp} file name with the result. This allows the platform specific hacks in the original handlers to take @@ -3736,19 +3735,19 @@ @ifset emacs @node External packages @section Integration with external Lisp packages -@subsection Filename completion. +@subsection File name completion. -While reading filenames in the minibuffer, @value{tramp} must decide -whether it completes possible incomplete filenames, or not. Imagine +While reading file names in the minibuffer, @value{tramp} must decide +whether it completes possible incomplete file names, or not. Imagine there is the following situation: You have typed @kbd{C-x C-f @value{prefix}ssh@value{postfixhop} @key{TAB}}. @value{tramp} cannot know, whether @option{ssh} is a method or a host name. It checks therefore the last input character you have typed. If this is @key{TAB}, @key{SPACE} or @kbd{?}, @value{tramp} assumes that you are -still in filename completion, and it does not connect to the possible +still in file name completion, and it does not connect to the possible remote host @option{ssh}. -External packages, which use other characters for completing filenames +External packages, which use other characters for completing file names in the minibuffer, must signal this to @value{tramp}. For this case, the variable @code{non-essential} can be bound temporarily to a non-@code{nil} value. @@ -3891,16 +3890,16 @@ But I have decided that this is too fragile to reliably work, so on some systems you'll have to do without the uuencode methods. -@item The @value{tramp} filename syntax differs between Emacs and XEmacs. +@item The @value{tramp} file name syntax differs between Emacs and XEmacs. -The Emacs maintainers wish to use a unified filename syntax for +The Emacs maintainers wish to use a unified file name syntax for Ange-FTP and @value{tramp} so that users don't have to learn a new syntax. It is sufficient to learn some extensions to the old syntax. For the XEmacs maintainers, the problems caused from using a unified -filename syntax are greater than the gains. The XEmacs package system +file name syntax are greater than the gains. The XEmacs package system uses EFS for downloading new packages. So, obviously, EFS has to be -installed from the start. If the filenames were unified, @value{tramp} +installed from the start. If the file names were unified, @value{tramp} would have to be installed from the start, too. @ifset xemacs @@ -3917,12 +3916,12 @@ disabled. This can be achieved by setting file permissions @code{000} to the files @file{.../xemacs-packages/lisp/tramp/auto-autoloads.el*}. -In case of unified filenames, all @value{emacsname} download sites are +In case of unified file names, all @value{emacsname} download sites are added to @code{tramp-default-method-alist} with default method @option{ftp} @xref{Default Method}. These settings shouldn't be touched for proper working of the @value{emacsname} package system. -The syntax for unified filenames is described in the @value{tramp} manual +The syntax for unified file names is described in the @value{tramp} manual for @value{emacsothername}. @end ifset @end itemize @@ -3955,7 +3954,5 @@ @c shells. @c * Explain how tramp.el works in principle: open a shell on a remote @c host and then send commands to it. -@c * Use `filename' resp. `file name' consistently. -@c * Use `host' resp. `machine' consistently. @c * Consistent small or capitalized words especially in menus. @c * Make a unique declaration of @trampfn. ------------------------------------------------------------ revno: 115992 committer: Eric S. Raymond branch nick: trunk timestamp: Sun 2014-01-12 09:54:50 -0500 message: Remove broken VCSWITNESS code, and explain the problem. diff: === modified file 'ChangeLog' --- ChangeLog 2014-01-12 01:35:51 +0000 +++ ChangeLog 2014-01-12 14:54:50 +0000 @@ -1,3 +1,8 @@ +2014-01-12 Eric S. Raymond + + * Makefile, src/Makefile, etc/PROBLEMS: Remove broken VCSWITNESS + code, and explain the problem. + 2014-01-12 Glenn Morris * README: Replace reference to etc/MAILINGLISTS. === modified file 'Makefile.in' --- Makefile.in 2014-01-01 07:43:34 +0000 +++ Makefile.in 2014-01-12 14:54:50 +0000 @@ -374,16 +374,12 @@ # all preloaded elisp files, and only then dump the actual src/emacs, which # is not wrong, but is overkill in 99.99% of the cases. src: Makefile FRC - dirstate='.bzr/checkout/dirstate'; \ - vcswitness='$$(srcdir)/../'$$dirstate; \ - [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ cd $@ || exit; \ boot=bootstrap-emacs$(EXEEXT); \ [ ! -x "$$boot" ] || boot=''; \ $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \ - VCSWITNESS="$$vcswitness" + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" blessmail: Makefile src FRC cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ === modified file 'etc/PROBLEMS' --- etc/PROBLEMS 2014-01-09 19:42:46 +0000 +++ etc/PROBLEMS 2014-01-12 14:54:50 +0000 @@ -2429,6 +2429,12 @@ from source, rather than the Ubuntu version, worked. See . +*** Rebuild of loaddefs.el is not always done after Lisp changes + +The rebuild production should depend on all Lisp files with #autoload +cookies. It doesn't yet. This needs a configure-time improvement to +the nuild system. + ** Dumping *** Linux: Segfault during `make bootstrap' under certain recent versions of the Linux kernel. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-12 14:25:10 +0000 +++ lisp/ChangeLog 2014-01-12 14:54:50 +0000 @@ -36,7 +36,7 @@ 2014-01-11 Eric S. Raymond - * version.el (emacs-repository-get-version): Enhancee so the + * version.el (emacs-repository-get-version): Enhance so the function works correctly in either a Bazaar or Git repo. The Bazaar case can be discarded after the repo transition. === modified file 'src/Makefile.in' --- src/Makefile.in 2014-01-05 04:56:23 +0000 +++ src/Makefile.in 2014-01-12 14:54:50 +0000 @@ -629,12 +629,10 @@ ## Since the .el.elc rule cannot specify an extra dependency, we do it here. $(lisp): $(BOOTSTRAPEMACS) -## VCSWITNESS points to the file that holds info about the current checkout. -## We use it as a heuristic to decide when to rebuild loaddefs.el. -## If empty it is ignored; the parent makefile can set it to some other value. -VCSWITNESS = +## This ought to depend on every Lisp file that contains an autoload cookie. +## A task for the future... -$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) +$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)" ## Dump an Emacs executable named bootstrap-emacs containing the ------------------------------------------------------------ revno: 115991 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2014-01-12 22:25:10 +0800 message: Rename eww-download-path to eww-download-directory. * lisp/net/eww.el (eww-download-directory): Rename from `eww-download-path' (Bug#16419). * doc/misc/eww.texi (Basics): Use "directory" instead of "path" (Bug#16419). diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-01-12 01:35:51 +0000 +++ doc/misc/ChangeLog 2014-01-12 14:25:10 +0000 @@ -1,3 +1,7 @@ +2014-01-12 Xue Fuqiao + + * eww.texi (Basics): Use "directory" instead of "path" (Bug#16419). + 2014-01-12 Glenn Morris * efaq.texi (Guidelines for newsgroup postings) === modified file 'doc/misc/eww.texi' --- doc/misc/eww.texi 2014-01-09 23:21:56 +0000 +++ doc/misc/eww.texi 2014-01-12 14:25:10 +0000 @@ -83,8 +83,8 @@ If the input doesn't look like a URL or domain name the web will be searched via @code{eww-search-prefix}. The default search engine is @url{https://duckduckgo.com, DuckDuckGo}. If you want to open a file -either prefix the path with @code{file://} or use the command @kbd{M-x -eww-open-file}. +either prefix the file name with @code{file://} or use the command +@kbd{M-x eww-open-file}. @findex eww-quit @findex eww-reload @@ -99,12 +99,12 @@ (@code{eww-copy-page-url}) will copy the current URL to the kill ring. @findex eww-download -@vindex eww-download-path +@vindex eww-download-directory @kindex d @cindex Download A URL under the point can be downloaded with @kbd{d} (@code{eww-download}). The file will be written to the directory -specified in @code{eww-download-path} (Default: @file{~/Downloads/}). +specified in @code{eww-download-directory} (Default: @file{~/Downloads/}). @findex eww-back-url @findex eww-forward-url === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-12 10:29:59 +0000 +++ lisp/ChangeLog 2014-01-12 14:25:10 +0000 @@ -1,3 +1,8 @@ +2014-01-12 Xue Fuqiao + + * net/eww.el (eww-download-directory): Rename from + `eww-download-path' (Bug#16419). + 2014-01-12 Leo Liu * dired-x.el (dired-mode-map): Fix last change. === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2014-01-05 09:27:26 +0000 +++ lisp/net/eww.el 2014-01-12 14:25:10 +0000 @@ -50,8 +50,8 @@ :group 'eww :type 'string) -(defcustom eww-download-path "~/Downloads/" - "Path where files will downloaded." +(defcustom eww-download-directory "~/Downloads/" + "Directory where files will downloaded." :version "24.4" :group 'eww :type 'string) ------------------------------------------------------------ revno: 115990 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-01-12 06:24:16 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/dired.el' --- lisp/dired.el 2014-01-06 06:25:30 +0000 +++ lisp/dired.el 2014-01-12 11:24:16 +0000 @@ -4353,7 +4353,7 @@ ;;;*** -;;;### (autoloads nil "dired-x" "dired-x.el" "fe5dbf515419da3b9907f32e5d4311fa") +;;;### (autoloads nil "dired-x" "dired-x.el" "291bc6e869bf72c900604c45d40f45ed") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ ------------------------------------------------------------ revno: 115989 committer: Leo Liu branch nick: trunk timestamp: Sun 2014-01-12 18:29:59 +0800 message: Some minor fixes * dired-x.el (dired-mode-map): Fix last change. * emacs-lisp/eldoc.el (eldoc-mode): Add hook locally. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-12 05:29:11 +0000 +++ lisp/ChangeLog 2014-01-12 10:29:59 +0000 @@ -1,3 +1,9 @@ +2014-01-12 Leo Liu + + * dired-x.el (dired-mode-map): Fix last change. + + * emacs-lisp/eldoc.el (eldoc-mode): Add hook locally. + 2014-01-12 Paul Eggert Spelling fixes. @@ -272,7 +278,7 @@ 2014-01-06 Leo Liu * dired-x.el (dired-mode-map): Rebind dired-omit-mode to C-x M-o - to avoid shadowning global key. (Bug#16354) + to avoid shadowing global key. (Bug#16354) 2014-01-06 Daniel Colascione === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2014-01-06 05:04:57 +0000 +++ lisp/dired-x.el 2014-01-12 10:29:59 +0000 @@ -241,7 +241,7 @@ ;;; KEY BINDINGS. -(define-key dired-mode-map "\C-c\M-o" 'dired-omit-mode) +(define-key dired-mode-map "\C-x\M-o" 'dired-omit-mode) (define-key dired-mode-map "*O" 'dired-mark-omitted) (define-key dired-mode-map "\M-(" 'dired-mark-sexp) (define-key dired-mode-map "*(" 'dired-mark-sexp) === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-01-12 04:00:03 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-01-12 10:29:59 +0000 @@ -187,7 +187,7 @@ (when eldoc-print-after-edit (setq-local eldoc-message-commands (eldoc-edit-message-commands))) (add-hook 'post-command-hook 'eldoc-schedule-timer nil t) - (add-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t)) + (add-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area nil t)) (kill-local-variable 'eldoc-message-commands) (remove-hook 'post-command-hook 'eldoc-schedule-timer t) (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t))) ------------------------------------------------------------ revno: 115988 committer: Paul Eggert branch nick: trunk timestamp: Sat 2014-01-11 21:29:11 -0800 message: Spelling fixes. * lisp/emacs-lisp/generic.el (generic--normalize-comments): Rename from generic--normalise-comments. All uses changed. * lisp/play/bubbles.el (bubbles--neighborhood-score): (bubbles--mark-direct-neighbors, bubbles--mark-neighborhood) (bubbles--neighborhood-available) (bubbles--update-neighborhood-score): Rename from names with 'neighbourhood'. All uses changed. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-12 04:00:03 +0000 +++ lisp/ChangeLog 2014-01-12 05:29:11 +0000 @@ -1,3 +1,14 @@ +2014-01-12 Paul Eggert + + Spelling fixes. + * emacs-lisp/generic.el (generic--normalize-comments): + Rename from generic--normalise-comments. All uses changed. + * play/bubbles.el (bubbles--neighborhood-score): + (bubbles--mark-direct-neighbors, bubbles--mark-neighborhood) + (bubbles--neighborhood-available) + (bubbles--update-neighborhood-score): + Rename from names with 'neighbourhood'. All uses changed. + 2014-01-12 Leo Liu Re-implement the feature of showing eldoc info after editing. === modified file 'lisp/emacs-lisp/generic.el' --- lisp/emacs-lisp/generic.el 2014-01-01 07:43:34 +0000 +++ lisp/emacs-lisp/generic.el 2014-01-12 05:29:11 +0000 @@ -224,7 +224,7 @@ ;;; Comment Functionality -(defun generic--normalise-comments (comment-list) +(defun generic--normalize-comments (comment-list) (let ((normalized '())) (dolist (start comment-list) (let (end) @@ -300,7 +300,7 @@ (defun generic-mode-set-comments (comment-list) "Set up comment functionality for generic mode." (let ((st (make-syntax-table)) - (comment-list (generic--normalise-comments comment-list))) + (comment-list (generic--normalize-comments comment-list))) (generic-set-comment-syntax st comment-list) (generic-set-comment-vars comment-list) (set-syntax-table st))) === modified file 'lisp/mouse-drag.el' --- lisp/mouse-drag.el 2014-01-01 07:43:34 +0000 +++ lisp/mouse-drag.el 2014-01-12 05:29:11 +0000 @@ -291,7 +291,7 @@ (or (mouse-movement-p event) (eq (car-safe event) 'switch-frame))) ;; Scroll if see if we're on the edge. - ;; NEEDSWORK: should handle mouse-in-other window. + ;; FIXME: should handle mouse-in-other window. (cond ((not (eq start-window (posn-window end))) t) ; wait for return to original window === modified file 'lisp/org/org-list.el' --- lisp/org/org-list.el 2014-01-01 07:43:34 +0000 +++ lisp/org/org-list.el 2014-01-12 05:29:11 +0000 @@ -1223,7 +1223,7 @@ ;; When `org-blank-before-new-entry' says so, it is 1. ((eq insert-blank-p t) 1) ;; `plain-list-item' is 'auto. Count blank lines separating - ;; neighbours items in list. + ;; neighbors' items in list. (t (let ((next-p (org-list-get-next-item item struct prevs))) (cond ;; Is there a next item? === modified file 'lisp/org/ox.el' --- lisp/org/ox.el 2014-01-07 13:22:53 +0000 +++ lisp/org/ox.el 2014-01-12 05:29:11 +0000 @@ -5093,7 +5093,7 @@ ;;;; Topology ;; ;; Here are various functions to retrieve information about the -;; neighbourhood of a given element or object. Neighbours of interest +;; neighborhood of a given element or object. Neighbors of interest ;; are direct parent (`org-export-get-parent'), parent headline ;; (`org-export-get-parent-headline'), first element containing an ;; object, (`org-export-get-parent-element'), parent table === modified file 'lisp/play/bubbles.el' --- lisp/play/bubbles.el 2014-01-01 07:43:34 +0000 +++ lisp/play/bubbles.el 2014-01-12 05:29:11 +0000 @@ -231,7 +231,7 @@ (defvar bubbles--score 0 "Current Bubbles score.") -(defvar bubbles--neighbourhood-score 0 +(defvar bubbles--neighborhood-score 0 "Score of active bubbles neighborhood.") (defvar bubbles--faces nil @@ -925,7 +925,7 @@ (buffer-disable-undo) (force-mode-line-update) (redisplay) - (add-hook 'post-command-hook 'bubbles--mark-neighbourhood t t)) + (add-hook 'post-command-hook 'bubbles--mark-neighborhood t t)) ;;;###autoload (defun bubbles () @@ -1087,7 +1087,7 @@ (char-after (point)) nil))) -(defun bubbles--mark-direct-neighbours (row col char) +(defun bubbles--mark-direct-neighbors (row col char) "Mark direct neighbors of bubble at ROW COL with same CHAR." (save-excursion (let ((count 0)) @@ -1097,13 +1097,13 @@ (add-text-properties (point) (1+ (point)) '(active t face 'bubbles--highlight-face)) (setq count (+ 1 - (bubbles--mark-direct-neighbours row (1+ col) char) - (bubbles--mark-direct-neighbours row (1- col) char) - (bubbles--mark-direct-neighbours (1+ row) col char) - (bubbles--mark-direct-neighbours (1- row) col char)))) + (bubbles--mark-direct-neighbors row (1+ col) char) + (bubbles--mark-direct-neighbors row (1- col) char) + (bubbles--mark-direct-neighbors (1+ row) col char) + (bubbles--mark-direct-neighbors (1- row) col char)))) count))) -(defun bubbles--mark-neighbourhood (&optional pos) +(defun bubbles--mark-neighborhood (&optional pos) "Mark neighborhood of point. Use optional parameter POS instead of point if given." (when bubbles--playing @@ -1117,17 +1117,17 @@ '(face default active nil)) (let ((count 0)) (when (and row col (not (eq char (bubbles--empty-char)))) - (setq count (bubbles--mark-direct-neighbours row col char)) + (setq count (bubbles--mark-direct-neighbors row col char)) (unless (> count 1) (add-text-properties (point-min) (point-max) '(face default active nil)) (setq count 0))) - (bubbles--update-neighbourhood-score count)) + (bubbles--update-neighborhood-score count)) (put-text-property (point-min) (point-max) 'pointer 'arrow) (bubbles--update-faces-or-images) (sit-for 0))))) -(defun bubbles--neighbourhood-available () +(defun bubbles--neighborhood-available () "Return t if another valid neighborhood is available." (catch 'found (save-excursion @@ -1153,20 +1153,20 @@ (defun bubbles--reset-score () "Reset bubbles score." - (setq bubbles--neighbourhood-score 0 + (setq bubbles--neighborhood-score 0 bubbles--score 0) (bubbles--update-score)) (defun bubbles--update-score () "Calculate and display new bubbles score." - (setq bubbles--score (+ bubbles--score bubbles--neighbourhood-score)) + (setq bubbles--score (+ bubbles--score bubbles--neighborhood-score)) (bubbles--show-scores)) -(defun bubbles--update-neighbourhood-score (size) +(defun bubbles--update-neighborhood-score (size) "Calculate and display score of active neighborhood from its SIZE." (if (> size 1) - (setq bubbles--neighbourhood-score (expt (- size 1) 2)) - (setq bubbles--neighbourhood-score 0)) + (setq bubbles--neighborhood-score (expt (- size 1) 2)) + (setq bubbles--neighborhood-score 0)) (bubbles--show-scores)) (defun bubbles--show-scores () @@ -1177,7 +1177,7 @@ (let ((inhibit-read-only t) (pos (point))) (delete-region (point) (point-max)) - (insert (format "Selected: %4d\n" bubbles--neighbourhood-score)) + (insert (format "Selected: %4d\n" bubbles--neighborhood-score)) (insert " ") (add-text-properties (1- (point)) (point) (list 'intangible t 'display @@ -1216,10 +1216,10 @@ "Remove active bubbles region." (interactive) (when (and bubbles--playing - (> bubbles--neighbourhood-score 0)) + (> bubbles--neighborhood-score 0)) (setq bubbles--save-data (list bubbles--score (buffer-string))) (let ((inhibit-read-only t)) - ;; blank out current neighbourhood + ;; blank out current neighborhood (let ((row (bubbles--row (point))) (col (bubbles--col (point)))) (goto-char (point-max)) @@ -1289,7 +1289,7 @@ (bubbles--update-faces-or-images) (sit-for 0))) (put-text-property (point-min) (point-max) 'removed nil) - (unless (bubbles--neighbourhood-available) + (unless (bubbles--neighborhood-available) (bubbles--game-over))) ;; undo (setq buffer-undo-list '((apply bubbles-undo . nil))) === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/sh-script.el 2014-01-12 05:29:11 +0000 @@ -3504,7 +3504,7 @@ ;; Originally this was sh-learn-region-indent (beg end) ;; However, in practice this was awkward so I changed it to -;; use the whole buffer. Use narrowing if needbe. +;; use the whole buffer. Use narrowing if need be. (defun sh-learn-buffer-indent (&optional arg) "Learn how to indent the buffer the way it currently is. ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.