* Re: master ba5bc0e: Tramp: Disable paging with PAGER=cat.
[not found] ` <E1YMvxr-000730-Ay@vcs.savannah.gnu.org>
@ 2015-02-16 0:31 ` Glenn Morris
2015-02-16 7:58 ` Michael Albinus
0 siblings, 1 reply; 2+ messages in thread
From: Glenn Morris @ 2015-02-16 0:31 UTC (permalink / raw)
To: emacs-devel; +Cc: Michael Albinus
It seems that you erased a bunch of existing ChangeLog entries?
(Also, you later made the same change on the emacs-24 branch, but did
not mark it as a backport. It's better to just make the change in that
branch if appropriate.)
Michael Albinus wrote:
> branch: master
> commit ba5bc0ee7c81f2122072bee162fcf1dbd8b2a8f2
> Author: Jérémy Compostella <jeremy.compostella@gmail.com>
> Commit: Michael Albinus <michael.albinus@gmx.de>
> --- a/lisp/ChangeLog
> +++ b/lisp/ChangeLog
> @@ -1,69 +1,14 @@
> -2015-02-14 Artur Malabarba <bruce.connor.am@gmail.com>
> +2015-02-15 Jérémy Compostella <jeremy.compostella@gmail.com>
>
> - * emacs-lisp/package.el (package-read-all-archive-contents): Don't
> - build the compatibility table.
> - (package-refresh-contents, package-initialize): Do build the
> - compatibility table.
> - (package--build-compatibility-table): New function.
> - (describe-package-1): Describe why a package is incompatible.
> -
> -2015-02-14 Stefan Monnier <monnier@iro.umontreal.ca>
> -
> - * emacs-lisp/cl-preloaded.el (cl-struct-define): Register as children
> - of the parent.
> - (cl--assertion-failed): New function.
> - (cl-assertion-failed): Move in from cl-lib.el.
> -
> - * emacs-lisp/cl-macs.el (cl-defstruct): Don't generate code to register
> - as children of its parents.
> - (cl--make-type-test, cl--compiler-macro-typep): Remove functions.
> - (cl-typep): Reimplement using define-inline.
> - (cl-assert): Use cl--assertion-failed.
> - (cl-struct-slot-value): Use define-inline.
> -
> - * emacs-lisp/cl-lib.el: Move autoloaded code to cl-preload.
> -
> - * textmodes/flyspell.el (flyspell-word): Defvar (bug#19844).
> - (flyspell-generic-check-word-p): Mark as obsolete.
> -
> -2015-02-13 Artur Malabarba <bruce.connor.am@gmail.com>
> -
> - * emacs-lisp/package.el (package--compatibility-table): New var.
> - (package--add-to-compatibility-table): New function.
> - (package-read-all-archive-contents): Populate compatibility table.
> - (package--incompatible-p): Also look in dependencies.
> - (describe-package-1): Fix "incompat" handling.
> -
> -2015-02-13 Lars Ingebrigtsen <larsi@gnus.org>
> -
> - * net/rfc2104.el: Moved here from lisp/gnus.
> -
> -2015-02-13 Magnus Henoch <magnus.henoch@gmail.com>
> -
> - * net/sasl-scram-rfc.el: New file.
> -
> - * net/sasl.el (sasl-mechanisms): Remove SCRAM-MD5.
> - Add SCRAM-SHA-1 first.
> - (sasl-mechanism-alist): Remove SCRAM-MD5 entry. Add SCRAM-SHA-1
> - entry (bug#17636).
> -
> -2015-02-13 Lars Ingebrigtsen <larsi@gnus.org>
> -
> - * net/shr.el (shr-tag-li): Speed up rendering pages with lots of
> - <ul>.
> -
> -2015-02-12 Oleh Krehel <ohwoeowho@gmail.com>
> -
> - * progmodes/gdb-mi.el (gdb-display-io-nopopup): New defcustom.
> - (gdb-inferior-filter): Don't pop up the buried output buffer when
> - `gdb-display-io-nopopup' is non-nil.
> + * net/tramp-sh.el (tramp-remote-process-environment): Disable paging
> + with PAGER=cat. (Bug#19870)
>
> 2015-02-12 Fabián Ezequiel Gallina <fgallina@gnu.org>
>
> python.el: Allow killing shell buffer if process is dead. (Bug#19823)
>
> - * progmodes/python.el (python-shell-font-lock-kill-buffer):
> - Don't require a running process.
> + * progmodes/python.el (python-shell-font-lock-kill-buffer): Don't
> + require a running process.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: master ba5bc0e: Tramp: Disable paging with PAGER=cat.
2015-02-16 0:31 ` master ba5bc0e: Tramp: Disable paging with PAGER=cat Glenn Morris
@ 2015-02-16 7:58 ` Michael Albinus
0 siblings, 0 replies; 2+ messages in thread
From: Michael Albinus @ 2015-02-16 7:58 UTC (permalink / raw)
To: Glenn Morris; +Cc: emacs-devel
Glenn Morris <rgm@gnu.org> writes:
Hi Glenn,
> It seems that you erased a bunch of existing ChangeLog entries?
Yes, and I'm very sorry about. I'used a bound branch emacs-24 in
parallel to the master branch. I experienced already problems from time
to time when pushing commits upstream, and so I did yesterday as
well. I'm pretty sure I have committed and pushed the changes to the
emacs-24 branch; I have no idea how they did land in master.
> (Also, you later made the same change on the emacs-24 branch, but did
> not mark it as a backport. It's better to just make the change in that
> branch if appropriate.)
Well, as result of the yesterdays disaster, I've removed the bound
emacs-24 branch on my laptop, and I've cloned it completely in parallel
to the master branch. Hope this works better.
I could revert the patch from the master branch, should I?
Best regards, Michael.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-16 7:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20150215095811.27056.94005@vcs.savannah.gnu.org>
[not found] ` <E1YMvxr-000730-Ay@vcs.savannah.gnu.org>
2015-02-16 0:31 ` master ba5bc0e: Tramp: Disable paging with PAGER=cat Glenn Morris
2015-02-16 7:58 ` Michael Albinus
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.