From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Rebasing (was: [Emacs-diffs] feature/gnus-select 46738e3 040/218: Improve SVG documentation) Date: Fri, 14 Dec 2018 07:03:08 -0500 Message-ID: References: <20181214083441.4064.68736@vcs0.savannah.gnu.org> <20181214083451.EC1C820538@vcs0.savannah.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1544788881 9567 195.159.176.226 (14 Dec 2018 12:01:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 14 Dec 2018 12:01:21 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Andrew G Cohen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 14 13:01:17 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gXm9c-0002Ne-7g for ged-emacs-devel@m.gmane.org; Fri, 14 Dec 2018 13:01:16 +0100 Original-Received: from localhost ([::1]:32975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXmBi-0007Vc-M7 for ged-emacs-devel@m.gmane.org; Fri, 14 Dec 2018 07:03:26 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXmBd-0007VL-0k for emacs-devel@gnu.org; Fri, 14 Dec 2018 07:03:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXmBZ-0003Lg-Kb for emacs-devel@gnu.org; Fri, 14 Dec 2018 07:03:20 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:40139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXmBZ-0003DX-Eq for emacs-devel@gnu.org; Fri, 14 Dec 2018 07:03:17 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id wBEC38En027790; Fri, 14 Dec 2018 07:03:09 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 9F5B46AA99; Fri, 14 Dec 2018 07:03:08 -0500 (EST) In-Reply-To: <20181214083451.EC1C820538@vcs0.savannah.gnu.org> (Andrew G. Cohen's message of "Fri, 14 Dec 2018 03:34:51 -0500 (EST)") X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.1 X-NAI-Spam-Rules: 3 Rules triggered BODY_START_GREETING=0.1, EDT_SA_DN_PASS=0, RV6439=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6439> : inlines <6985> : streams <1807099> : uri <2764683> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:231825 Archived-At: Hi Andrew, I see you pushed changes to the gnus-select branch, but in this push I see many (many) commits and I'm having trouble seeing the ones *you* made: most of the commits are like the one below. It looks like you did some kind of rebasing, but in a way that rebased other people's changes on top of yours rather than the opposite. Is that indeed that you've done? Is there a specific reason for that, or was an accident? Stefan cohen@andy.bu.edu (Andrew G Cohen) writes: > branch: feature/gnus-select > commit 46738e3765ff22f73272ad75c5aea9385de7da33 > Author: Charles A. Roelli > Commit: Andrew G Cohen > > Improve SVG documentation > > * doc/lispref/display.texi (ImageMagick Images): Remove an > outdated comment that references a fixed bug. > (SVG Images): Fix grammar, and call functions functions (there are > no commands in lisp/svg.el). > --- > doc/lispref/display.texi | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi > index dcd2fcf..2ac89ba 100644 > --- a/doc/lispref/display.texi > +++ b/doc/lispref/display.texi > @@ -5387,7 +5387,6 @@ hint to ImageMagick to help it detect the image type. > Specifies a rotation angle in degrees. > > @item :index @var{frame} > -@c Doesn't work: https://debbugs.gnu.org/7978 > @xref{Multi-Frame Images}. > @end table > > @@ -5396,8 +5395,8 @@ Specifies a rotation angle in degrees. > @cindex SVG images > > SVG (Scalable Vector Graphics) is an XML format for specifying images. > -If your Emacs build has with SVG support, you can create and manipulate > -these images with the following commands. > +If your Emacs build has SVG support, you can create and manipulate > +these images with the following functions. > > @defun svg-create width height &rest args > Create a new, empty SVG image with the specified dimensions. > @@ -5411,7 +5410,7 @@ The default width (in pixels) of any lines created. > The default stroke color on any lines created. > @end table > > -This function returns an SVG structure, and all the following commands > +This function returns an SVG structure, and all the following functions > work on that structure. > @end defun > > > _______________________________________________ > Emacs-diffs mailing list > Emacs-diffs@gnu.org > https://lists.gnu.org/mailman/listinfo/emacs-diffs