From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [elpa] master 65ee800 1/3: Merge in changes from GNU Elpa subtree Date: Fri, 22 Jul 2016 10:21:12 -0400 Message-ID: References: <20160722042705.16008.91462@vcs.savannah.gnu.org> <20160722042707.0C622220106@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1469197295 6693 80.91.229.3 (22 Jul 2016 14:21:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 22 Jul 2016 14:21:35 +0000 (UTC) Cc: Matthew Carter To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 22 16:21:27 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bQbKN-0007gu-O2 for ged-emacs-devel@m.gmane.org; Fri, 22 Jul 2016 16:21:23 +0200 Original-Received: from localhost ([::1]:47463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQbKN-0001St-1f for ged-emacs-devel@m.gmane.org; Fri, 22 Jul 2016 10:21:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQbKH-0001Sn-OY for emacs-devel@gnu.org; Fri, 22 Jul 2016 10:21:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQbKD-0002xp-HD for emacs-devel@gnu.org; Fri, 22 Jul 2016 10:21:16 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:16821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQbKD-0002xk-Ch for emacs-devel@gnu.org; Fri, 22 Jul 2016 10:21:13 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AxFgA731xV/3mcpUVcgxCEAoVVu0CHSwQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAVYjBQsLNBIUGA2IWwjPIwEBAQEGAQEBAR6LOoUFBxaEFwWSSYxOkhSCFIFFI2GDMyKCeAEBAQ X-IPAS-Result: A0AxFgA731xV/3mcpUVcgxCEAoVVu0CHSwQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAVYjBQsLNBIUGA2IWwjPIwEBAQEGAQEBAR6LOoUFBxaEFwWSSYxOkhSCFIFFI2GDMyKCeAEBAQ X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="248880072" Original-Received: from 69-165-156-121.dsl.teksavvy.com (HELO pastel.home) ([69.165.156.121]) by ironport2-out.teksavvy.com with ESMTP; 22 Jul 2016 10:21:12 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id C709C64CAC; Fri, 22 Jul 2016 10:21:12 -0400 (EDT) In-Reply-To: <20160722042707.0C622220106@vcs.savannah.gnu.org> (Matthew Carter's message of "Fri, 22 Jul 2016 04:27:06 +0000 (UTC)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:206024 Archived-At: > None of the subtree commands seem to properly merge subtree back > upstream into the repository, so manually handle it here. Indeed, the 2-way synchronization is a bit inconvenient with subtrees. You might be able to use something like "git subtree split" to get something you can then merge into your upstream tree, but AFAIK it will not always DTRT. Stefan > * Fix some quoting problems in doc strings > * packages/ahungry-theme/ahungry-theme.el: Use lexical-binding. > * color-theme-ahungry.el: Don't burp if color-theme is missing > --- > ahungry-theme.el | 4 ++-- > color-theme-ahungry.el | 3 +-- > 2 files changed, 3 insertions(+), 4 deletions(-) > diff --git a/ahungry-theme.el b/ahungry-theme.el > index 7d10791..3b35f59 100644 > --- a/ahungry-theme.el > +++ b/ahungry-theme.el > @@ -1,4 +1,4 @@ > -;;; ahungry-theme.el --- Ahungry color theme for Emacs. Make sure to (load-theme 'ahungry). > +;;; ahungry-theme.el --- Ahungry color theme for Emacs. Make sure to (load-theme 'ahungry). -*- lexical-binding:t -*- > ;; Copyright (C) 2015,2016 Free Software Foundation, Inc. > @@ -87,7 +87,7 @@ > Leave this alone to retain defaults. > Default value: > - '(:family \"Terminus\" :foundry \"xos4\" > + (:family \"Terminus\" :foundry \"xos4\" > :slant normal :weight normal > :height 100 :width normal)") > diff --git a/color-theme-ahungry.el b/color-theme-ahungry.el > index e9ded6e..14980d8 100644 > --- a/color-theme-ahungry.el > +++ b/color-theme-ahungry.el > @@ -36,8 +36,7 @@ > ;;; Code: > -(eval-when-compile > - (require 'color-theme)) > +(declare-function color-theme-install "color-theme" (theme)) > ;; Currently background-color and foreground-color are intentionally left > ;; commented out, so that the color-theme in terminal mode will not overwrite