Commit 179a3f11 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

parents bc9a5003 7764286e
2013-05-23 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-gvfs.el (top):
* net/xesam.el (xesam-dbus-unique-names): Suppress D-Bus errors
when loading package. (Bug#14447)
2013-05-23 Glenn Morris <rgm@gnu.org>
* progmodes/js.el: No need to load comint when compiling.
(ring-insert, comint-send-string, comint-send-input)
(comint-last-input-end, ido-chop): Declare.
* vc/ediff-diff.el, vc/ediff-merg.el: Require ediff-util at run-time.
* vc/ediff-mult.el: Adjust requires.
(ediff-directories-internal, ediff-directory-revisions-internal)
(ediff-patch-file-internal): Declare.
* vc/ediff-ptch.el: Adjust requires.
(ediff-use-last-dir, ediff-buffers-internal): Declare.
(ediff-find-file): Autoload.
* vc/ediff-util.el: No need to load ediff when compiling.
(ediff-regions-internal): Declare.
* vc/ediff-wind.el: Adjust requires.
(ediff-compute-toolbar-width): Define when compiling.
(ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare.
* vc/ediff.el: No need to load dired, ediff-ptch when compiling.
(dired-get-filename, dired-get-marked-files)
(ediff-last-dir-patch, ediff-patch-default-directory)
(ediff-get-patch-buffer, ediff-dispatch-file-patching-job)
(ediff-patch-buffer-internal): Declare.
* emacs-lisp/checkdoc.el: No need to load ispell when compiling.
(ispell-process, ispell-buffer-local-words, lm-summary)
(lm-section-start, lm-section-end): Declare.
(checkdoc-ispell-init): Simplify.
* progmodes/vera-mode.el (he-init-string, he-dabbrev-beg)
(he-string-member, he-reset-string, he-substitute-string): Declare.
* eshell/em-ls.el: Adjust requires.
(eshell-glob-regexp): Declare.
* eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.
* eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.
* eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.
* eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.
* eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime):
Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-glob.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-smart.el:
* eshell/em-term.el, eshell/esh-arg.el, eshell/esh-mode.el:
* eshell/esh-opt.el, eshell/esh-proc.el:
* eshell/esh-var.el: Adjust requires.
* eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.
* eshell/em-ls.el (eshell-ls-dir): Fix -A handling.
2013-05-22 Leo Liu <sdl.web@gmail.com>
* progmodes/octave.el (inferior-octave-startup): Fix bug#14433.
2013-05-22 Michael Albinus <michael.albinus@gmx.de>
 
* autorevert.el (auto-revert-notify-add-watch)
......@@ -1311,7 +1379,7 @@
* net/tramp-sh.el (tramp-perl-pack, tramp-perl-unpack): New defconst.
(tramp-local-coding-commands, tramp-remote-coding-commands): Use them.
(tramp-sh-handle-file-local-copy, tramp-sh-handle-write-region):
(tramp-find-inline-compress):Improve traces.
(tramp-find-inline-compress): Improve traces.
(tramp-maybe-send-script): Check for Perl binary.
(tramp-get-inline-coding): Do not redirect STDOUT for local decoding.
 
......
......@@ -2066,7 +2066,8 @@ If the offending word is in a piece of quoted text, then it is skipped."
;;; Ispell engine
;;
(eval-when-compile (require 'ispell))
(defvar ispell-process)
(declare-function ispell-buffer-local-words "ispell" ())
(defun checkdoc-ispell-init ()
"Initialize Ispell process (default version) with Lisp words.
......@@ -2074,19 +2075,14 @@ The words used are from `checkdoc-ispell-lisp-words'. If `ispell'
cannot be loaded, then set `checkdoc-spellcheck-documentation-flag' to
nil."
(require 'ispell)
(if (not (symbol-value 'ispell-process)) ;Silence byteCompiler
(condition-case nil
(progn
(ispell-buffer-local-words)
;; This code copied in part from ispell.el Emacs 19.34
(let ((w checkdoc-ispell-lisp-words))
(while w
(process-send-string
;; Silence byte compiler
(symbol-value 'ispell-process)
(concat "@" (car w) "\n"))
(setq w (cdr w)))))
(error (setq checkdoc-spellcheck-documentation-flag nil)))))
(unless ispell-process
(condition-case nil
(progn
(ispell-buffer-local-words)
;; This code copied in part from ispell.el Emacs 19.34
(dolist (w checkdoc-ispell-lisp-words)
(process-send-string ispell-process (concat "@" w "\n"))))
(error (setq checkdoc-spellcheck-documentation-flag nil)))))
(defun checkdoc-ispell-docstring-engine (end)
"Run the Ispell tools on the doc string between point and END.
......@@ -2187,14 +2183,13 @@ News agents may remove it"
;;; Comment checking engine
;;
(eval-when-compile
;; We must load this to:
;; a) get symbols for compile and
;; b) determine if we have lm-history symbol which doesn't always exist
(require 'lisp-mnt))
(defvar generate-autoload-cookie)
(eval-when-compile (require 'lisp-mnt)) ; expand silly defsubsts
(declare-function lm-summary "lisp-mnt" (&optional file))
(declare-function lm-section-start "lisp-mnt" (header &optional after))
(declare-function lm-section-end "lisp-mnt" (header))
(defun checkdoc-file-comments-engine ()
"Return a message list if this file does not match the Emacs standard.
This checks for style only, such as the first line, Commentary:,
......
......@@ -90,8 +90,6 @@
;;; Code:
(eval-when-compile
(require 'esh-util))
(require 'eshell)
;;;###autoload
......
......@@ -39,11 +39,11 @@
;;; Code:
(eval-when-compile
(require 'cl-lib)
(require 'esh-mode)
(require 'eshell))
(require 'cl-lib))
(require 'esh-util)
(require 'esh-mode)
(require 'eshell)
;;;###autoload
(progn
......
......@@ -59,9 +59,7 @@
;;; Code:
(eval-when-compile
(require 'esh-util))
(require 'esh-util)
(require 'eshell)
(require 'esh-opt)
......
......@@ -70,10 +70,12 @@
;;; Code:
(require 'pcomplete)
(require 'esh-mode)
(require 'esh-util)
(eval-when-compile
(require 'cl-lib)
(require 'eshell))
(require 'esh-util)
;;;###autoload
(progn
......
......@@ -49,8 +49,8 @@
;;; Code:
(eval-when-compile (require 'eshell))
(require 'esh-util)
(eval-when-compile (require 'eshell))
;;;###autoload
(progn
......
......@@ -26,10 +26,10 @@
;;; Code:
(eval-when-compile (require 'eshell))
(require 'cl-lib)
(require 'esh-util)
(require 'esh-opt)
(eval-when-compile (require 'eshell))
;;;###autoload
(progn
......@@ -334,6 +334,8 @@ instead."
(defvar ange-cache)
(defvar dired-flag)
(declare-function eshell-glob-regexp "em-glob" (pattern))
(defun eshell-do-ls (&rest args)
"Implementation of \"ls\" in Lisp, passing ARGS."
(funcall flush-func -1)
......@@ -552,7 +554,7 @@ relative to that directory."
(expand-file-name dir)))
(cdr dirinfo))) ":\n"))
(let ((entries (eshell-directory-files-and-attributes
dir nil (and (not show-all)
dir nil (and (not (or show-all show-almost-all))
eshell-ls-exclude-hidden
"\\`[^.]") t
;; Asking for UID and GID as
......@@ -565,9 +567,9 @@ relative to that directory."
(setq entries
(cl-remove-if
(lambda (entry)
(member (caar entry) '("." "..")))
(member (car entry) '("." "..")))
entries)))
(when (and (not show-all)
(when (and (not (or show-all show-almost-all))
eshell-ls-exclude-regexp)
(while (and entries (string-match eshell-ls-exclude-regexp
(caar entries)))
......
......@@ -46,6 +46,8 @@
;;; Code:
(require 'esh-util)
(require 'esh-arg)
(eval-when-compile (require 'eshell))
;;;###autoload
......
......@@ -26,6 +26,7 @@
;;; Code:
(require 'esh-mode)
(eval-when-compile (require 'eshell))
;;;###autoload
......
......@@ -23,6 +23,7 @@
;;; Code:
(require 'esh-mode)
(eval-when-compile (require 'eshell))
;;;###autoload
......
......@@ -68,6 +68,7 @@
;;; Code:
(require 'esh-mode)
(eval-when-compile (require 'eshell))
;;;###autoload
......
......@@ -31,6 +31,8 @@
;;; Code:
(require 'esh-util)
(require 'esh-ext)
(eval-when-compile (require 'eshell))
(require 'term)
......
......@@ -25,13 +25,13 @@
;;; Code:
(require 'esh-util)
(eval-when-compile
(require 'esh-mode)
(require 'eshell)
(require 'tramp))
(require 'esh-util)
;;;###autoload
(progn
(defgroup eshell-tramp nil
......@@ -53,6 +53,8 @@
(append '("su" "sudo")
eshell-complex-commands)))
(autoload 'eshell-parse-command "esh-cmd")
(defun eshell/su (&rest args)
"Alias \"su\" to call TRAMP.
......
......@@ -23,6 +23,7 @@
;;; Code:
(require 'esh-util)
(eval-when-compile
(require 'eshell)
(require 'pcomplete))
......@@ -40,6 +41,8 @@ naturally accessible within Emacs."
;;; Functions:
(autoload 'eshell-parse-command "esh-cmd")
(defun eshell/expr (&rest args)
"Implementation of expr, using the calc package."
(if (not (fboundp 'calc-eval))
......
......@@ -27,7 +27,7 @@
(provide 'esh-arg)
(eval-when-compile (require 'eshell))
(require 'esh-mode)
(defgroup eshell-arg nil
"Argument parsing involves transforming the arguments passed on the
......
......@@ -33,10 +33,12 @@
(provide 'esh-ext)
(require 'esh-util)
(eval-when-compile
(require 'cl-lib)
(require 'esh-io)
(require 'esh-cmd))
(require 'esh-util)
(require 'esh-opt)
(defgroup eshell-ext nil
......@@ -103,6 +105,8 @@ wholly ignored."
:type '(choice file (const nil))
:group 'eshell-ext)
(autoload 'eshell-parse-command "esh-cmd")
(defsubst eshell-invoke-batch-file (&rest args)
"Invoke a .BAT or .CMD file on DOS/Windows systems."
;; since CMD.EXE can't handle forward slashes in the initial
......@@ -179,6 +183,8 @@ This bypasses all Lisp functions and aliases."
(error "%s: external command not found"
(substring command 1))))))
(autoload 'eshell-close-handles "esh-io")
(defun eshell-remote-command (command args)
"Insert output from a remote COMMAND, using ARGS.
A remote command is something that executes on a different machine.
......
......@@ -58,9 +58,11 @@
(provide 'esh-io)
(require 'esh-arg)
(require 'esh-util)
(eval-when-compile
(require 'cl-lib)
(require 'eshell))
(require 'cl-lib))
(defgroup eshell-io nil
"Eshell's I/O management code provides a scheme for treating many
......@@ -465,6 +467,8 @@ after all printing is over with no argument."
(eshell-print object)
(eshell-print "\n"))
(autoload 'eshell-output-filter "esh-mode")
(defun eshell-output-object-to-target (object target)
"Insert OBJECT into TARGET.
Returns what was actually sent, or nil if nothing was sent."
......
......@@ -60,7 +60,7 @@
(provide 'esh-mode)
(eval-when-compile (require 'esh-util))
(require 'esh-util)
(require 'esh-module)
(require 'esh-cmd)
(require 'esh-io)
......
......@@ -25,7 +25,7 @@
(provide 'esh-opt)
(eval-when-compile (require 'esh-ext))
(require 'esh-ext)
;; Unused.
;;; (defgroup eshell-opt nil
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment