|  | @@ -2041,25 +2041,30 @@ is the language used for CODE, as a string, or nil."
 | 
	
		
			
				|  |  |  	 ;; Case 2: Default.  Fontify code.
 | 
	
		
			
				|  |  |  	 (t
 | 
	
		
			
				|  |  |  	  ;; htmlize
 | 
	
		
			
				|  |  | -	  (setq code (with-temp-buffer
 | 
	
		
			
				|  |  | -		       ;; Switch to language-specific mode.
 | 
	
		
			
				|  |  | -		       (funcall lang-mode)
 | 
	
		
			
				|  |  | -		       (insert code)
 | 
	
		
			
				|  |  | -		       ;; Fontify buffer.
 | 
	
		
			
				|  |  | -		       (font-lock-ensure)
 | 
	
		
			
				|  |  | -		       ;; Remove formatting on newline characters.
 | 
	
		
			
				|  |  | -		       (save-excursion
 | 
	
		
			
				|  |  | -			 (let ((beg (point-min))
 | 
	
		
			
				|  |  | -			       (end (point-max)))
 | 
	
		
			
				|  |  | -			   (goto-char beg)
 | 
	
		
			
				|  |  | -			   (while (progn (end-of-line) (< (point) end))
 | 
	
		
			
				|  |  | -			     (put-text-property (point) (1+ (point)) 'face nil)
 | 
	
		
			
				|  |  | -			     (forward-char 1))))
 | 
	
		
			
				|  |  | -		       (org-src-mode)
 | 
	
		
			
				|  |  | -		       (set-buffer-modified-p nil)
 | 
	
		
			
				|  |  | -		       ;; Htmlize region.
 | 
	
		
			
				|  |  | -		       (org-html-htmlize-region-for-paste
 | 
	
		
			
				|  |  | -			(point-min) (point-max))))
 | 
	
		
			
				|  |  | +	  (setq code
 | 
	
		
			
				|  |  | +		(let ((output-type org-html-htmlize-output-type)
 | 
	
		
			
				|  |  | +		      (font-prefix orgb-html-htmlize-font-prefix))
 | 
	
		
			
				|  |  | +		  (with-temp-buffer
 | 
	
		
			
				|  |  | +		    ;; Switch to language-specific mode.
 | 
	
		
			
				|  |  | +		    (funcall lang-mode)
 | 
	
		
			
				|  |  | +		    (insert code)
 | 
	
		
			
				|  |  | +		    ;; Fontify buffer.
 | 
	
		
			
				|  |  | +		    (font-lock-ensure)
 | 
	
		
			
				|  |  | +		    ;; Remove formatting on newline characters.
 | 
	
		
			
				|  |  | +		    (save-excursion
 | 
	
		
			
				|  |  | +		      (let ((beg (point-min))
 | 
	
		
			
				|  |  | +			    (end (point-max)))
 | 
	
		
			
				|  |  | +			(goto-char beg)
 | 
	
		
			
				|  |  | +			(while (progn (end-of-line) (< (point) end))
 | 
	
		
			
				|  |  | +			  (put-text-property (point) (1+ (point)) 'face nil)
 | 
	
		
			
				|  |  | +			  (forward-char 1))))
 | 
	
		
			
				|  |  | +		    (org-src-mode)
 | 
	
		
			
				|  |  | +		    (set-buffer-modified-p nil)
 | 
	
		
			
				|  |  | +		    ;; Htmlize region.
 | 
	
		
			
				|  |  | +		    (let ((org-html-htmlize-output-type output-type)
 | 
	
		
			
				|  |  | +			  (org-html-htmlize-font-prefix font-prefix))
 | 
	
		
			
				|  |  | +		      (org-html-htmlize-region-for-paste
 | 
	
		
			
				|  |  | +		       (point-min) (point-max))))))
 | 
	
		
			
				|  |  |  	  ;; Strip any enclosing <pre></pre> tags.
 | 
	
		
			
				|  |  |  	  (let* ((beg (and (string-match "\\`<pre[^>]*>\n*" code) (match-end 0)))
 | 
	
		
			
				|  |  |  		 (end (and beg (string-match "</pre>\\'" code))))
 |