6 files changed, 36 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2169898670..aac855804cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2011-07-22  Alan Mackenzie  <acm@muc.de>
+
+        Prevent cc-langs.elc being loaded at run time.
+
+        * progmodes/cc-mode.el: Remove two autoload forms which loaded
+        cc-langs.
+
+        * /progmodes/cc-langs.el (c-make-init-lang-vars-fun): Don't emit
+        "(require 'cc-langs)".  Quote a form so it will evaluate at
+        (cc-mode's) compilation time.
+
+2011-07-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-file-name-handler): Avoid recursive
+        loading.  (Bug#9114)
+
 2011-07-21  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (display-buffer-pop-up-window)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 82d878a6fa8..9b11ef58eab 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1876,7 +1876,17 @@ Falls back to normal file name handler if no Tramp file name handler exists."
             ;; Call the backend function.
             (if foreign
                 (condition-case err
-                    (apply foreign operation args)
+                    (let ((sf (symbol-function foreign)))
+                      ;; Some packages set the default directory to a
+                      ;; remote path, before respective Tramp packages
+                      ;; are already loaded.  This results in
+                      ;; recursive loading.  Therefore, we load the
+                      ;; Tramp packages locally.
+                      (when (and (listp sf) (eq (car sf) 'autoload))
+                        (let ((default-directory
+                                (tramp-compat-temporary-file-directory)))
+                          (load (cadr sf) 'noerror)))
+                      (apply foreign operation args))
 
                   ;; Trace that somebody has interrupted the operation.
                   (quit
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 9ce23a080d6..d7ef278174a 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3092,10 +3092,9 @@ accomplish that conveniently."
                  ;;           ',mode ,c-version c-version)
                  ;;  (put ',mode 'c-has-warned-lang-consts t))
 
-                 (require 'cc-langs)
                  (setq source-eval t)
-                 (let ((init (append (cdr c-emacs-variable-inits)
-                                     (cdr c-lang-variable-inits))))
+                 (let ((init ',(append (cdr c-emacs-variable-inits)
+                                       (cdr c-lang-variable-inits))))
                    (while init
                      (setq current-var (caar init))
                      (set (caar init) (eval (cadar init)))
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 1adc6c2eac0..4299c413312 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -120,11 +120,6 @@
 ;   '
 (require 'cc-fonts) ;)
 
-;; cc-langs isn't loaded when we're byte compiled, so add autoload
-;; directives for the interface functions.
-(autoload 'c-make-init-lang-vars-fun "cc-langs")
-(autoload 'c-init-language-vars "cc-langs" nil nil 'macro)
-
 
 ;; Other modes and packages which depend on CC Mode should do the
 ;; following to make sure everything is loaded and available for their
diff --git a/src/ChangeLog b/src/ChangeLog
index 65cd07df0ae..0b06e5bf2c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Don't ignore glyphs whose object
+        is an integer, which is important for empty lines.  (Bug#9149)
+
 2011-07-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * frame.c (Fmodify_frame_parameters): In tty case, update the
diff --git a/src/xdisp.c b/src/xdisp.c
index ecb7007e1f3..0effc63c3db 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25214,7 +25214,7 @@ rows_from_pos_range (struct window *w,
 
           while (g < e)
             {
-              if (BUFFERP (g->object)
+              if ((BUFFERP (g->object) || INTEGERP (g->object))
                   && start_charpos <= g->charpos && g->charpos < end_charpos)
                 *start = row;
               g++;
@@ -25264,7 +25264,7 @@ rows_from_pos_range (struct window *w,
 
           while (g < e)
             {
-              if (BUFFERP (g->object)
+              if ((BUFFERP (g->object) || INTEGERP (g->object))
                   && start_charpos <= g->charpos && g->charpos < end_charpos)
                 break;
               g++;