/[emacs]/emacs/src/doc.c
ViewVC logotype

Diff of /emacs/src/doc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.114 by ttn, Sun Aug 7 12:33:16 2005 UTC revision 1.115 by kfstorm, Fri Sep 9 11:55:09 2005 UTC
# Line 57  static Lisp_Object Vbuild_files; Line 57  static Lisp_Object Vbuild_files;
57    
58  extern Lisp_Object Voverriding_local_map;  extern Lisp_Object Voverriding_local_map;
59    
60    extern Lisp_Object Qremap;
61    
62  /* For VMS versions with limited file name syntax,  /* For VMS versions with limited file name syntax,
63     convert the name to something VMS will allow.  */     convert the name to something VMS will allow.  */
64  static void  static void
# Line 812  thus, \\=\\=\\=\\= puts \\=\\= into the Line 814  thus, \\=\\=\\=\\= puts \\=\\= into the
814        else if (strp[0] == '\\' && strp[1] == '[')        else if (strp[0] == '\\' && strp[1] == '[')
815          {          {
816            int start_idx;            int start_idx;
817              int follow_remap = 1;
818    
819            changed = 1;            changed = 1;
820            strp += 2;            /* skip \[ */            strp += 2;            /* skip \[ */
# Line 830  thus, \\=\\=\\=\\= puts \\=\\= into the Line 833  thus, \\=\\=\\=\\= puts \\=\\= into the
833            idx = strp - SDATA (string);            idx = strp - SDATA (string);
834            name = Fintern (make_string (start, length_byte), Qnil);            name = Fintern (make_string (start, length_byte), Qnil);
835    
836            do_remap:
837            /* Ignore remappings unless there are no ordinary bindings. */            /* Ignore remappings unless there are no ordinary bindings. */
838            tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qt);            tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qt);
839            if (NILP (tem))            if (NILP (tem))
840              tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);              tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);
841    
842              if (VECTORP (tem) && XVECTOR (tem)->size > 1
843                  && EQ (AREF (tem, 0), Qremap) && SYMBOLP (AREF (tem, 1))
844                  && follow_remap)
845                {
846                  name = AREF (tem, 1);
847                  follow_remap = 0;
848                  goto do_remap;
849                }
850    
851            /* Note the Fwhere_is_internal can GC, so we have to take            /* Note the Fwhere_is_internal can GC, so we have to take
852               relocation of string contents into account.  */               relocation of string contents into account.  */
853            strp = SDATA (string) + idx;            strp = SDATA (string) + idx;

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.115

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26