I noted the below commit on the upstream development repository.  Could
I trouble people with the problematic emacsen to check if the library
file "octave" is available, even though "octave-mod" is not?

If so rather than disabling expand-region entirely for the problematic
emacsen, or adding a little hack to skip compiling that particular file,
or even adding a guard to skip files that encounter compilation errors
instead of failing the install, I would be tempted to fix the root
problem by including the below patch.

In doing so, it would seem reasonable to make an upstream-snapshot
release which includes this in addition to other upstream bug fixes and
enhancements, rather than picking the one commit.

                                        --Barak.
--
Barak A. Pearlmutter <ba...@cs.nuim.ie>
 Hamilton Institute & Dept Comp Sci, NUI Maynooth, Co. Kildare, Ireland
 http://www.bcl.hamilton.ie/~barak/

----------------------------------------------------------------

$ git show 23c18c0
commit 23c18c00400467faa690557fc71b8e17469e9cdb
Author: Mark Hepburn <mark.hepb...@gmail.com>
Date:   Tue Jun 18 23:02:11 2013 +1000

    octave-mode: account for recent changes to file-name and feature provided.

diff --git a/expand-region.el b/expand-region.el
index b41cd3f..fac421c 100644
--- a/expand-region.el
+++ b/expand-region.el
@@ -173,6 +173,7 @@ before calling `er/expand-region' for the first time."
 (eval-after-load "latex"        '(require 'latex-mode-expansions))
 (eval-after-load "nxml-mode"    '(require 'nxml-mode-expansions))
 (eval-after-load "octave-mod"   '(require 'octave-expansions))
+(eval-after-load "octave"       '(require 'octave-expansions))
 (eval-after-load "python"       '(progn
                                    (when expand-region-guess-python-mode
                                      (expand-region-guess-python-mode))
diff --git a/octave-expansions.el b/octave-expansions.el
index 2cdf9ff..786f1e4 100644
--- a/octave-expansions.el
+++ b/octave-expansions.el
@@ -27,7 +27,9 @@
 ;;; Code:
 
 (require 'expand-region-core)
-(require 'octave-mod)
+(or (require 'octave-mod nil t)
+    (require 'octave))
+
 
 ;;; Octave-mod received a major rewrite between versions 23 and 24 of
 ;;; Emacs, for example using the new smie package instead of


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to